diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index f9c4d366..0023ab77 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -8,10 +8,10 @@ + too small area for bars + more visible crowbar + peddler stuff should be gone at night -+ owl barf effect + sack lunch should spoil + swinging axe at second doesn't seem right + fight with blergh at end isn't great + ending + secret lever + shopkeep sigh ++ proper save/settings file location diff --git a/desktop/resources/outside-castle/background.png b/desktop/resources/outside-castle/background.png index 8b0e9bd9..507e328c 100644 Binary files a/desktop/resources/outside-castle/background.png and b/desktop/resources/outside-castle/background.png differ diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 98660758..da4d7c32 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -303,14 +303,15 @@ (actions/talk entities :ego "No one will notice one missing.") (actions/give entities :carrot))))}} :layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1) (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] :night [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] :sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) - (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]} + (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) + (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]} :entities {:peddler (actions/start-animation screen (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil :anim-sound-frames {peddler-stand {23 [:scratch 1.0]} @@ -407,7 +408,7 @@ (common/read-note-2 entities)))) :collision "outside-castle/collision.png" :scale-fn (utils/scaler-fn-from-image "outside-castle/scale-map.png" 0.20 1.00) - :start-pos [310 80] + :start-pos [259 80] :apply-state (fn [_ entities] (if (#{:night :sunrise} (get-in entities [:state :time])) (make-night entities)