diff --git a/desktop/asset-work/ego/axe.ogg b/desktop/asset-work/ego/axe.ogg new file mode 100644 index 00000000..510c2b80 Binary files /dev/null and b/desktop/asset-work/ego/axe.ogg differ diff --git a/desktop/asset-work/ego/axe.wav b/desktop/asset-work/ego/axe.wav new file mode 100644 index 00000000..f16da598 Binary files /dev/null and b/desktop/asset-work/ego/axe.wav differ diff --git a/desktop/asset-work/ego/crowbar.ogg b/desktop/asset-work/ego/crowbar.ogg new file mode 100644 index 00000000..52f57d3b Binary files /dev/null and b/desktop/asset-work/ego/crowbar.ogg differ diff --git a/desktop/asset-work/inside-jail/crowbar.wav b/desktop/asset-work/inside-jail/crowbar.wav new file mode 100644 index 00000000..c646a3aa Binary files /dev/null and b/desktop/asset-work/inside-jail/crowbar.wav differ diff --git a/desktop/asset-work/outsidehouse/cauldron.ogg b/desktop/asset-work/outsidehouse/cauldron.ogg index 6335c265..bf885cc2 100644 Binary files a/desktop/asset-work/outsidehouse/cauldron.ogg and b/desktop/asset-work/outsidehouse/cauldron.ogg differ diff --git a/desktop/asset-work/outsidehouse/cauldron.wav b/desktop/asset-work/outsidehouse/cauldron.wav index 3d4118d3..328c42c1 100644 Binary files a/desktop/asset-work/outsidehouse/cauldron.wav and b/desktop/asset-work/outsidehouse/cauldron.wav differ diff --git a/desktop/resources/ego/axe.ogg b/desktop/resources/ego/axe.ogg new file mode 100644 index 00000000..510c2b80 Binary files /dev/null and b/desktop/resources/ego/axe.ogg differ diff --git a/desktop/resources/ego/crowbar.ogg b/desktop/resources/ego/crowbar.ogg new file mode 100644 index 00000000..52f57d3b Binary files /dev/null and b/desktop/resources/ego/crowbar.ogg differ diff --git a/desktop/resources/outsidehouse/cauldron.ogg b/desktop/resources/outsidehouse/cauldron.ogg index 6335c265..bf885cc2 100644 Binary files a/desktop/resources/outsidehouse/cauldron.ogg and b/desktop/resources/outsidehouse/cauldron.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 320249cf..f57474db 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -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.")))) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 168809e3..c79bb71e 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -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) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index a56626fc..b96857f8 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -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) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 919033b4..df522b8c 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -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} diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 38cad44f..cc39c342 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -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