diff --git a/desktop/resources/dream/fountain.png b/desktop/resources/dream/fountain.png new file mode 100644 index 00000000..c79c0826 Binary files /dev/null and b/desktop/resources/dream/fountain.png differ diff --git a/desktop/resources/outside-jail/fountain-dark.png b/desktop/resources/outside-jail/fountain-dark.png new file mode 100644 index 00000000..a5505633 Binary files /dev/null and b/desktop/resources/outside-jail/fountain-dark.png differ diff --git a/desktop/resources/outside-jail/fountain.png b/desktop/resources/outside-jail/fountain.png index 125f9a71..d28bce59 100644 Binary files a/desktop/resources/outside-jail/fountain.png and b/desktop/resources/outside-jail/fountain.png differ diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 7fa62cd2..d026c56c 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -82,8 +82,7 @@ (actions/talk entities :ego "This must be Frankie Rockfist's secret stash!"))) (defn make [screen] - (let [fountain (utils/make-anim "outside-jail/fountain.png" [42 50] 0.2 (range 3)) - guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) + (let [guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) guard-stand (animation 0.1 [(aget guard-sheet 0 0)]) guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] (aget guard-sheet 0 i))) guard-sleep (utils/make-anim "outside-jail/guard-sleep.png" [43 67] 0.1 (range 4)) @@ -157,24 +156,25 @@ (actions/remove-item entities :rope) (actions/add-entity entities :rope (get-in @entities [:room :rope]))))}} :end-of-rope {:box [177 101 185 108] - :script (actions/get-script entities (try-to-go-in-stash entities))}} - :layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)] - :night [(assoc (texture "outside-jail/background-dark.png") :x 0 :y 0 :baseline 0)]} - :entities {:fountain (assoc (animation->texture screen fountain) - :x 150 :y 126 :baseline 114 - :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!")) - :scripts {:flask-2 (actions/get-script entities - (actions/walk-to entities :ego [151 119] :face :right) - (actions/play-animation entities :ego :reach) - (actions/remove-item entities :flask-2) - (actions/give entities :flask-water) - (actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}) - :warden {:object nil + :script (actions/get-script entities (try-to-go-in-stash entities))} + :fountain {:box [150 126 193 147] + :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!")) + :scripts {:flask-2 (actions/get-script entities + (actions/walk-to entities :ego [151 119] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities :flask-2) + (actions/give entities :flask-water) + (actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}} + :layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)] + :night [(assoc (texture "outside-jail/background-dark.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outside-jail/fountain-dark.png") :x 0 :y 0 :baseline 114)]} + :entities {:warden {:object nil :x 36 :y 86 :width 10