Log.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -67,90 +67,90 @@ ending-castle2-assets/foreground
|
|||||||
orig: 344, 109
|
orig: 344, 109
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: -1
|
||||||
frankie-fall-1
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 324, 2
|
xy: 324, 2
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 0
|
||||||
frankie-fall-10
|
frankie-fall
|
||||||
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
|
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 366, 2
|
xy: 366, 2
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 1
|
||||||
frankie-fall-3
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 408, 2
|
xy: 408, 2
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 2
|
||||||
frankie-fall-4
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 442, 45
|
xy: 442, 45
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 3
|
||||||
frankie-fall-5
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 526, 58
|
xy: 526, 58
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 4
|
||||||
frankie-fall-6
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 670, 350
|
xy: 670, 350
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 5
|
||||||
frankie-fall-7
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 568, 110
|
xy: 568, 110
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 6
|
||||||
frankie-fall-8
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 568, 73
|
xy: 568, 73
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
offset: 0, 0
|
||||||
index: -1
|
index: 7
|
||||||
frankie-fall-9
|
frankie-fall
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 450, 8
|
xy: 450, 8
|
||||||
size: 40, 35
|
size: 40, 35
|
||||||
orig: 40, 35
|
orig: 40, 35
|
||||||
offset: 0, 0
|
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
|
georgia/kick
|
||||||
rotate: false
|
rotate: false
|
||||||
xy: 928, 467
|
xy: 928, 467
|
||||||
|
|||||||
@@ -280,8 +280,7 @@
|
|||||||
(defn play-animation [entities target-id anim & {:keys [stop? continue? next]}]
|
(defn play-animation [entities target-id anim & {:keys [stop? continue? next]}]
|
||||||
(run-action entities
|
(run-action entities
|
||||||
(begin [this screen entities]
|
(begin [this screen entities]
|
||||||
(update-in entities [:room :entities target-id] #(doto (start-animation screen % anim)
|
(update-in entities [:room :entities target-id] #(start-animation screen % anim) ))
|
||||||
println) ))
|
|
||||||
|
|
||||||
(continue [this screen entities] entities)
|
(continue [this screen entities] entities)
|
||||||
|
|
||||||
@@ -797,31 +796,8 @@
|
|||||||
:y (get-in entities [:room :entities :ego :y])
|
:y (get-in entities [:room :entities :ego :y])
|
||||||
:baseline (get-in entities [:room :entities :ego :baseline]))
|
:baseline (get-in entities [:room :entities :ego :baseline]))
|
||||||
(particle-effect! :reset) (particle-effect! :start)))
|
(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]
|
(continue [this screen entities]
|
||||||
(assoc-in entities [:room :entities :glad-jump :y] (+ (get-in entities [:room :entities :ego :y]) 5))
|
(assoc-in entities [:room :entities :glad-jump :y] (+ (get-in entities [:room :entities :ego :y]) 5))
|
||||||
|
|||||||