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

tweaks.

Browse Source
This commit is contained in:
Remington Covert
2015-04-21 17:40:27 -07:00
parent e6bad70bfe
commit c991ce34ad
4 changed files with 19 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

@@ -569,7 +569,7 @@
false))))
(defn transition-background [entities new-background [x y] & {:keys [transition-music? between time]}]
(defn transition-background [entities new-background [x y] & {:keys [transition-music? between time face]}]
(let [transition-music? (if (nil? transition-music?) true transition-music?)
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]))
@@ -593,11 +593,13 @@
(>= (get-in entities [:fade :opacity]) 1.0))
(terminate [this screen entities]
(if-let [next-time (get-in entities [:state :next-time])]
(-> entities
(assoc-in [:state :time] next-time)
(assoc-in [:state :next-time] nil))
entities))
(stop screen (if-let [next-time (get-in entities [:state :next-time])]
(-> entities
(assoc-in [:state :time] next-time)
(assoc-in [:state :next-time] nil))
entities)
:ego
:face face))
(can-skip? [this screen entities]
false))
(run-action entities
@@ -731,3 +733,5 @@
entities)
(can-skip? [this screen entities]
false)))
(defn in-love [entities])