Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 6.1 KiB |
BIN
desktop/resources/dream/pedestals.png
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
desktop/resources/dream/sign.png
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
desktop/resources/dream/sword.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
@@ -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)
|
||||
@@ -44,7 +46,8 @@
|
||||
:shovel (assoc (texture "dream/shovel.png") :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)
|
||||
:baseline 240)}
|
||||
:baseline 240)
|
||||
:sign (assoc (texture "dream/sign.png") :x 229 :y 33 :baseline 207)}
|
||||
: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]))
|
||||
|
||||