Refactor, try to limit dependencies

src/Dodge/Creature/SentinelAI.hs

@@ -1,39 +1,44 @@
-module Dodge.Creature.SentinelAI
-    ( sentinelAI
-    , sentinelFireType
-    , sentinelExtraWatchUpdate
-    ) where
-import Dodge.Data
+module Dodge.Creature.SentinelAI (
+    sentinelAI,
+    sentinelFireType,
+    sentinelExtraWatchUpdate,
+) where
+
+import Control.Lens
+import Data.Maybe
+import Dodge.Creature.Action
 import Dodge.Creature.ChainUpdates
-import Dodge.Creature.Test
-import Dodge.Creature.Volition
+import Dodge.Creature.Perception
 import Dodge.Creature.ReaderUpdate
 import Dodge.Creature.Strategy
-import Dodge.Creature.Action
-import Dodge.Creature.Perception
+import Dodge.Creature.Test
+import Dodge.Creature.Volition
+import Dodge.Data.CreatureEffect
+import Dodge.Data.World
 import Geometry.Data
 
-import Data.Maybe
-import Control.Lens
-
 sentinelAI :: World -> Creature -> Creature
-sentinelAI w = reloadOverride .
-    sentinelExtraWatchUpdate
-    [ (crHasTargetLOS
-      , \ _ cr -> StrategyActions (ShootAt (fromJust $ tcid cr)) 
-        [ DoActionIf 
-                (WdCrNegate $ WdCrBlfromCrBl CrIsAiming) 
-                (drawWeapon `DoActionThen` (50 `WaitThen` NoAction))
-            `DoActionThen` lostest
-            `DoActionWhile` advanceShoot 
-            `DoActionThen` 75 
-            `DoReplicate` advanceShoot 
-            `DoActionThen` DoImpulses [ChangeStrategy WatchAndWait]
-        , AimAt { _targetID = fromJust $ tcid cr , _targetSeenAt = V2 0 0 }
-        ]
-      )
-    ] 
-    w
+sentinelAI w =
+    reloadOverride
+        . sentinelExtraWatchUpdate
+            [
+                ( crHasTargetLOS
+                , \_ cr ->
+                    StrategyActions
+                        (ShootAt (fromJust $ tcid cr))
+                        [ DoActionIf
+                            (WdCrNegate $ WdCrBlfromCrBl CrIsAiming)
+                            (drawWeapon `DoActionThen` (50 `WaitThen` NoAction))
+                            `DoActionThen` lostest
+                            `DoActionWhile` advanceShoot
+                            `DoActionThen` 75
+                            `DoReplicate` advanceShoot
+                            `DoActionThen` DoImpulses [ChangeStrategy WatchAndWait]
+                        , AimAt{_targetID = fromJust $ tcid cr, _targetSeenAt = V2 0 0}
+                        ]
+                )
+            ]
+            w
   where
     advanceShoot = DoImpulses [UseItem, MoveForward 3]
     tcid cr = _crID <$> _targetCr (_crIntention cr)
@@ -42,50 +47,58 @@ sentinelAI w = reloadOverride .
 --chainCreatureUpdates :: [World -> Creature -> Creature] -> World -> Creature -> Creature
 --chainCreatureUpdates ls w cr = foldr (\f -> f w) cr ls
 
-
 sentinelFireType :: (Int -> Action) -> World -> Creature -> Creature
