Make creature vocalizations stop on death

src/Dodge/Creature/ChaseCrit.hs

@@ -50,7 +50,7 @@ chaseCrit = defaultCreature
     , _crInv = IM.fromList [(0,medkit 200)]
     , _crMeleeCooldown = 0
     , _crFaction = ColorFaction green
-    , _crVocalization = Vocalization seagullBarkS 50 0
+    , _crVocalization = Vocalization seagullChatterS 50 0
     , _crMvType = ChaseMvType
         { _mvSpeed = 3
         , _mvTurnRad = f

src/Dodge/Creature/Impulse.hs

@@ -3,6 +3,7 @@ module Dodge.Creature.Impulse
     )
     where
 import Dodge.Data
+import Dodge.Creature.Vocalization
 import Dodge.Data.SoundOrigin
 import Dodge.Creature.Impulse.Movement
 import Dodge.Creature.Impulse.UseItem
@@ -86,7 +87,3 @@ followImpulse cr w imp = case imp of
         . soundStart (CrSound cid) cpos hitS Nothing
     addDam i dams = Blunt 100 cpos (posFromID i) (posFromID i) : dams 
 
-resetCrVocCoolDown :: Creature -> Creature
-resetCrVocCoolDown cr = case cr ^? crVocalization . vcMaxCoolDown of
-    Just i  -> cr & crVocalization . vcCoolDown .~ i
-    Nothing -> cr

src/Dodge/Creature/Perception.hs

@@ -6,9 +6,10 @@ module Dodge.Creature.Perception
     where
 import Dodge.Data
 import Dodge.Creature.Perception.Data
+import Dodge.Creature.Vocalization
 import Dodge.Creature.Memory.Data
 import Dodge.Base.Collide
-import Dodge.SoundLogic
+--import Dodge.SoundLogic
 import Geometry.Vector
 --import Geometry.Data
 import Geometry.Data
@@ -50,11 +51,6 @@ basicAwarenessUpdate cr = case _crAttentionDir $ _crPerception cr of
     Fixated i       -> pure $ cr & crPerception . crAwarenessLevel 
                          %~ ( IM.insert i (Cognizant 10000) . IM.mapMaybe decreaseAwareness)
 
-vocalizationTest :: Creature -> Maybe SoundID
-vocalizationTest cr = case cr ^? crVocalization . vcCoolDown of
-    Just 0 -> Just $ _vcSound $ _crVocalization cr
-    Nothing -> Nothing
-
 cogRaised :: AwarenessLevel -> AwarenessLevel -> AwarenessLevel
 cogRaised Suspicious{} Cognizant{} = Cognizant 100
 cogRaised _ _ = Suspicious 0

src/Dodge/Creature/Vocalization.hs

@@ -0,0 +1,15 @@
+module Dodge.Creature.Vocalization where
+import Dodge.Data
+import Sound.Data
+
+import Control.Lens
+
+vocalizationTest :: Creature -> Maybe SoundID
+vocalizationTest cr = case cr ^? crVocalization . vcCoolDown of
+    Just 0 -> Just $ _vcSound $ _crVocalization cr
+    _      -> Nothing
+
+resetCrVocCoolDown :: Creature -> Creature
+resetCrVocCoolDown cr = case cr ^? crVocalization . vcMaxCoolDown of
+    Just i  -> cr & crVocalization . vcCoolDown .~ i
+    Nothing -> cr