major art update.

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