Cleanup, remove Reader monad from Creature.Test

2022-05-24 23:11:34 +01:00
parent 28fcd4ef57
commit 64a01849d4
6 changed files with 12 additions and 54 deletions
@@ -29,7 +29,7 @@ ltAutoCrit = defaultCreature
            [ (crHasTargetLOS, \_ _ -> StrategyActions (ShootAt 0) 
                [DoActionIf (const $ not . crIsAiming) drawWeapon
                ,DoActionThen 
-                    (DoActionWhile crHasTargetLOS' $ ArbitraryAction chooseMovement)
+                    (DoActionWhile crHasTargetLOS $ ArbitraryAction chooseMovement)
                    (DoImpulses [ChangeStrategy WatchAndWait])
                ]
              )
@@ -40,7 +40,7 @@ ltAutoCrit = defaultCreature
        , const reloadOverride
        , targetYouWhenCognizant
        , const $ overrideInternal
-            (\cr -> crHasTarget' cr && crStratConMatches' (GetTo (V2 0 0)) cr)
+            (\cr -> crHasTarget cr && crStratConMatches (GetTo (V2 0 0)) cr)
            (crActionPlan . crStrategy .~ WatchAndWait)
        ]
    , _crActionPlan = ActionPlan