diff --git a/desktop/resources/inside-cafeteria/collision.png b/desktop/resources/inside-cafeteria/collision.png index 789ed0ab..94f44304 100644 Binary files a/desktop/resources/inside-cafeteria/collision.png and b/desktop/resources/inside-cafeteria/collision.png differ 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