Cleanup, trying to diagnose space leak in crit update

src/Dodge/Creature/ReaderUpdate.hs

@@ -1,12 +1,17 @@
 {- | Functions updating a creature in a Reader World environment -}
 module Dodge.Creature.ReaderUpdate
     ( doStrategyActionsR
+    , doStrategyActions
     , setTargetMv
     , targetYouWhenCognizantR
+    , targetYouWhenCognizant
     , overrideMeleeCloseTargetR
     , watchUpdateStratR
+    , watchUpdateStrat
     , reloadOverrideR
+    , reloadOverride
     , overrideInternalRRR
+    , overrideInternal
     , goToTarget
     , flockACCR
     , setMvPos
@@ -110,17 +115,31 @@ replaceNullWith :: a -> [a] -> [a]
 replaceNullWith x [] = [x]
 replaceNullWith _ xs = xs
     
-doStrategyActionsR
-    :: Creature
-    -> Reader World Creature
+doStrategyActionsR :: Creature -> Reader World Creature
 doStrategyActionsR cr = return $ case cr ^? crActionPlan . crStrategy of
     Just (StrategyActions strat acs) -> cr & crActionPlan . crAction .~ acs
         & crActionPlan . crStrategy .~ strat
     _ -> cr
 
-reloadOverrideR
-    :: Creature 
-    -> Reader World Creature
+doStrategyActions :: World -> Creature -> Creature
+doStrategyActions w cr = case cr ^? crActionPlan . crStrategy of
+    Just (StrategyActions strat acs) -> cr & crActionPlan . crAction .~ acs
+        & crActionPlan . crStrategy .~ strat
+    _ -> cr
+
+reloadOverride :: World -> Creature -> Creature
+reloadOverride w cr
+    | cr ^? crInv . ix (_crInvSel cr) . itConsumption . ammoLoaded == Just 0 
+            && cr ^. crStance . posture == Aiming
+        = cr & crActionPlan . crStrategy .~ StrategyActions Reload reloadActions
+    | otherwise = cr
+  where
+    reloadActions = 
+        [ holsterWeapon
+        , WaitThen 1 $ DoActionWhileInterrupt NoAction crIsReloading (DoImpulses [ChangeStrategy WatchAndWait])
+        ]
+
+reloadOverrideR :: Creature -> Reader World Creature
 reloadOverrideR cr
     | cr ^? crInv . ix (_crInvSel cr) . itConsumption . ammoLoaded == Just 0 
             && cr ^. crStance . posture == Aiming
@@ -141,6 +160,16 @@ overrideInternalRRR test update cr = do
     b <- test cr
     if b then update cr else pure cr
 
+overrideInternal
+    :: (Creature -> Bool)
+    -> (Creature -> Creature)
+    -> World
+    -> Creature
+    -> Creature
+overrideInternal test update w cr
+    | test cr = update cr
+    | otherwise = cr
+
 watchUpdateStratR
     :: [ ((World, Creature) -> Bool, World -> Creature -> Strategy) ]
     -> Creature
@@ -150,6 +179,16 @@ watchUpdateStratR fs cr = reader $ \w -> case cr ^? crActionPlan . crStrategy of
         & crActionPlan . crStrategy .~ listGuard (fs, \_ _ -> WatchAndWait) (w, cr) w cr
     _ -> cr
 
+watchUpdateStrat
+    :: [ ((World, Creature) -> Bool, World -> Creature -> Strategy) ]
+    -> World
+    -> Creature
+    -> Creature
+watchUpdateStrat fs w cr = case cr ^? crActionPlan . crStrategy of
+    Just WatchAndWait -> cr 
+        & crActionPlan . crStrategy .~ listGuard (fs, \_ _ -> WatchAndWait) (w, cr) w cr
+    _ -> cr
+
 listGuard :: ([(a -> Bool, b)] , b) -> a -> b
 listGuard ( (test,y):ps, z ) x
     | test x = y
@@ -160,3 +199,8 @@ targetYouWhenCognizantR :: Creature -> Reader World Creature
 targetYouWhenCognizantR cr = reader $ \w -> case cr ^? crPerception . crAwarenessLevel . ix 0 of
     Just (Cognizant _)  -> cr & crIntention . targetCr ?~ _creatures w IM.! 0
     _                   -> cr & crIntention . targetCr .~ Nothing
+
+targetYouWhenCognizant :: World -> Creature -> Creature
+targetYouWhenCognizant w cr = case cr ^? crPerception . crAwarenessLevel . ix 0 of
+    Just (Cognizant _)  -> cr & crIntention . targetCr ?~ _creatures w IM.! 0
+    _                   -> cr & crIntention . targetCr .~ Nothing