diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 723cb82b..108d880f 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -366,9 +366,10 @@ :fairy-godfather "Or the smell of soap in the bathroom, where you'll spend your time making the tile and porcelain shine.")) (defn make [screen] - (let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1]) - fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6]) - fairy-godfather-magic-anim (utils/make-anim "dream/fairy-godfather-magic.png" [100 77] 0.15 [0 1 2 3 4 4 4 4 3 2 1 0])] + (let [[screen atlas] (utils/acquire-atlas screen "packed/dream.atlas") + fairy-godfather-anim (utils/make-anim atlas "fairy-godfather" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1]) + fairy-godfather-talk-anim (utils/make-anim atlas "fairy-godfather" [63 77] 0.15 [5 6 7 8 7 6]) + fairy-godfather-magic-anim (utils/make-anim atlas "fairy-godfather-magic" [100 77] 0.15 [0 1 2 3 4 4 4 4 3 2 1 0])] (rooms/make :music {:intro :wind :day :dream} :name "Dream" :interactions {:pit {:box [54 0 219 36] @@ -405,29 +406,29 @@ :ego "It seems like misery!" :ego "Plus, how can I ever win the heart of my true love, Georgia McGorgeous?"))}}} :timers {:return [1.0 1.0 return-from-island]} - :layers [(assoc (utils/get-texture "dream/sky.png") :x 0 :y 0 :baseline -3 :parallax 0.5) - (assoc (utils/get-texture "dream/far.png") :x -10 :y 0 :baseline -2 :origin-x 160 :parallax 0.5) - (assoc (utils/get-texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) - (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) - (assoc (utils/get-texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) - (assoc (utils/get-texture "dream/background.png") :x 0 :y 0 :baseline 2) - (assoc (utils/get-texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) - (assoc (utils/get-texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) - (assoc (utils/get-texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] - :current-layers [(assoc (utils/get-texture "dream/sky.png") :x 160 :y 120 :origin-y 120 :baseline -3 :origin-x 160 :parallax 0.01) - (assoc (utils/get-texture "dream/far.png") :x 160 :y 120 :baseline -2 :origin-y 120 :origin-x 160 :parallax 0.01) - (assoc (utils/get-texture "dream/clouds1.png") :x 150 :y 120 :baseline -1 :origin-x 160 :origin-y 120 :parallax 0.1 :scale-x 1.1 :scale-y 1.1) - (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :origin-x 15 :origin-y 10 :baseline 0 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) - (assoc (utils/get-texture "dream/cliff.png") :x 160 :y 120 :origin-x 160 :origin-y 120 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) - (assoc (utils/get-texture "dream/background.png") :x 0 :y 0 :baseline 2) - (assoc (utils/get-texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) - (assoc (utils/get-texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) - (assoc (utils/get-texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] + :layers [(assoc (utils/atlas->texture atlas "sky") :x 0 :y 0 :baseline -3 :parallax 0.5) + (assoc (utils/atlas->texture atlas "far") :x -10 :y 0 :baseline -2 :origin-x 160 :parallax 0.5) + (assoc (utils/atlas->texture atlas "clouds1") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/atlas->texture atlas "island") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/atlas->texture atlas "cliff") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) + (assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 2) + (assoc (utils/atlas->texture atlas "corner-l") :x -10 :y -10 :baseline 240 :parallax 2.0 ) + (assoc (utils/atlas->texture atlas "corner-r") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) + (assoc (utils/atlas->texture atlas "pedestals") :x 0 :y 0 :baseline 139)] + :current-layers [(assoc (utils/atlas->texture atlas "sky") :x 160 :y 120 :origin-y 120 :baseline -3 :origin-x 160 :parallax 0.01) + (assoc (utils/atlas->texture atlas "far") :x 160 :y 120 :baseline -2 :origin-y 120 :origin-x 160 :parallax 0.01) + (assoc (utils/atlas->texture atlas "clouds1") :x 150 :y 120 :baseline -1 :origin-x 160 :origin-y 120 :parallax 0.1 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/atlas->texture atlas "island") :x 180 :y 180 :origin-x 15 :origin-y 10 :baseline 0 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/atlas->texture atlas "cliff") :x 160 :y 120 :origin-x 160 :origin-y 120 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) + (assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 2) + (assoc (utils/atlas->texture atlas "corner-l") :x -10 :y -10 :baseline 240 :parallax 2.0 ) + (assoc (utils/atlas->texture atlas "corner-r") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) + (assoc (utils/atlas->texture atlas "pedestals") :x 0 :y 0 :baseline 139)] :entities {:magic (assoc (particle-effect "particles/dream-magic") :x 160 :y 80 :baseline 240) :clouds (assoc (particle-effect "particles/cloudy2") :x 160 :y 120 :baseline 241) - :case (assoc (utils/get-texture "dream/case.png") + :case (assoc (utils/atlas->texture atlas "case") :x 144 :y 122 :baseline 139 :label "Glass case" :cursor :look @@ -477,11 +478,11 @@ (do (actions/walk-to entities :ego [148 76] :face :right) (actions/do-dialogue entities :fairy-godfather "What are you doing?" :ego "Erm... Nothing."))))}) - :sword (assoc (utils/get-texture "dream/sword.png") + :sword (assoc (utils/atlas->texture atlas "sword") :x 144 :y 122 :baseline 139) :explode (assoc (particle-effect "particles/explode") :x 150 :y 138 :baseline 240) - :broom (assoc (utils/get-texture "dream/broom.png") :x 286 :y 122 + :broom (assoc (utils/atlas->texture atlas "broom") :x 286 :y 122 :path (catmull-rom-spline (map #(apply vector-2* %) [[286 122] [286 128]]) true) :update-fn (partial utils/update-path-location 0.30) @@ -498,7 +499,7 @@ (actions/give entities :broom)) (read-broom-plaque entities)))) - :shovel (assoc (utils/get-texture "dream/shovel.png") :x 33 :y 122 + :shovel (assoc (utils/atlas->texture atlas "shovel") :x 33 :y 122 :path (catmull-rom-spline (map #(apply vector-2* %) [[22 122] [22 128]]) true) :update-fn (partial utils/update-path-location 0.33) @@ -515,10 +516,10 @@ (actions/give entities :shovel)) (read-shovel-plaque entities)))) - :sign (assoc (utils/get-texture "dream/sign.png") :x 229 :y 33 :baseline 207) - :plaque-1 (assoc (utils/get-texture "dream/plaque1.png") :x 39 :y 99 :baseline 139 :label "Plaque" :cursor :look :script (actions/get-script entities (read-shovel-plaque entities))) - :plaque-2 (assoc (utils/get-texture "dream/plaque2.png") :x 147 :y 104 :baseline 139 :label "Plaque" :cursor :look :script (actions/get-script entities (read-sword-plaque entities))) - :plaque-3 (assoc (utils/get-texture "dream/plaque3.png") :x 283 :y 98 :baseline 139 :label "Plaque" :cursor :look :script (actions/get-script entities (read-broom-plaque entities))) + :sign (assoc (utils/atlas->texture atlas "sign") :x 229 :y 33 :baseline 207) + :plaque-1 (assoc (utils/atlas->texture atlas "plaque1") :x 39 :y 99 :baseline 139 :label "Plaque" :cursor :look :script (actions/get-script entities (read-shovel-plaque entities))) + :plaque-2 (assoc (utils/atlas->texture atlas "plaque2") :x 147 :y 104 :baseline 139 :label "Plaque" :cursor :look :script (actions/get-script entities (read-sword-plaque entities))) + :plaque-3 (assoc (utils/atlas->texture atlas "plaque3") :x 283 :y 98 :baseline 139 :label "Plaque" :cursor :look :script (actions/get-script entities (read-broom-plaque entities))) :outside-particles (common/make-outside-particles) :bounce-surrogate {:object nil :path (catmull-rom-spline (map #(apply vector-2* %) [[200 130] [200 150]]) true)