From 75b44709ae4bf6a1b6056bba08f2e24be9b228e6 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 7 Oct 2015 18:34:11 -0700 Subject: [PATCH] small tweaks --- .../advent/screens/rooms/outside_jail.clj | 2 +- desktop/src-common/advent/screens/scene.clj | 4 +++- desktop/src-common/advent/utils.clj | 16 ++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index f47b7cee..70a1cb13 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.5 [172 120]) + (utils/sourced-volume-fn :fountain 0.25 [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 f94fdc1a..de74d86d 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1166,7 +1166,9 @@ void main() (tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 1.0)) (assoc-in [:tweens :fade-out] (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 - :finish #(do (.clear @(resolve 'advent.core/am)) + :finish #(do + (utils/stop-all-sounds! %) + (.clear @(resolve 'advent.core/am)) (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)) %)))))) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index d7416f4a..8e7f742c 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -400,21 +400,17 @@ (doto (.setAccessible true)) (.get Gdx/graphics))) 60)))) - -(defn get-sound-volume [entities target vol-scale [x y]] - (* (if (= target :ego) - (-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.75) - (* (or vol-scale 1.0)) - (clamp-volume)) - (proximity-volume entities [x y] :scale vol-scale)) - (- 1.0 (get-in entities [:fade :opacity])))) - (defn get-sound-pan [x] (/ (- x 160 ) 160)) (defn sourced-volume-fn [target vol-scale [x y]] (fn [entities] - (get-sound-volume entities target vol-scale [x y]))) + (* (if (= target :ego) + (-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.75) + (* (or vol-scale 1.0)) + (clamp-volume)) + (proximity-volume entities [x y] :scale vol-scale)) + (- 1.0 (get-in entities [:fade :opacity]))))) (defn play-sound!