Dataify impulse/action/strategy function fields

src/Dodge/Creature/Action.hs

@@ -21,6 +21,7 @@ module Dodge.Creature.Action
     )
     where
 import Dodge.Inventory.Add
+import Dodge.CreatureEffect
 --import Dodge.ShortShow
 import Dodge.Path
 import Dodge.Default
@@ -111,18 +112,18 @@ performAction cr w ac = case ac of
         (imps , Nothing  ) -> (imps, Just afta)
     DoActionWhile f act -> performAction cr w $ DoActionWhilePartial act f act
     DoActionWhilePartial partAc f resetAc
-        | f w cr -> case performAction cr w partAc of
+        | doWdCrBl f w cr -> case performAction cr w partAc of
             (imps, Just nxta) -> (imps, Just $ DoActionWhilePartial nxta f resetAc)
             (imps, Nothing)   -> (imps, Just $ DoActionWhilePartial resetAc f resetAc)
         | otherwise -> performAction cr w partAc
     DoActionIf f ifa
-        | f w cr -> performAction cr w ifa
+        | doWdCrBl f w cr -> performAction cr w ifa
         | otherwise -> ([],Nothing)
     DoActionIfElse ifa f elsea
-        | f w cr -> performAction cr w ifa
+        | doWdCrBl f w cr -> performAction cr w ifa
         | otherwise -> performAction cr w elsea
     DoActionWhileInterrupt repa f afta
-        | f w cr -> (fst $ performAction cr w repa, Just $ DoActionWhileInterrupt repa f afta)
+        | doWdCrBl f w cr -> (fst $ performAction cr w repa, Just $ DoActionWhileInterrupt repa f afta)
         | otherwise -> performAction cr w afta
     DoActions [] -> ([], Nothing)
     DoActions acs -> 

src/Dodge/Creature/Impulse.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.Impulse
     , followThenClearImpulses
     ) where
 import Dodge.Data
+import Dodge.CreatureEffect
 import Dodge.Creature.Vocalization
 import Dodge.Creature.Impulse.Movement
 import Dodge.Creature.Impulse.UseItem
@@ -50,6 +51,7 @@ followImpulses w cr = foldr f (id, cr) (_apImpulse $ _crActionPlan cr)
 
 followImpulse :: Creature -> World -> Impulse -> (World -> World , Creature)
 followImpulse cr w imp = case imp of
+    ImpulseNothing -> (id,cr)
     RandomImpulse rimp -> 
         let (newimp,newgen) = runState rimp (_randGen w)
         in first ((randGen .~ newgen) .) $ followImpulse cr w newimp
@@ -69,16 +71,16 @@ followImpulse cr w imp = case imp of
     DropItem        -> undefined
     ChangeStrategy strat    -> crup $ cr & crActionPlan . apStrategy .~ strat
     AddGoal gl      -> crup $ cr & crActionPlan . apGoal .:~ gl 
-    ArbitraryImpulseFunction f  -> crup $ f w cr
-    ArbitraryImpulse f  -> followImpulse cr w (f cr w) 
-    ArbitraryImpulseEffect f -> (f cr, cr)
+    ArbitraryImpulseFunction f  -> crup $ doWdCrCr f w cr
+    ArbitraryImpulse f  -> followImpulse cr w (doCrWdImp f cr w) 
+    ArbitraryImpulseEffect f -> (doCrWdWd f cr, cr)
     ImpulseUseTargetCID f   -> case cr ^? crIntention . targetCr . _Just of
-        Just tcr -> followImpulse cr w (f $ _crID tcr)
+        Just tcr -> followImpulse cr w (doIntImp f $ _crID tcr)
         _        -> crup cr
     ImpulseUseTarget f -> case cr ^? crIntention . targetCr . _Just of
-        Just tcr -> followImpulse cr w (f tcr)
+        Just tcr -> followImpulse cr w (doCrImp f tcr)
         _        -> crup cr
