From c4663d121bff2327c05f90cad6706f27005d5287 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 12 Nov 2015 09:20:33 -0800 Subject: [PATCH] space! --- desktop/src-common/advent/screens/rooms/space.clj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 788db89b..afa13b1d 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -179,6 +179,8 @@ :none)))) +(defn grunt-vol [entities] + (* 0.3 (get-in entities [:room :entities :bloodclot :opacity]))) (defn make [screen] (let [bloodclot-head-talk-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) @@ -235,8 +237,8 @@ :inhale-sound (utils/load-sound "space/bloodclot-inhale.ogg") :exhale-sound (utils/load-sound "space/bloodclot-exhale.ogg") :explode-sound (utils/load-sound "space/bloodclot-explode.ogg") - :anim-sound-frames {blergh-stand-anim {0 [:inhale-sound (constantly 0.3)] - 1 [:exhale-sound (constantly 0.3)]} + :anim-sound-frames {blergh-stand-anim {0 [:inhale-sound grunt-vol] + 1 [:exhale-sound grunt-vol]} bloodclot-explode {19 [:grow-sound (constantly 0.5)] 166 [:explode-sound (constantly 0.5)]}} :opacity 0.0