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

un. believable. iphone 4s can play the whole game.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-25 20:24:21 -07:00
parent aec484deb5
commit a8b5136a9c
13 changed files with 91 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,28 +654,28 @@
:origin-x 9
:origin-y 0
:scaled true
#_#_:drop-sound (utils/load-sound "ego/drop.ogg")
#_#_:milk-sound (utils/load-sound "outsidehouse/milk.ogg")
#_#_:step-sound-1 (utils/load-sound "ego/step-1.ogg")
#_#_: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")
#_#_:shoot-sound (utils/load-sound "ego/slingshot.ogg")
#_#_:glad-sound (utils/load-sound "ego/glad.ogg")
:drop-sound (utils/load-sound "ego/drop.ogg")
:milk-sound (utils/load-sound "outsidehouse/milk.ogg")
:step-sound-1 (utils/load-sound "ego/step-1.ogg")
: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")
:shoot-sound (utils/load-sound "ego/slingshot.ogg")
:glad-sound (utils/load-sound "ego/glad.ogg")
#_#_:get-sick-sound (utils/load-sound "ego/get-sick.ogg")
#_#_:scratch-sound (utils/load-sound "ego/scratch.ogg")
#_#_:scared-step-sound (utils/load-sound "ego/scared-step.ogg")
:get-sick-sound (utils/load-sound "ego/get-sick.ogg")
:scratch-sound (utils/load-sound "ego/scratch.ogg")
:scared-step-sound (utils/load-sound "ego/scared-step.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")
#_#_:crowbar-sound (utils/load-sound "ego/crowbar.ogg")
#_#_:sigh-sound (utils/load-sound "ego/sigh.ogg")
#_#_:axe-sound (utils/load-sound "ego/axe.ogg")
#_#_:breakglass-sound (utils/load-sound "ego/breakglass.ogg")
#_#_:idea-sound (utils/load-sound "ego/idea.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")
:crowbar-sound (utils/load-sound "ego/crowbar.ogg")
:sigh-sound (utils/load-sound "ego/sigh.ogg")
:axe-sound (utils/load-sound "ego/axe.ogg")
:breakglass-sound (utils/load-sound "ego/breakglass.ogg")
:idea-sound (utils/load-sound "ego/idea.ogg")
:scale-x start-scale
:scale-y start-scale
:talk-color (color 0.6 1.0 1.0 1.0)
@@ -916,7 +916,6 @@
(defn play-sound-if-necessary [screen entities target {:keys [previous-frame-index current-frame-index anim-sound-frames anim x y] :as e :or {anim-sound-frames {}}}]
(if (and (not= previous-frame-index current-frame-index)
(anim-sound-frames anim))
(if-let [[snd vol-scale pitch] (get-in anim-sound-frames [anim current-frame-index])]
@@ -937,12 +936,12 @@
(defn play-key-sounds [screen entities]
(if (= (get-in entities [:fade :opacity]) 0.0)
(reduce-kv (fn [entities target e]
(reduce-kv (fn [es target e]
(if e
(play-sound-if-necessary screen entities target e)
entities))
(play-sound-if-necessary screen es target e)
es))
entities
entities)
(-> entities :room :entities))
entities))
(defn update-current-sound-vols! [entities]
@@ -1256,10 +1255,10 @@
:closing? {:object nil
:value false}
:sounds {#_#_:blink (utils/load-sound "ego/blink2.ogg")
#_#_:pickup (utils/load-sound "pickup.ogg")
#_#_:disappear (utils/load-sound "inside-house/disappear.ogg")
#_#_:grow-sound (utils/load-sound "ego/potion.ogg")
:sounds {:blink (utils/load-sound "ego/blink2.ogg")
:pickup (utils/load-sound "pickup.ogg")
:disappear (utils/load-sound "inside-house/disappear.ogg")
:grow-sound (utils/load-sound "ego/potion.ogg")
:object nil}
:fade {:object nil
:opacity 0.0}