-sentinelFireType f = chainCreatureUpdates
-    [ performActions
-    , watchUpdateStrat
-      [ (crHasTargetLOS, \_ _ -> StrategyActions (ShootAt 0) 
-            [ drawwp `DoActionThen` f 0 `DoActionThen` DoImpulses [ChangeStrategy WatchAndWait]
-            , aiming
+sentinelFireType f =
+    chainCreatureUpdates
+        [ performActions
+        , watchUpdateStrat
+            [
+                ( crHasTargetLOS
+                , \_ _ ->
+                    StrategyActions
+                        (ShootAt 0)
+                        [ drawwp `DoActionThen` f 0 `DoActionThen` DoImpulses [ChangeStrategy WatchAndWait]
+                        , aiming
+                        ]
+                )
+            , (const crAwayFromPost, const goToPostStrat)
             ]
-        )
-      , (const crAwayFromPost, const goToPostStrat)
-      ] 
-    , perceptionUpdate [0]
---    , Left $ perceptionUp 0
-    , const doStrategyActions
-    , const reloadOverride
-    , targetYouWhenCognizant
-    , const $ overrideInternal
-        (\cr -> crHasTarget cr && crStratConMatches (GetTo (V2 0 0)) cr)
-        (crActionPlan . apStrategy .~ WatchAndWait)
-    ]
+        , perceptionUpdate [0]
+        , --    , Left $ perceptionUp 0
+          const doStrategyActions
+        , const reloadOverride
+        , targetYouWhenCognizant
+        , const $
+            overrideInternal
+                (\cr -> crHasTarget cr && crStratConMatches (GetTo (V2 0 0)) cr)
+                (crActionPlan . apStrategy .~ WatchAndWait)
+        ]
   where
     drawwp = DoActionIfElse NoAction (WdCrBlfromCrBl CrIsAiming) (DoActionThen drawWeapon (WaitThen 50 NoAction))
-    aiming = AimAt
-        { _targetID = 0
-        , _targetSeenAt = V2 0 0 -- hack
-        }
+    aiming =
+        AimAt
+            { _targetID = 0
+            , _targetSeenAt = V2 0 0 -- hack
+            }
 
-sentinelExtraWatchUpdate
-    :: [(World -> Creature -> Bool , World -> Creature -> Strategy)]
-    -> World
-    -> Creature
-    -> Creature
-sentinelExtraWatchUpdate xs = chainCreatureUpdates
-    [ performActions
-    , watchUpdateStrat
-        ( xs ++ [(const crAwayFromPost, const goToPostStrat)] )
-    , perceptionUpdate [0]
-    , const doStrategyActions
-    , targetYouWhenCognizant
-    , const $ overrideInternal
-        (\cr -> crHasTarget cr && crStratConMatches (GetTo (V2 0 0)) cr)
-        (crActionPlan . apStrategy .~ WatchAndWait)
-    ]
+sentinelExtraWatchUpdate ::
+    [(World -> Creature -> Bool, World -> Creature -> Strategy)] ->
+    World ->
+    Creature ->
+    Creature
+sentinelExtraWatchUpdate xs =
+    chainCreatureUpdates
+        [ performActions
+        , watchUpdateStrat
+            (xs ++ [(const crAwayFromPost, const goToPostStrat)])
+        , perceptionUpdate [0]
+        , const doStrategyActions
+        , targetYouWhenCognizant
+        , const $
+            overrideInternal
+                (\cr -> crHasTarget cr && crStratConMatches (GetTo (V2 0 0)) cr)
+                (crActionPlan . apStrategy .~ WatchAndWait)
+        ]
 
 --shootAtAdvance :: Int -> [Action]
 --shootAtAdvance tcid =
@@ -93,7 +106,7 @@ sentinelExtraWatchUpdate xs = chainCreatureUpdates
 --      `DoActionThen`
 --        lostest `DoActionWhile`
 --        advanceShoot `DoActionThen`
---        75 `DoReplicate` 
+--        75 `DoReplicate`
 --        advanceShoot `DoActionThen`
 --        DoImpulses [ChangeStrategy WatchAndWait]
 --    , AimAt
@@ -102,7 +115,7 @@ sentinelExtraWatchUpdate xs = chainCreatureUpdates
 --        }
 --    ]
 --  where
---    lostest (w,cr') = canSee (_crID cr') tcid w 
+--    lostest (w,cr') = canSee (_crID cr') tcid w
 --    advanceShoot = ImpulsesList [[UseItem, MoveForward 3]]
 --
 --shootAtWhileContinueTime :: Int -> World -> Creature -> Strategy
@@ -111,7 +124,7 @@ sentinelExtraWatchUpdate xs = chainCreatureUpdates
 --      `DoActionThen`
 --        lostest `DoActionWhile`
 --        advanceShoot `DoActionThen`
---        75 `DoReplicate` 
+--        75 `DoReplicate`
 --        advanceShoot `DoActionThen`
 --        DoImpulses [ChangeStrategy WatchAndWait]
 --    , AimAt
@@ -120,5 +133,5 @@ sentinelExtraWatchUpdate xs = chainCreatureUpdates
 --        }
 --    ]
 --  where
---    lostest (w,cr') = canSee (_crID cr') tcid w 
+--    lostest (w,cr') = canSee (_crID cr') tcid w
 --    advanceShoot = ImpulsesList [[UseItem, MoveForward 3]]