diff --git a/desktop/resources/behindhouse/backgroudn.psd b/desktop/resources/behindhouse/backgroudn.psd index aff3ef94..ec082fe3 100644 Binary files a/desktop/resources/behindhouse/backgroudn.psd and b/desktop/resources/behindhouse/backgroudn.psd differ diff --git a/desktop/resources/behindhouse/background-dark.png b/desktop/resources/behindhouse/background-dark.png index 646bacbf..dd639957 100644 Binary files a/desktop/resources/behindhouse/background-dark.png and b/desktop/resources/behindhouse/background-dark.png differ diff --git a/desktop/resources/behindhouse/house-cover.png b/desktop/resources/behindhouse/house-cover.png index c537ef5e..9a45df96 100644 Binary files a/desktop/resources/behindhouse/house-cover.png and b/desktop/resources/behindhouse/house-cover.png differ diff --git a/desktop/resources/behindhouse/house-dark.png b/desktop/resources/behindhouse/house-dark.png index 0112129c..834289fc 100644 Binary files a/desktop/resources/behindhouse/house-dark.png and b/desktop/resources/behindhouse/house-dark.png differ diff --git a/desktop/resources/inside-castle/background-dark.png b/desktop/resources/inside-castle/background-dark.png index f6f4b90b..22af1d12 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 8160b3b2..c1e03bff 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 a1c9a566..851cc97b 100644 Binary files a/desktop/resources/inside-castle/collision.png and b/desktop/resources/inside-castle/collision.png differ diff --git a/desktop/resources/inside-castle/scale.png b/desktop/resources/inside-castle/scale.png index 34741739..e09b9e4b 100644 Binary files a/desktop/resources/inside-castle/scale.png and b/desktop/resources/inside-castle/scale.png differ diff --git a/desktop/resources/outside-castle/background-dark.png b/desktop/resources/outside-castle/background-dark.png index 282130c1..bd279546 100644 Binary files a/desktop/resources/outside-castle/background-dark.png and b/desktop/resources/outside-castle/background-dark.png differ diff --git a/desktop/resources/outsidehouse/background-dark.png b/desktop/resources/outsidehouse/background-dark.png index 7201c0e1..cbc04c79 100644 Binary files a/desktop/resources/outsidehouse/background-dark.png and b/desktop/resources/outsidehouse/background-dark.png differ diff --git a/desktop/resources/outsidehouse/background.psd b/desktop/resources/outsidehouse/background.psd index 922996cd..db67f27b 100644 Binary files a/desktop/resources/outsidehouse/background.psd and b/desktop/resources/outsidehouse/background.psd differ diff --git a/desktop/resources/outsidehouse/fence-dark.png b/desktop/resources/outsidehouse/fence-dark.png index e39d0077..b97f19e1 100644 Binary files a/desktop/resources/outsidehouse/fence-dark.png and b/desktop/resources/outsidehouse/fence-dark.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 50277701..447bd573 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -248,12 +248,12 @@ :ego "Erm... No, not recently." :shopkeep "Oh. Send him my love if you do see him.") (actions/talk entities :shopkeep "Hello there, sonny.")))))} - :sword {:box [0 130 39 165] + :sword {:box [15 93 49 125] :script (actions/get-script entities (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 [37 134] :face :left) + (actions/walk-to entities :ego [52 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]))] @@ -284,10 +284,8 @@ (actions/do-dialogue entities :ego "That's Georgia McGorgeous' house." :ego "One day, when I'm a knight, I'll ask her to be my girlfriend."))}} - :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/pedestal-overlay.png") :x 0 :y 0 :baseline 135)] - :night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/pedestal-overlay-dark.png") :x 0 :y 0 :baseline 135)] + :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0)] + :night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0)] :sunrise [(assoc (texture "inside-castle/background-sunrise.png") :x 0 :y 0 :baseline 0)]} :blackout (assoc (texture "black.png") :x 0 :y 0 @@ -305,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 16 - :y 145 + :x 29 + :y 108 :baseline 95) :trophy (assoc (animation->texture screen trophy) :x 253 :y 69 :baseline 191