Cleanup

2021-12-11 22:08:43 +00:00
parent 7116129a37
commit 6cd59d99bc
17 changed files with 115 additions and 170 deletions
@@ -30,18 +30,18 @@ ltAutoCrit = defaultCreature
        [ Left performActions
        , Left $ watchUpdateStrat
            [ (crHasTargetLOS, \_ _ -> StrategyActions (ShootAt 0) 
-                [DoActionIf (not . crIsAiming) drawWeapon
+                [DoActionIf (const $ not . crIsAiming) drawWeapon
                ,DoActionThen 
-                    (DoActionWhile crHasTargetLOS $ ArbitraryAction chooseMovement)
+                    (DoActionWhile crHasTargetLOS' $ ArbitraryAction chooseMovement)
                    (DoImpulses [ChangeStrategy WatchAndWait])
                ]
              )
-            , (crAwayFromPost, goToPostStrat)
+            , (const crAwayFromPost, const goToPostStrat)
            ]
        , Left $ perceptionUpdate' [0]
-        , Right $ doStrategyActions
-        , Right $ reloadOverride
-        , Left $ targetYouWhenCognizant
+        , Right doStrategyActions
+        , Right reloadOverride
+        , Left targetYouWhenCognizant
        , Right $ overrideInternal
            (\cr -> crHasTarget' cr && crStratConMatches' (GetTo (V2 0 0)) cr)
            (crActionPlan . crStrategy .~ WatchAndWait)