From 03cba14c2ae81fffb4b3f66f0f0ce6a351123e0c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 29 May 2017 10:12:59 -0700 Subject: [PATCH] Log. --- ...{frankie-fall-1.png => frankie-fall_0.png} | Bin ...{frankie-fall-2.png => frankie-fall_1.png} | Bin ...rankie-fall-11.png => frankie-fall_10.png} | Bin ...rankie-fall-12.png => frankie-fall_11.png} | Bin ...{frankie-fall-3.png => frankie-fall_2.png} | Bin ...{frankie-fall-4.png => frankie-fall_3.png} | Bin ...{frankie-fall-5.png => frankie-fall_4.png} | Bin ...{frankie-fall-6.png => frankie-fall_5.png} | Bin ...{frankie-fall-7.png => frankie-fall_6.png} | Bin ...{frankie-fall-8.png => frankie-fall_7.png} | Bin ...{frankie-fall-9.png => frankie-fall_8.png} | Bin ...frankie-fall-10.png => frankie-fall_9.png} | Bin desktop/resources/packed/ending-castle.atlas | 78 +++++++++--------- desktop/src-common/advent/actions.clj | 30 +------ 14 files changed, 42 insertions(+), 66 deletions(-) rename desktop/asset-work/ending-castle/{frankie-fall-1.png => frankie-fall_0.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-2.png => frankie-fall_1.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-11.png => frankie-fall_10.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-12.png => frankie-fall_11.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-3.png => frankie-fall_2.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-4.png => frankie-fall_3.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-5.png => frankie-fall_4.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-6.png => frankie-fall_5.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-7.png => frankie-fall_6.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-8.png => frankie-fall_7.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-9.png => frankie-fall_8.png} (100%) rename desktop/asset-work/ending-castle/{frankie-fall-10.png => frankie-fall_9.png} (100%) diff --git a/desktop/asset-work/ending-castle/frankie-fall-1.png b/desktop/asset-work/ending-castle/frankie-fall_0.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-1.png rename to desktop/asset-work/ending-castle/frankie-fall_0.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-2.png b/desktop/asset-work/ending-castle/frankie-fall_1.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-2.png rename to desktop/asset-work/ending-castle/frankie-fall_1.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-11.png b/desktop/asset-work/ending-castle/frankie-fall_10.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-11.png rename to desktop/asset-work/ending-castle/frankie-fall_10.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-12.png b/desktop/asset-work/ending-castle/frankie-fall_11.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-12.png rename to desktop/asset-work/ending-castle/frankie-fall_11.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-3.png b/desktop/asset-work/ending-castle/frankie-fall_2.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-3.png rename to desktop/asset-work/ending-castle/frankie-fall_2.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-4.png b/desktop/asset-work/ending-castle/frankie-fall_3.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-4.png rename to desktop/asset-work/ending-castle/frankie-fall_3.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-5.png b/desktop/asset-work/ending-castle/frankie-fall_4.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-5.png rename to desktop/asset-work/ending-castle/frankie-fall_4.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-6.png b/desktop/asset-work/ending-castle/frankie-fall_5.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-6.png rename to desktop/asset-work/ending-castle/frankie-fall_5.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-7.png b/desktop/asset-work/ending-castle/frankie-fall_6.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-7.png rename to desktop/asset-work/ending-castle/frankie-fall_6.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-8.png b/desktop/asset-work/ending-castle/frankie-fall_7.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-8.png rename to desktop/asset-work/ending-castle/frankie-fall_7.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-9.png b/desktop/asset-work/ending-castle/frankie-fall_8.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-9.png rename to desktop/asset-work/ending-castle/frankie-fall_8.png diff --git a/desktop/asset-work/ending-castle/frankie-fall-10.png b/desktop/asset-work/ending-castle/frankie-fall_9.png similarity index 100% rename from desktop/asset-work/ending-castle/frankie-fall-10.png rename to desktop/asset-work/ending-castle/frankie-fall_9.png diff --git a/desktop/resources/packed/ending-castle.atlas b/desktop/resources/packed/ending-castle.atlas index 1f78a4cf..76b52d36 100644 --- a/desktop/resources/packed/ending-castle.atlas +++ b/desktop/resources/packed/ending-castle.atlas @@ -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 diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 89d22c53..030a461a 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -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))