This commit is contained in:
Bryce Covert
2017-05-29 10:12:59 -07:00
parent f0bce2180f
commit 03cba14c2a
14 changed files with 42 additions and 66 deletions

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -67,90 +67,90 @@ ending-castle2-assets/foreground
orig: 344, 109
offset: 0, 0
index: -1
frankie-fall-1
frankie-fall
rotate: false
xy: 324, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-10
rotate: false
xy: 492, 13
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-11
rotate: false
xy: 534, 21
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-12
rotate: false
xy: 576, 36
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-2
index: 0
frankie-fall
rotate: false
xy: 366, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-3
index: 1
frankie-fall
rotate: false
xy: 408, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-4
index: 2
frankie-fall
rotate: false
xy: 442, 45
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-5
index: 3
frankie-fall
rotate: false
xy: 526, 58
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-6
index: 4
frankie-fall
rotate: false
xy: 670, 350
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-7
index: 5
frankie-fall
rotate: false
xy: 568, 110
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-8
index: 6
frankie-fall
rotate: false
xy: 568, 73
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-9
index: 7
frankie-fall
rotate: false
xy: 450, 8
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
index: 8
frankie-fall
rotate: false
xy: 492, 13
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 9
frankie-fall
rotate: false
xy: 534, 21
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 10
frankie-fall
rotate: false
xy: 576, 36
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 11
georgia/kick
rotate: false
xy: 928, 467

View File

@@ -280,8 +280,7 @@
(defn play-animation [entities target-id anim & {:keys [stop? continue? next]}]
(run-action entities
(begin [this screen entities]
(update-in entities [:room :entities target-id] #(doto (start-animation screen % anim)
println) ))
(update-in entities [:room :entities target-id] #(start-animation screen % anim) ))
(continue [this screen entities] entities)
@@ -797,31 +796,8 @@
:y (get-in entities [:room :entities :ego :y])
:baseline (get-in entities [:room :entities :ego :baseline]))
(particle-effect! :reset) (particle-effect! :start)))
(assoc-in [:room :entities :cloud] (assoc (utils/get-texture "space/cloud.png")
:x (get-in entities [:room :entities :ego :x])
:y (get-in entities [:room :entities :ego :y])
:origin-x 7
:origin-y 7
:scale-x 0.5
:scale-y 0.5
:opacity 0.5
:baseline 240))
(assoc-in [:tweens :cloud-up] (tween/tween :cloud-up screen [:room :entities :cloud :y]
(get-in entities [:room :entities :ego :y])
(+ (get-in entities [:room :entities :ego :y]) 10)
1.0))
(assoc-in [:tweens :cloud-fade] (tween/tween :cloud-fade screen [:room :entities :cloud :opacity]
0.5
0.0
1.0))
(assoc-in [:tweens :cloud-grow] (tween/tween :cloud-grow screen [:room :entities :cloud :scale-y]
0.5
1.0
1.0))
(assoc-in [:tweens :cloud-grow-2] (tween/tween :cloud-grow-2 screen [:room :entities :cloud :scale-x]
0.5
1.0
1.0)))))
)))
(continue [this screen entities]
(assoc-in entities [:room :entities :glad-jump :y] (+ (get-in entities [:room :entities :ego :y]) 5))