diff --git a/desktop/resources/inside-castle/way-back-tree-dark.png b/desktop/resources/inside-castle/way-back-tree-dark.png new file mode 100644 index 00000000..19ff1643 Binary files /dev/null and b/desktop/resources/inside-castle/way-back-tree-dark.png differ diff --git a/desktop/resources/inside-castle/way-back-tree.png b/desktop/resources/inside-castle/way-back-tree.png new file mode 100644 index 00000000..0ca53f6a Binary files /dev/null and b/desktop/resources/inside-castle/way-back-tree.png differ diff --git a/desktop/resources/outside-castle/background-dark.png b/desktop/resources/outside-castle/background-dark.png index 1c62749e..a90dd5fd 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/outside-castle/background.png b/desktop/resources/outside-castle/background.png index 0cdbc94d..8b0e9bd9 100644 Binary files a/desktop/resources/outside-castle/background.png and b/desktop/resources/outside-castle/background.png differ diff --git a/desktop/resources/outside-castle/brush-dark.png b/desktop/resources/outside-castle/brush-dark.png new file mode 100644 index 00000000..d5557dfa Binary files /dev/null and b/desktop/resources/outside-castle/brush-dark.png differ diff --git a/desktop/resources/outside-castle/brush.png b/desktop/resources/outside-castle/brush.png new file mode 100644 index 00000000..60aab9af Binary files /dev/null and b/desktop/resources/outside-castle/brush.png differ diff --git a/desktop/resources/outside-jail/axe-dark.png b/desktop/resources/outside-jail/axe-dark.png new file mode 100644 index 00000000..9564a68e Binary files /dev/null and b/desktop/resources/outside-jail/axe-dark.png differ diff --git a/desktop/resources/outside-jail/axe.png b/desktop/resources/outside-jail/axe.png new file mode 100644 index 00000000..55484747 Binary files /dev/null and b/desktop/resources/outside-jail/axe.png differ diff --git a/desktop/resources/outside-jail/background-dark.png b/desktop/resources/outside-jail/background-dark.png index 3b7fe069..54911a86 100644 Binary files a/desktop/resources/outside-jail/background-dark.png and b/desktop/resources/outside-jail/background-dark.png differ diff --git a/desktop/resources/outside-jail/background.png b/desktop/resources/outside-jail/background.png index 748fb837..97704c42 100644 Binary files a/desktop/resources/outside-jail/background.png and b/desktop/resources/outside-jail/background.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 139b60f5..0dd26bad 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -295,7 +295,8 @@ (actions/talk entities :ego "Ye Ol' Antique Shoppe."))} :background-houses {:box [84 145 126 180] :script (actions/get-script entities - (actions/walk-to entities :ego [79 145] :face :right) + (actions/walk-to entities :ego [79 145] :face :right :stop? false) + (actions/walk-straight-to entities :ego [92 150] :face :right) (actions/transition-background entities :outside-jail [159 -20]) (actions/walk-straight-to entities :ego [159 20])) :cursor :right} @@ -316,10 +317,13 @@ :ego "One day, when I'm a knight, I'll ask her to be my girlfriend.") (actions/in-love entities))}} :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] - :night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0)] + :night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0) + (assoc (texture "inside-castle/way-back-tree-dark.png") :x 0 :y 0 :baseline 97)] :sunrise [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]} + + (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]} :blackout (assoc (texture "black.png") :x 0 :y 0 :width 320 diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 06d34081..b23b1b40 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -295,10 +295,13 @@ (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/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 240)] :night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outside-castle/brush-dark.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-dark.png") :x 0 :y 0 :baseline 240)] :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 240)]} :entities {:peddler (actions/start-animation screen (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index d80efe3c..0e4f6c54 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -93,8 +93,8 @@ :script (actions/get-script entities (actions/walk-to entities :ego [159 5]) (actions/walk-straight-to entities :ego [159 -20]) - (actions/transition-background entities :inside-castle [79 145] - ) + (actions/transition-background entities :inside-castle [92 150]) + (actions/walk-straight-to entities :ego [79 145] :stop? false) (actions/walk-to entities :ego [159 74])) :cursor :down} :door {:box [22 42 46 124] @@ -133,7 +133,10 @@ (actions/walk-to entities :ego [170 71] :face :right) (actions/walk-straight-to entities :ego [188 71] :face :right) (actions/play-animation entities :ego :reach) + (actions/remove-entity entities :axe) (actions/play-animation entities :ego :axe-wood) + (actions/play-animation entities :ego :reach) + (actions/add-entity entities :axe (get-in @entities [:room [:axe (get-in @entities [:state :time])]])) (actions/walk-straight-to entities :ego [170 71])) :scripts {:alarm-clock (actions/get-script entities (actions/walk-to entities :ego [170 71] :face :right) @@ -163,9 +166,7 @@ :script (actions/get-script entities (actions/walk-to entities :ego [151 119] :face :right) (actions/play-animation entities :ego :reach) - (actions/do-dialogue entities :ego "Ahh, life-giving water." - :ego "I feel strength." - :ego "And renewal!")) + (actions/do-dialogue entities :ego "Ahh, life-giving water.")) :scripts {:flask-2 (actions/get-script entities (actions/walk-to entities :ego [151 119] :face :right) (actions/play-animation entities :ego :reach) @@ -188,6 +189,9 @@ :x 172 :y 140 :baseline 114)} + + [:axe :day] (rooms/make-entity :axe (assoc (texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176)) + [:axe :night] (rooms/make-entity :axe (assoc (texture "outside-jail/axe-dark.png") :x 213 :y 63 :baseline 176)) :guard (rooms/make-entity :guard (assoc (animation->texture screen guard-stand) :x 70 :y 55 :baseline 185 :stand guard-stand @@ -217,6 +221,7 @@ :start-pos [145 15] :apply-state (fn [entities] (as-> entities entities + (assoc-in entities [:room :entities :axe] (get-in entities [:room [:axe (get-in entities [:state :time])]])) (if (= :night (get-in entities [:state :time])) (make-night entities) entities)