Start ai cleanup

src/Dodge/Creature/LtAutoCrit.hs

@@ -4,12 +4,13 @@ module Dodge.Creature.LtAutoCrit
 import Dodge.Data
 import Dodge.Default
 import Dodge.Creature.Picture
+import Dodge.Creature.Impulse
+import Dodge.Creature.Action
 import Dodge.Creature.Test
 import Dodge.Creature.Volition
 import Dodge.Creature.ActionRat
 --import Dodge.Creature.ChooseTarget
 import Dodge.Creature.ReaderUpdate
-import Dodge.Creature.Rationality
 import Dodge.Creature.AlertLevel
 import Dodge.Creature.State
 --import Dodge.Creature.State.Data
@@ -44,9 +45,9 @@ ltAutoCrit = defaultCreature
         >=> doStrategyActionsR
         >=> reloadOverrideR
         >=> targetYouWhenCognizantR
-        >=> overrideInternalR 
-            (onBoth (&&) crHasTarget (crStratConMatches (GetTo (V2 0 0))))
-            (\ _ -> crActionPlan . crStrategy .~ WatchAndWait)
+        >=> overrideInternalRRR
+            (\cr -> (&&) <$> crHasTargetR cr <*> crStratConMatchesR (GetTo (V2 0 0)) cr)
+            (pure . (crActionPlan . crStrategy .~ WatchAndWait))
     , _crActionPlan = ActionPlan
         { _crImpulse    = []
         , _crAction     = []