notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

happy with the ending.

Browse Source
This commit is contained in:
Bryce Covert
2018-02-10 22:22:57 -08:00
parent 2ab191c2d5
commit e9b1c8b0a4
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/src-common/advent/screens/rooms/common.clj
View File

@@ -396,9 +396,7 @@
(-> entities (-> 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-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)) (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))))
(continue [this screen entities] (continue [this screen entities]
entities) entities)
(done? [this screen entities] (done? [this screen entities]
@@ -443,7 +441,7 @@
(Thread/sleep time)) (Thread/sleep time))
(defn fall-in [entities] (defn fall-in [entities]
(Thread/sleep 500) (Thread/sleep 1500)
(actions/run-action entities (actions/run-action entities
(begin [this screen 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) (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 :falling-bg :opacity] 1)
(assoc-in [:room :entities :belly-bottom :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) (update-in [:room :entities :falling-bg ] dissoc :anim)
))) )))
(Thread/sleep 2000)
(actions/tween entities :sword-fall (fn [screen entities] (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] (actions/update-entities entities (fn [e]
(-> e (-> e
(assoc-in [:room :entities :belly-bottom :opacity] 0)))) (assoc-in [:room :entities :belly-bottom :opacity] 0))))
(show-big-bloodclot entities 0) (show-big-bloodclot entities 0)
(Thread/sleep 1000)
(actions/update-entities entities (fn [e] (actions/update-entities entities (fn [e]
(-> e (-> e
(update-in [:room :entities :bloodclot-swallow-top] #(actions/start-animation % :uhoh)) (update-in [:room :entities :bloodclot-swallow-top] #(actions/start-animation % :uhoh))

8
desktop/src-common/advent/screens/rooms/held.clj
View File

@@ -85,8 +85,7 @@
(> (- (:total-time screen) @start-time) 8.0)) (> (- (:total-time screen) @start-time) 8.0))
(terminate [this screen entities] (terminate [this screen entities]
entities (update-in entities [:room :entities :ego ] #(actions/start-animation screen % :crawl-stand)))
)
(skip-type [this screen entities] (skip-type [this screen entities]
:none)))) :none))))
@@ -122,9 +121,10 @@
(actions/tween entities (actions/tween entities
:arm-y :arm-y
(fn [screen entities] (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))