Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

2015-02-27 12:43:37 -08:00
parent 473aa7226e a7da260f67
commit b0b91efa81
11 changed files with 4 additions and 4 deletions
--- a/desktop/resources/behindhouse/abc.png
+++ b/desktop/resources/behindhouse/abc.png
--- a/desktop/resources/behindhouse/house-cover
+++ b/desktop/resources/behindhouse/house-cover
--- a/desktop/resources/inside-cafeteria/background.psd
+++ b/desktop/resources/inside-cafeteria/background.psd
--- a/desktop/resources/inside-castle/background-dark.png
+++ b/desktop/resources/inside-castle/background-dark.png
--- a/desktop/resources/inside-castle/background.png
+++ b/desktop/resources/inside-castle/background.png
--- a/desktop/resources/inside-castle/collision.png
+++ b/desktop/resources/inside-castle/collision.png
--- a/desktop/resources/outside-castle/background-dark.png
+++ b/desktop/resources/outside-castle/background-dark.png
--- a/desktop/resources/outside-castle/background.png
+++ b/desktop/resources/outside-castle/background.png
--- a/desktop/resources/outside-castle/scale-map.png
+++ b/desktop/resources/outside-castle/scale-map.png
--- 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
--- a/desktop/src-common/advent/screens/rooms/outside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj
@@ -381,7 +381,7 @@
                                                                             (actions/remove-entity entities :note)
                                                                             (common/read-note-2 entities))))
                :collision "outside-castle/collision.png"
-                :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)
+                :scale-fn (utils/scaler-fn-from-image "outside-castle/scale-map.png" 0.20 1.00)
                :start-pos [310 80]
                :apply-state (fn [entities]
                               (if (#{:night :sunrise} (get-in entities [:state :time]))