diff --git a/desktop/resources/inside-antique/background.png b/desktop/resources/inside-antique/background.png index 78a77710..44457cb6 100644 Binary files a/desktop/resources/inside-antique/background.png and b/desktop/resources/inside-antique/background.png differ diff --git a/desktop/resources/inside-antique/background.psd b/desktop/resources/inside-antique/background.psd index 85d4c14a..89d01e75 100644 Binary files a/desktop/resources/inside-antique/background.psd and b/desktop/resources/inside-antique/background.psd differ diff --git a/desktop/resources/inside-antique/beard.png b/desktop/resources/inside-antique/beard.png index a52e37bc..02b34d39 100644 Binary files a/desktop/resources/inside-antique/beard.png and b/desktop/resources/inside-antique/beard.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 9bf7f578..577ced73 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -100,7 +100,7 @@ (actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.") (actions/remove-entity entities :portrait) (actions/give entities :portrait)))) - beard (utils/make-anim "inside-antique/beard.png" [12 32] 0.5 [0 1 0 2]) + beard (utils/make-anim "inside-antique/beard.png" [26 52] 0.5 [0 1 0 2]) teddy (assoc (texture "inside-antique/teddy.png") :x 255 :y 95 @@ -167,10 +167,10 @@ :ego "He's the town of Remington's mascot."))} } :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)] - :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 147 :y 119 :baseline 112 + :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 148 :y 122 :baseline 112 :stand shopkeep-stand - :scale-x 1.3 - :scale-y 1.3 + :scale-x 1.6 + :scale-y 1.6 :talk-color (color 0.2 1.0 0.2 1.0) :talk shopkeep-talk :script (actions/get-script entities (do-antique-dialogue entities)) @@ -193,8 +193,8 @@ :beard (assoc (animation->texture screen beard) :anim beard :anim-start 0 - :x 65 - :y 109 + :x 70 + :y 86 :baseline 120) :bowl (assoc (texture "inside-antique/bowl.png") :x 165 @@ -227,5 +227,5 @@ (if (actions/has-item? entities :portrait ) (update-in entities [:room :entities] #(dissoc % :portrait)) entities))) - :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50) + :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75) :start-pos [222 3])))