diff --git a/desktop/resources/dream/background.png b/desktop/resources/dream/background.png index ea0de9e5..ce5ffca2 100644 Binary files a/desktop/resources/dream/background.png and b/desktop/resources/dream/background.png differ diff --git a/desktop/resources/dream/collision.png b/desktop/resources/dream/collision.png index 06fa5f59..fffec9a9 100644 Binary files a/desktop/resources/dream/collision.png and b/desktop/resources/dream/collision.png differ diff --git a/desktop/resources/dream/pedestals.png b/desktop/resources/dream/pedestals.png new file mode 100644 index 00000000..78f654d5 Binary files /dev/null and b/desktop/resources/dream/pedestals.png differ diff --git a/desktop/resources/dream/sword.png b/desktop/resources/dream/sword.png new file mode 100644 index 00000000..aee0d858 Binary files /dev/null and b/desktop/resources/dream/sword.png differ diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 17b308d1..6ed59c76 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -35,8 +35,10 @@ (assoc (texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) (assoc (texture "dream/background.png") :x 0 :y 0 :baseline 2) (assoc (texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0) - (assoc (texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2)] + (assoc (texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) + (assoc (texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] :entities {:clouds (assoc (particle-effect "dream/cloudy2") :x 160 :y 120 :baseline 241) + :sword (assoc (texture "dream/sword.png") :x 144 :y 122 :baseline 139) :broom (assoc (texture "dream/broom.png") :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) @@ -46,5 +48,5 @@ :update-fn (partial utils/update-path-location 0.33) :baseline 240)} :collision "dream/collision.png" - :scale-fn (constantly 1.5) + :scale-fn (utils/scaler-fn-with-baseline 40 0.5 1.6) :start-pos [140 55]))