Start ai cleanup

src/Dodge/Creature/SpreadGunCrit.hs

@@ -5,11 +5,12 @@ import Dodge.Data
 import Dodge.Default
 import Dodge.Creature.Picture
 import Dodge.Creature.Test
+import Dodge.Creature.Impulse
+import Dodge.Creature.Action
 import Dodge.Creature.Volition
 import Dodge.Creature.ActionRat
 import Dodge.Creature.ReaderUpdate
 --import Dodge.Creature.ChooseTarget
-import Dodge.Creature.Rationality
 import Dodge.Creature.AlertLevel
 import Dodge.Creature.State
 --import Dodge.Creature.State.Data
@@ -23,6 +24,7 @@ import Picture
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
 import Control.Monad
+--import Control.Monad.Trans.Reader
 --import System.Random
 
 spreadGunCrit :: Creature
@@ -44,8 +46,9 @@ spreadGunCrit = 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)
+            (\ cr -> pure $ cr & crActionPlan . crStrategy .~ WatchAndWait)
     , _crActionPlan = ActionPlan
         { _crImpulse    = []
         , _crAction     = []