From 78a4ddfce689bd3d364b5cda52e87fa4c92d628e Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 29 Oct 2015 18:49:24 -0700 Subject: [PATCH] not all sounds shoud be subjeect to silence. --- desktop/src-common/advent/screens/rooms/inside_castle.clj | 4 +++- desktop/src-common/advent/utils.clj | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index ff519962..f571c892 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -46,7 +46,9 @@ (actions/has-obtained? entities :sword) 0.0 :else - (* 0.2 (max 0.0 (- 1.0 (/ (utils/dist 45 97 (:x ego) (:y ego)) 50.0))))))) + (* 0.2 + (max 0.0 (- 1.0 (/ (utils/dist 45 97 (:x ego) (:y ego)) 50.0))) + (get-in entities [:volume :value]))))) (defn bloodclot-appear [entities] (actions/run-action entities diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 88a18693..885ed0f7 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -430,8 +430,7 @@ (defn scale-vol-from-fade [entities vol] (* vol - (- 1.0 (get-in entities [:fade :opacity])) - (get-in entities [:volume :value]))) + (- 1.0 (get-in entities [:fade :opacity])))) (defn play-sound! ([screen entities snd volume-fn]