Cleanup creature update slightly, add show instance for impulses

src/Dodge/Creature/Perception.hs

@@ -1,11 +1,8 @@
 --{-# LANGUAGE TupleSections #-}
 module Dodge.Creature.Perception
     ( perceptionUpdate
-    , perceptionUp
-    , perceptionUpdate'
     , newSounds
-    )
-    where
+    ) where
 import Dodge.Data
 import Dodge.Creature.Vocalization
 import Dodge.Base.Collide
@@ -18,39 +15,21 @@ import Sound.Data
 
 import Data.Maybe
 import Control.Lens
-import Control.Monad.Reader
 import qualified Data.IntMap.Strict as IM
 import qualified Data.Map.Strict as M
 
-{- | Ties together (currently) an awareness and attention update -}
 perceptionUpdate
-    :: [Int]    -- ^ List of creature ids that may direct attention and awareness
-    -> Creature
-    -> Reader World Creature
-perceptionUpdate is cr = basicAttentionUpdate is cr 
-    >>= basicAwarenessUpdate
-    >>= rememberSounds
-
-perceptionUpdate'
     :: [Int]    -- ^ List of creature ids that may direct attention and awareness
     -> World
     -> Creature
     -> Creature
-perceptionUpdate' is w cr = rememberSounds' w $ basicAwarenessUpdate' $ basicAttentionUpdate' is w cr 
---perceptionUpdate' is w cr = basicAwarenessUpdate' $ basicAttentionUpdate' is w cr 
-
-perceptionUp :: Int -> World -> Creature -> Creature
-perceptionUp i w cr | canSee i (_crID cr) w = cr & crPerception . crAwarenessLevel . at i ?~ Cognizant 100
-    | otherwise = cr & crPerception . crAwarenessLevel . at i .~ Nothing
-    
+perceptionUpdate is w = rememberSounds w . basicAwarenessUpdate . basicAttentionUpdate is w
 
 {- | Update a creatures awareness based upon the creatures' current direction
  of attention -}
-basicAwarenessUpdate' 
-    :: Creature 
-    -> Creature
-basicAwarenessUpdate' cr = case _crAttentionDir $ _crPerception cr of
-    AttentiveTo is  -> cr 
+basicAwarenessUpdate :: Creature -> Creature
+basicAwarenessUpdate cr = case _crAttentionDir $ _crPerception cr of
+    AttentiveTo is -> cr 
         & crPerception . crAwarenessLevel 
             %~ (IM.mapMaybe decreaseAwareness . IM.unionWith combineAwareness is)
         & maybeBark
@@ -64,25 +43,6 @@ basicAwarenessUpdate' cr = case _crAttentionDir $ _crPerception cr of
                    | otherwise = id
     Fixated i       -> cr & crPerception . crAwarenessLevel 
                          %~ ( IM.insert i (Cognizant 10000) . IM.mapMaybe decreaseAwareness)
-{- | Update a creatures awareness based upon the creatures' current direction
- of attention -}
-basicAwarenessUpdate 
-    :: Creature -> Reader World Creature
-basicAwarenessUpdate cr = case _crAttentionDir $ _crPerception cr of
-    AttentiveTo is  -> pure $ cr 
-        & crPerception . crAwarenessLevel 
-            %~ (IM.mapMaybe decreaseAwareness . IM.unionWith combineAwareness is)
-        & maybeBark
-      where
-        oldAwareness = _crAwarenessLevel $ _crPerception cr
-        newAwareness = (IM.mapMaybe decreaseAwareness . IM.unionWith combineAwareness is) oldAwareness
-        becomesCognizant = any isCognizant $ IM.unionWith cogRaised oldAwareness newAwareness
-        maybeBark  | becomesCognizant = case vocalizationTest cr of
-            Just sid -> crActionPlan . crImpulse .~ [Bark sid]
-            Nothing -> id
-                   | otherwise = id
-    Fixated i       -> pure $ cr & crPerception . crAwarenessLevel 
-                         %~ ( IM.insert i (Cognizant 10000) . IM.mapMaybe decreaseAwareness)
 
 cogRaised :: AwarenessLevel -> AwarenessLevel -> AwarenessLevel
 cogRaised Suspicious{} Cognizant{} = Cognizant 100
@@ -111,22 +71,11 @@ decreaseAwareness (Cognizant x) = Just $ Cognizant $ x - 50
 {- | Given a fixed group of creatures, direct attention to those of them that
  - are in view. -}
 basicAttentionUpdate
-    :: [Int] -- ^ Creatures that may attract this creature's attention
-    -> Creature
-    -> Reader World Creature
-basicAttentionUpdate cids cr = do
-    w <- ask
-    pure $ cr & crPerception . crAttentionDir .~
-        AttentiveTo (IM.mapMaybe (newExtraAwareness cr w) $ IM.fromList $ zip cids cids)
-
-{- | Given a fixed group of creatures, direct attention to those of them that
- - are in view. -}
-basicAttentionUpdate'
     :: [Int] -- ^ Creatures that may attract this creature's attention
     -> World
     -> Creature
     -> Creature
-basicAttentionUpdate' cids w cr = cr & crPerception . crAttentionDir .~
+basicAttentionUpdate cids w cr = cr & crPerception . crAttentionDir .~
         AttentiveTo (IM.mapMaybe (newExtraAwareness cr w) $ IM.fromList $ zip cids cids)
 
 newExtraAwareness 
@@ -159,14 +108,9 @@ newSounds = mapMaybe f . M.elems . _playingSounds
         JustStartedPlaying -> Just (_soundPos s, _soundVolume s)
         _ -> Nothing
 
-rememberSounds :: Creature -> Reader World Creature
-rememberSounds cr = do
-    sList <- asks newSounds
-    return $ cr & crMemory . soundsToInvestigate .~ map fst (filter (soundIsClose cr) sList)
---    return $ cr & crMemory . soundsToInvestigate .~ [V2 0 0]
---
-rememberSounds' :: World -> Creature -> Creature
-rememberSounds' w cr = cr & crMemory . soundsToInvestigate .~ map fst (filter (soundIsClose cr) (newSounds w))
+rememberSounds :: World -> Creature -> Creature
+rememberSounds w cr = cr 
+    & crMemory . soundsToInvestigate .~ map fst (filter (soundIsClose cr) (newSounds w))
 
 soundIsClose :: Creature -> (Point2,Float) -> Bool
 soundIsClose cr (pos,vol) = vol > (_auDist . _crAudition $ _crPerception cr) (dist pos (_crPos cr))