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

simplified wind.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-08 15:51:46 -07:00
parent 2ff70ff209
commit cae1ca9aed
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -521,7 +521,7 @@ void main()
choose-step-sound (fn [entities]
(if (#{:inside-house :inside-stash :inside-cafeteria :inside-antique :inside-jail}
(get-in entities [:state :last-room]))
:blink
(rand-nth [:inside-step-sound-1 :inside-step-sound-2 :inside-step-sound-3 :inside-step-sound-4])
(rand-nth [:step-sound-1 :step-sound-2 :step-sound-3 :step-sound-4])))
@@ -634,6 +634,11 @@ void main()
:step-sound-2 (utils/load-sound "ego/step-2.ogg")
:step-sound-3 (utils/load-sound "ego/step-3.ogg")
:step-sound-4 (utils/load-sound "ego/step-4.ogg")
:inside-step-sound-1 (utils/load-sound "ego/inside-step-1.ogg")
:inside-step-sound-2 (utils/load-sound "ego/inside-step-2.ogg")
:inside-step-sound-3 (utils/load-sound "ego/inside-step-3.ogg")
:inside-step-sound-4 (utils/load-sound "ego/inside-step-4.ogg")
:sigh-sound (utils/load-sound "ego/sigh.ogg")
:breakglass-sound (utils/load-sound "ego/breakglass.ogg")
:idea-sound (utils/load-sound "ego/idea.ogg")
@@ -784,7 +789,7 @@ void main()
{:object nil
:active? true
:last-room :dream
:time :day
:time :intro
:obtained-items #{}
:inventory []
:plaques-read #{}
@@ -795,8 +800,7 @@ void main()
(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])))
(when (get-in entities [:state :seen-intro?])
(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 :music]) (get-in entities [:state :time]))]))
(assoc entities
:tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic
:finish #(if (not (get-in % [:state :seen-intro?]))
@@ -894,7 +898,7 @@ void main()
(defn get-rendered [entities e]
(merge e
(when (not= :day (get-in entities [:state :time]))
(when (= :night (get-in entities [:state :time]))
(get-in entities [:time-profiles (:night-profile e :default)]))))
@@ -970,7 +974,8 @@ void main()
:pull-sword (utils/make-music "music/pull-sword.ogg")
:night (utils/make-music "music/night.ogg")
:dream (utils/make-music "dream/music.ogg")
:secret-hideout (utils/make-music "music/secret-hideout.ogg")}
:secret-hideout (utils/make-music "music/secret-hideout.ogg")
:wind (utils/make-music "music/wind.ogg")}
:state (get-state @utils/selected-save)
:time-profiles {:object nil
:default utils/default-night-merge