-    ImpulseUseAheadPos f -> followImpulse cr w (f (_crPos cr +.+ 20 *.* unitVectorAtAngle (_crDir cr)))
+    ImpulseUseAheadPos f -> followImpulse cr w (doP2Imp f (_crPos cr +.+ 20 *.* unitVectorAtAngle (_crDir cr)))
     MvForward       -> crup $ crMvForward speed cr
     MvTurnToward p  -> crup
         $ creatureTurnToward p (turnRad $ safeAngleVV (p -.- cpos) (unitVectorAtAngle cdir)) cr

src/Dodge/Creature/ReaderUpdate.hs

@@ -144,7 +144,7 @@ reloadOverride cr
     reloadActions = 
         [ holsterWeapon
         , 1 `WaitThen` 
-            DoActionWhileInterrupt NoAction (const crIsReloading) 
+            DoActionWhileInterrupt NoAction (WdCrBlfromCrBl CrIsReloading) 
                 (DoImpulses [ChangeStrategy WatchAndWait])
         ]
 

src/Dodge/Creature/SentinelAI.hs

@@ -23,7 +23,7 @@ sentinelAI w = reloadOverride .
     [ (crHasTargetLOS
       , \ _ cr -> StrategyActions (ShootAt (fromJust $ tcid cr)) 
         [ DoActionIf 
-                (const $ not . crIsAiming) 
+                (WdCrNegate $ WdCrBlfromCrBl CrIsAiming) 
                 (drawWeapon `DoActionThen` (50 `WaitThen` NoAction))
             `DoActionThen` lostest
             `DoActionWhile` advanceShoot 
@@ -38,7 +38,7 @@ sentinelAI w = reloadOverride .
   where
     advanceShoot = DoImpulses [UseItem, MoveForward 3]
     tcid cr = _crID <$> _targetCr (_crIntention cr)
-    lostest w' cr = maybe False (\cid -> canSee (_crID cr) cid w') (tcid cr)
+    lostest = WdCrLOSTarget -- w' cr = maybe False (\cid -> canSee (_crID cr) cid w') (tcid cr)
 
 --chainCreatureUpdates :: [World -> Creature -> Creature] -> World -> Creature -> Creature
 --chainCreatureUpdates ls w cr = foldr (\f -> f w) cr ls
@@ -65,7 +65,7 @@ sentinelFireType f = chainCreatureUpdates
         (crActionPlan . apStrategy .~ WatchAndWait)
     ]
   where
-    drawwp = DoActionIfElse NoAction (const crIsAiming) (DoActionThen drawWeapon (WaitThen 50 NoAction))
+    drawwp = DoActionIfElse NoAction (WdCrBlfromCrBl CrIsAiming) (DoActionThen drawWeapon (WaitThen 50 NoAction))
     aiming = AimAt
         { _targetID = 0
         , _targetSeenAt = V2 0 0 -- hack

src/Dodge/Creature/Volition.hs

@@ -23,7 +23,7 @@ fleeFrom cr mtcr = case mtcr of
 
 shootTillEmpty :: Action
 --shootTillEmpty = (crCanShoot `DoActionWhile` DoImpulses [UseItem])
-shootTillEmpty = (const crCanShoot `DoActionWhile` DoImpulses [UseItem])
+shootTillEmpty = (WdCrBlfromCrBl CrCanShoot `DoActionWhile` DoImpulses [UseItem])
     `DoActionThen` 20 `WaitThen` holsterWeapon
 
 --advanceShoot :: Int -> Action
@@ -39,5 +39,5 @@ shootFirstMiss :: Action
 shootFirstMiss =
     LeadTarget (V2 30 50) `DoActionThen`
     DoImpulses [UseItem] `DoActionThen`
-    (const crCanShoot `DoActionWhile` DoActions [LeadTarget (V2 0 0),DoImpulses [UseItem]])
+    (WdCrBlfromCrBl CrCanShoot `DoActionWhile` DoActions [LeadTarget (V2 0 0),DoImpulses [UseItem]])
     `DoActionThen` 20 `WaitThen` holsterWeapon