Cleanup warnings

src/Dodge/Creature/SpreadGunCrit.hs

@@ -6,47 +6,45 @@ import Dodge.Default
 import Dodge.Creature.Picture
 import Dodge.Creature.Test
 import Dodge.Creature.ActionRat
-import Dodge.Creature.ChooseTarget
+--import Dodge.Creature.ChooseTarget
 import Dodge.Creature.SetTarget
 import Dodge.Creature.Rationality
 import Dodge.Creature.AlertLevel
 import Dodge.Creature.State
-import Dodge.Creature.State.Data
+--import Dodge.Creature.State.Data
 import Dodge.Item.Weapon
 import Dodge.Item.Consumable
 import Geometry
 import Picture
-import Dodge.RandomHelp
+--import Dodge.RandomHelp
 
-import Data.Maybe
+--import Data.Maybe
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
-import Control.Monad.State
-import System.Random
-
+import Control.Monad
+--import System.Random
 
 spreadGunCrit :: Creature
 spreadGunCrit = defaultCreature
     { _crPict = basicCrPict red
-    , _crUpdate = stateUpdate $ impulsiveAI $ composeInternalAIs
-        [ performActions
-        , watchUpdateStrat
-            [ (crHasTargetLOS, \w cr -> StrategyActions (ShootAt 0) 
-                [DoActionIf (not . crIsAiming) DrawWeapon
-                ,DoActionThen 
-                    (DoActionWhile crHasTargetLOS $ ArbitraryAction chooseMovement)
-                    (DoImpulses [ChangeStrategy WatchAndWait])
-                ]
-              )
-            , (crAwayFromPost, goToPostStrat)
-            ]
-        , basicPerceptionUpdate [0]
-        , doStrategyActions
-        , reloadOverride
-        , targetYouWhenCognizant
-        , overrideInternal (onBoth (&&) crHasTarget (crStratConMatches (GetTo (0,0))))
-            $ \ _ -> crActionPlan . crStrategy .~ WatchAndWait
-        ]
+    , _crUpdate = stateUpdate $ impulsiveAIR $
+        performActionsR
+        >=> watchUpdateStratR
+          [ (crHasTargetLOS, \_ _ -> StrategyActions (ShootAt 0) 
+              [DoActionIf (not . crIsAiming) DrawWeapon
+              ,DoActionThen 
+                  (DoActionWhile crHasTargetLOS $ ArbitraryAction chooseMovement)
+                  (DoImpulses [ChangeStrategy WatchAndWait])
+              ]
+            )
+          , (crAwayFromPost, goToPostStrat)
+          ]
+        >=> basicPerceptionUpdateR [0]
+        >=> doStrategyActionsR
+        >=> reloadOverrideR
+        >=> targetYouWhenCognizantR
+        >=> (overrideInternalR (onBoth (&&) crHasTarget (crStratConMatches (GetTo (0,0))))
+          $ \ _ -> crActionPlan . crStrategy .~ WatchAndWait)
     , _crActionPlan = ActionPlan
         { _crImpulse    = []
         , _crAction     = []