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

fixed music up.

Browse Source
This commit is contained in:
Bryce Covert
2017-06-21 20:07:57 -07:00
parent 0ac95fb8f9
commit 7857c8cf09
19 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
desktop/src-common/advent/screens/scene.clj
View File

@@ -897,7 +897,7 @@
(defn fade-in-first-time-if-necessary [screen entities]
(if (not (get-in entities [:started? :value]))
(do (music! (utils/get-current-music entities) :set-volume (utils/current-music-volume (get-in entities [:volume :value])))
(utils/play-music (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))]))
(utils/play-music (get-in entities [:musics (actions/get-music (get-in entities [:room-musics (doto (get-in entities [:state :last-room]) println)]) (get-in entities [:state :time]))]))
(-> entities
(assoc
:tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic
@@ -1223,7 +1223,24 @@
:castle-gate (wrap rooms.castle-gate/make "packed/castle-gate.atlas")
:outside-jail (wrap rooms.outside-jail/make "packed/outside-jail.atlas")
:outside-castle (wrap rooms.outside-castle/make "packed/outside-castle.atlas") }
entities {:rooms rooms
:room-musics {:inside-house :inside-fangald
:inside-stash {:day :secret-hideout :night :secret-hideout}
:outside-house {:day :town-2 :night :night :sunrise :night}
:behind-house {:day :town-2 :night :night :sunrise :night}
:cat-tree {:day :town-2 :night :night :sunrise :night}
:inside-castle {:day :town-1 :night :night :sunrise :night}
:space :fight
:held :fight
:inside-cafeteria {:day :town-1 :night :night :sunrise :night}
:inside-antique :inside-antique
:inside-jail :inside-antique
:dream {:intro :wind :day :dream}
:ending :dream
:castle-gate {:day :town-2 :night :night}
:outside-jail {:day :town-1 :night :night :sunrise :night}
:outside-castle {:day :town-2 :night :night} }
:step-particles (assoc (particle-effect "particles/step") :x 100 :y 100 :baseline 241)
:cam {:zoom utils/min-zoom
:ideal-x 160