Refactor bullet particles

src/Dodge/Creature/LtAutoCrit.hs

@@ -5,9 +5,10 @@ import Dodge.Data
 import Dodge.Default
 import Dodge.Creature.Picture
 import Dodge.Creature.Test
+import Dodge.Creature.Volition
 import Dodge.Creature.ActionRat
 --import Dodge.Creature.ChooseTarget
-import Dodge.Creature.SetTarget
+import Dodge.Creature.ReaderUpdate
 import Dodge.Creature.Rationality
 import Dodge.Creature.AlertLevel
 import Dodge.Creature.State
@@ -21,17 +22,17 @@ import Picture
 --import Data.Maybe
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
---import Control.Monad.State
+import Control.Monad.Reader
 --import System.Random
 
 ltAutoCrit :: Creature
 ltAutoCrit = defaultCreature
     { _crPict = basicCrPict red
-    , _crUpdate = stateUpdate $ impulsiveAI $ composeInternalAIs
-        [ performActions
-        , watchUpdateStrat
+    , _crUpdate = stateUpdate $ impulsiveAIR $
+        performActionsR
+        >=> watchUpdateStratR
             [ (crHasTargetLOS, \_ _ -> StrategyActions (ShootAt 0) 
-                [DoActionIf (not . crIsAiming) DrawWeapon
+                [DoActionIf (not . crIsAiming) drawWeapon
                 ,DoActionThen 
                     (DoActionWhile crHasTargetLOS $ ArbitraryAction chooseMovement)
                     (DoImpulses [ChangeStrategy WatchAndWait])
@@ -39,13 +40,12 @@ ltAutoCrit = defaultCreature
               )
             , (crAwayFromPost, goToPostStrat)
             ]
-        , basicPerceptionUpdate [0]
-        , doStrategyActions
-        , reloadOverride
-        , targetYouWhenCognizant
-        , overrideInternal (onBoth (&&) crHasTarget (crStratConMatches (GetTo (0,0))))
-            $ \ _ -> crActionPlan . crStrategy .~ WatchAndWait
-        ]
+        >=> basicPerceptionUpdateR [0]
+        >=> doStrategyActionsR
+        >=> reloadOverrideR
+        >=> targetYouWhenCognizantR
+        >=> (overrideInternalR (onBoth (&&) crHasTarget (crStratConMatches (GetTo (0,0))))
+            $ \ _ -> crActionPlan . crStrategy .~ WatchAndWait)
     , _crActionPlan = ActionPlan
         { _crImpulse    = []
         , _crAction     = []