diff --git a/desktop/resources/inside-cafeteria/background.psd b/desktop/resources/inside-cafeteria/background.psd index eaa70c43..f13908fe 100644 Binary files a/desktop/resources/inside-cafeteria/background.psd and b/desktop/resources/inside-cafeteria/background.psd differ diff --git a/desktop/resources/inside-castle/background-dark.png b/desktop/resources/inside-castle/background-dark.png index 22af1d12..168627b9 100644 Binary files a/desktop/resources/inside-castle/background-dark.png and b/desktop/resources/inside-castle/background-dark.png differ diff --git a/desktop/resources/inside-castle/background.png b/desktop/resources/inside-castle/background.png index c1e03bff..21dbbe24 100644 Binary files a/desktop/resources/inside-castle/background.png and b/desktop/resources/inside-castle/background.png differ diff --git a/desktop/resources/inside-castle/collision.png b/desktop/resources/inside-castle/collision.png index 851cc97b..123e69f2 100644 Binary files a/desktop/resources/inside-castle/collision.png and b/desktop/resources/inside-castle/collision.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 447bd573..d70f6003 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -253,7 +253,7 @@ (if (actions/has-item? entities :sword) (actions/talk entities :ego "I already have the Sword of Blergh!") (do (actions/talk entities :ego "That's the coolest sword I've ever seen!!") - (actions/walk-to entities :ego [52 97] :face :left) + (actions/walk-to entities :ego [45 97] :face :left) (actions/talk entities :ego "If I pull it out I can become a great knight!") (let [missing-items (set/difference #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items])) obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))] @@ -303,8 +303,8 @@ :bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p (concat p (reverse p)))) :sword (assoc (texture "inside-castle/sword.png") - :x 29 - :y 108 + :x 22 + :y 110 :baseline 95) :trophy (assoc (animation->texture screen trophy) :x 253 :y 69 :baseline 191