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

addded crappy night music.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-28 17:14:17 -08:00
parent 3ef0a4e157
commit 972a284fac
8 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
desktop/src-common/advent/actions.clj
View File

@@ -457,9 +457,14 @@
(can-skip? [this screen entities]
false)))
(defn get-music [music time]
(if (keyword? music)
music
(time music)))
(defn transition-music
([entities new-music]
(transition-music entities (get-in @entities [:room :music]) new-music))
(transition-music entities (get-music (get-in @entities [:room :music]) (get-in @entities [:state :time])) new-music))
([entities old-music new-music]
(let [current-volume (atom 1.0)]
(run-action entities
@@ -482,9 +487,10 @@
(can-skip? [this screen entities]
false)))))
(defn transition-background [entities new-background [x y]]
(let [old-music (get-in @entities [:room :music])
new-music (get-in @entities [:rooms new-background :music])
(let [old-music (get-music (get-in @entities [:room :music]) (get-in @entities [:state :time]))
new-music (get-music (get-in @entities [:rooms new-background :music]) (get-in @entities [:state :time]))
music-changed? (not= old-music new-music)]
(run-action entities
(begin [this screen entities]
@@ -514,12 +520,12 @@
(run-action entities
(begin [this screen entities]
(let [ego (get-in entities [:room :entities :ego])
old-music (get-in entities [:room :music])
old-music (get-music (get-in entities [:room :music]) (get-in entities [:state :time]))
entities (-> entities
(assoc-in [:room] (get-in entities [:rooms new-background]))
(assoc-in [:room :entities :ego] ego)
(assoc-in [:state :last-room] new-background))
new-music (get-in entities [:room :music])
new-music (get-music (get-in entities [:room :music]) (get-in entities [:state :time]))
apply-state (get-in entities [:room :apply-state])
entities (if apply-state
(apply-state entities)