From 2ee8237693660490ef30c9ff1403b1d3df933690 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 2 Mar 2015 15:17:05 -0800 Subject: [PATCH] updating coordinates. --- .../resources/inside-cafeteria/collision.png | Bin 9282 -> 5823 bytes .../advent/screens/rooms/inside_cafeteria.clj | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/resources/inside-cafeteria/collision.png b/desktop/resources/inside-cafeteria/collision.png index 789ed0ab1397b63ad92885b7240c8222f88804ef..94f44304e588be9104ebe0eaedab7c8c718f6967 100644 GIT binary patch literal 5823 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 JrFx!`{{`~!?kE5N delta 8515 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 Q|I?`UQu{^ObL$WP0b?4poB#j- diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 8c610610..96c95186 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -105,7 +105,7 @@ :ladder-guard "Do not darest telleth a soul, or thou wilst bring my family dishonor!" :ladder-guard "I will shame the name of my father, Luke, and his father, Puke." :ladder-guard "Not to mention, the duke will have my head!") - (actions/walk-to entities :ego [245 75] :face :right) + (actions/walk-to entities :ego [211 63] :face :right) (actions/play-animation entities :ego :reach) (actions/remove-entity entities :ladder) (actions/give entities :ladder))} @@ -156,7 +156,7 @@ [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 4 4 4 0 0 1 1 0 0 4 4 4 5 5 5 5 4 4 4 5 5 5 5 4 4 4 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6])))] (rooms/make :music :town-1 :interactions - {:right-dir {:box [300 45 320 120] + {:right-dir {:box [272 45 320 120] :script (actions/get-script entities (actions/walk-to entities :ego [319 50]) @@ -165,6 +165,7 @@ :cursor :right} } :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "inside-cafeteria/doorway.png") :x 306 :y 34 :baseline 202) (assoc (texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5)] :entities { :warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 8 :y 19 :baseline 180