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

more sounds.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-31 16:24:19 -07:00
parent b5bb6ce1ef
commit 24d8fa7d23
14 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/ego/axe.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/ego/axe.wav Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/ego/crowbar.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/inside-jail/crowbar.wav Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/outsidehouse/cauldron.ogg
View File

Binary file not shown.

BIN
desktop/asset-work/outsidehouse/cauldron.wav
View File

Binary file not shown.

BIN
desktop/resources/ego/axe.ogg Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/crowbar.ogg Normal file
View File

Binary file not shown.

BIN
desktop/resources/outsidehouse/cauldron.ogg
View File

Binary file not shown.

2
desktop/src-common/advent/screens/rooms/inside_jail.clj
View File

@@ -227,6 +227,7 @@
(rooms/make :music :inside-antique
:sounds {
:squeek (utils/load-sound "inside-jail/squeak.ogg")
:crowbar-sound (utils/load-sound "ego/crowbar.ogg")
}
:interactions {
:lock {:box [172 102 190 124]
@@ -250,6 +251,7 @@
(actions/do-dialogue entities :ego "They're bent as far as they can go.")
(do (actions/walk-to entities :ego [102 88] :face :right)
(actions/play-animation entities :ego :reach)
(actions/play-sound entities :crowbar-sound 0.5)
(actions/remove-entity entities :closed-window)
(actions/update-state entities #(assoc % :bent-bars? true))
(actions/do-dialogue entities :ego "Now we're getting somewhere."))))

2
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -518,7 +518,7 @@
(update-in entities [:room :entities] #(assoc % :cauldron (get-in entities [:room :cauldron])))
(utils/play-sound! screen entities
(get-in entities [:room :cauldron-sound :sound])
(utils/sourced-volume-fn :cauldron 0.075 [139 73])
(utils/sourced-volume-fn :cauldron 0.15 [139 73])
(utils/get-sound-pan 139)
:loop)
(add-wizard-if-necessary entities)

2
desktop/src-common/advent/screens/rooms/outside_jail.clj
View File

@@ -283,7 +283,7 @@
(as-> entities entities
(utils/play-sound! screen entities (get-in entities [:room :fountain-sound :sound])
(utils/sourced-volume-fn :fountain 0.15 [172 120])
(utils/sourced-volume-fn :fountain 0.06 [172 120])
(utils/get-sound-pan 172)
:loop)

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

@@ -663,7 +663,9 @@ void main ()
:inside-step-sound-3 (utils/load-sound "ego/inside-step-3.ogg")
:inside-step-sound-4 (utils/load-sound "ego/inside-step-4.ogg")
:grow-sound (utils/load-sound "ego/potion.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
@@ -689,6 +691,8 @@ void main ()
(get-in ego [:right :talk] ) {2 [:blink 0.15]}
(get-in ego [:left :grow] ) {1 [:grow-sound 0.5]}
(get-in ego [:right :grow] ) {1 [:grow-sound 0.5]}
(get-in ego [:left :crowbar] ) {3 [:crowbar-sound 0.5]}
(get-in ego [:right :crowbar] ) {3 [:crowbar-sound 0.5]}
(get-in ego [:left :stand]) {11 [:blink 0.15]
44 [:blink 0.15]
@@ -708,7 +712,7 @@ void main ()
(get-in ego [:right :milk]) {8 [:milk-sound 1.0]}
(get-in ego [:left :idea]) {1 [:idea-sound 1.0]}
(get-in ego [:right :idea]) {1 [:idea-sound 1.0]}
(get-in ego [:right :axe-wood]) {20 [:axe-sound 1.0]}
(get-in ego [:left :swing-shovel]) {3 [:breakglass-sound 1.0]}
(get-in ego [:right :swing-shovel]) {3 [:breakglass-sound 1.0]}}
:anim-merges {(get-in ego [:right :shock]) {:origin-x 15}

4
desktop/src-common/advent/utils.clj
View File

@@ -422,7 +422,7 @@
(defn sourced-volume-fn [target vol-scale [x y]]
(fn [entities]
(if (= target :ego)
(-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.75)
(-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.9)
(* (or vol-scale 1.0))
(clamp-volume))
(proximity-volume entities [x y] :scale vol-scale))
@@ -451,7 +451,7 @@
snd)
sound-id (if (= :once type)
(sound! snd :play (scale-vol-from-fade entities (current-sound-volume vol)) (or pitch 1.0) pan )
(sound! snd :loop (scale-vol-from-fade entities (current-sound-volume vol)) (or pitch 1.0) pan )) ]
(sound! snd :loop 0.0 (or pitch 1.0) pan )) ]
(update-in entities [:current-sounds :value]
conj {:id sound-id
:sound snd