Cleanup creature update slightly, add show instance for impulses

2022-03-26 08:08:16 +00:00
parent ae7fbe29c2
commit 3698a738f3
17 changed files with 158 additions and 198 deletions
@@ -29,18 +29,18 @@ import Control.Monad.State
 pistolCrit :: Creature
 pistolCrit = defaultCreature
    { _crPict = basicCrPict red
-    , _crUpdate =  stateUpdate $ impulsiveAI $ chainCreatureUpdatesLR
-        [Left performActions
-        ,Left $ watchUpdateStrat
+    , _crUpdate =  stateUpdate $ impulsiveAI $ chainCreatureUpdates
+        [ performActions
+        , watchUpdateStrat
              [ (crHasTargetLOS, \w cr -> StrategyActions (ShootAt 0) 
                    [DoActionIf (const $ not . crIsAiming) drawWeapon,chooseMovement cr w])
              , (const crAwayFromPost, const goToPostStrat)
              ]
-        ,Left $ perceptionUpdate' [0]
-        ,Right doStrategyActions
-        ,Right reloadOverride
-        ,Left targetYouWhenCognizant
-        ,Right $ overrideInternal
+        , perceptionUpdate [0]
+        , const doStrategyActions
+        , const reloadOverride
+        , targetYouWhenCognizant
+        , const $ overrideInternal
            (\cr -> crHasTarget' cr && crStratConMatches' (GetTo (V2 0 0)) cr)
            (crActionPlan . crStrategy .~ WatchAndWait)
        ]