Simplify vocalization

src/Dodge/Creature/Perception.hs

@@ -5,13 +5,13 @@ module Dodge.Creature.Perception (
     visionCheck,
 ) where
 
+import Dodge.Creature.Vocalization
 import Control.Lens
 import Control.Monad
 import qualified Data.Map.Strict as M
 import Data.Maybe
 import Dodge.Base.Collide
 import Dodge.Creature.Radius
-import Dodge.Creature.Vocalization
 import Dodge.Data.World
 import Dodge.FloatFunction
 import Geometry.Data
@@ -56,7 +56,7 @@ basicAwarenessUpdate cr = case _cpAttention $ _crPerception cr of
         thejitter = [RandomImpulse $ RandImpulseCircMove 1]
         maybeBark = fromMaybe id $ do
             guard becomesCognizant
-            sid <- vocalizationTest cr
+            sid <- crVocalizationSound cr
             return $
                 crActionPlan . apAction
                     .~ [ImpulsesList ([Bark sid] : replicate 5 thejitter)]
@@ -83,7 +83,7 @@ chaseCritAwarenessUpdate w cr = case _cpAttention $ _crPerception cr of
         thejitter = [RandomImpulse $ RandImpulseCircMove 3]
         maybeBark = fromMaybe id $ do
             guard becomesCognizant
-            guard $ cr ^? crVocalization . vcCoolDown == Just 0
+            guard $ cr ^. crVocalization == VocReady
             let soundid = evalState (takeOne (crWarningSounds cr)) (_randGen w)
                 numjits = fst $ randomR (15, 25) (_randGen w)
             return $