totally reworking music transitions.

This commit is contained in:
2015-02-11 19:29:20 -08:00
parent b4c0fdcc6e
commit 5fbb4f1f31
5 changed files with 62 additions and 40 deletions

View File

@@ -100,11 +100,11 @@
(actions/transition-background entities :space [0 65])
(actions/walk-straight-to entities :ego [140 55] :face :right)
(actions/play-animation entities :blergh :appear :stop? false)
(actions/transition-music entities :town-1 :fight))
(actions/transition-music entities :fight))
(defn pull-sword [entities]
(actions/play-animation entities :ego :reach)
(actions/transition-music entities :town-1 :pull-sword)
(actions/transition-music entities :pull-sword)
(actions/add-entity entities :blackout (get-in @entities [:room :blackout]))
(actions/add-entity entities :pull-sword (get-in @entities [:room :pull-sword]))
(actions/play-animation entities :pull-sword :pull-sword)
@@ -112,7 +112,7 @@
(actions/remove-entity entities :sword)
(actions/remove-entity entities :pull-sword)
(actions/remove-entity entities :blackout)
(actions/transition-music entities :pull-sword :town-1)
(actions/transition-music entities nil)
(actions/do-dialogue entities :ego "That was weird."
:ego "I have to go show my friends!")