diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 6ef45136..2eacda95 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -396,9 +396,7 @@ (-> entities (assoc-in [:tweens :ego-x] (tween/tween :ego-x screen [:room :entities :ego :x] 200 163 0.5 :ease tween/ease-linear)) - (assoc-in [:tweens :ego-y] (tween/tween :ego-y screen [:room :entities :ego :y] 166 186 0.5 :ease tween/ease-out-cubic)) - (update-in [:room :entities :bloodclot-swallow-top] #(actions/start-animation screen % :swallow)) - (update-in [:room :entities :bloodclot-swallow-bottom] #(actions/start-animation screen % :swallow)))) + (assoc-in [:tweens :ego-y] (tween/tween :ego-y screen [:room :entities :ego :y] 166 186 0.5 :ease tween/ease-out-cubic)))) (continue [this screen entities] entities) (done? [this screen entities] @@ -443,7 +441,7 @@ (Thread/sleep time)) (defn fall-in [entities] - (Thread/sleep 500) + (Thread/sleep 1500) (actions/run-action entities (begin [this screen entities] @@ -500,16 +498,20 @@ (update-in [:room :entities :sword-spin] assoc :opacity 1 :scale-x 0.5 :scale-y 0.5) (assoc-in [:room :entities :falling-bg :opacity] 1) (assoc-in [:room :entities :belly-bottom :opacity] 1) + (assoc-in [:room :entities :sword-spin :y] 320) (update-in [:room :entities :falling-bg ] dissoc :anim) ))) + (Thread/sleep 2000) + (actions/tween entities :sword-fall (fn [screen entities] - (tween/tween :sword-fall screen [:room :entities :sword-spin :y] 240 120 1.5 :ease tween/ease-linear))) + (tween/tween :sword-fall screen [:room :entities :sword-spin :y] 320 120 1.0 :ease tween/ease-linear))) (actions/update-entities entities (fn [e] (-> e (assoc-in [:room :entities :belly-bottom :opacity] 0)))) (show-big-bloodclot entities 0) + (Thread/sleep 1000) (actions/update-entities entities (fn [e] (-> e (update-in [:room :entities :bloodclot-swallow-top] #(actions/start-animation % :uhoh)) diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index 7c72ea30..bfdabbf1 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -85,8 +85,7 @@ (> (- (:total-time screen) @start-time) 8.0)) (terminate [this screen entities] - entities - ) + (update-in entities [:room :entities :ego ] #(actions/start-animation screen % :crawl-stand))) (skip-type [this screen entities] :none)))) @@ -122,9 +121,10 @@ (actions/tween entities :arm-y (fn [screen entities] - (tween/tween :arm-y screen [:room :entities :arm :y] 240 90 4.0 :ease tween/ease-linear))) + (tween/tween :arm-y screen [:room :entities :arm :y] 240 70 3.0 :ease tween/ease-linear))) - (actions/transition-background entities :tongue-fight [141 110])) + (actions/transition-background entities :tongue-fight [141 240]) + (actions/walk-straight-to entities :ego [141 110] :anim :tongue-idle :speed 4.0))