Refactor bullet particles

src/Dodge/Creature/LauncherCrit.hs

@@ -6,9 +6,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
@@ -20,24 +21,23 @@ import Picture
 
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
+import Control.Monad.Reader
 
 launcherCrit :: Creature
 launcherCrit = defaultCreature
     { _crPict = basicCrPict red
-    , _crUpdate = stateUpdate $ impulsiveAI $ composeInternalAIs
-        [ performActions
-        , watchUpdateStrat
---            [ (crHasTargetLOS, shootMoveStrat (0,3) 0)
+    , _crUpdate = stateUpdate $ impulsiveAIR $
+        performActionsR
+        >=> watchUpdateStratR
             [ (crHasTargetLOS, \_ _ -> StrategyActions (ShootAt 0) [retreatFire])
             , (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     = []
@@ -54,26 +54,26 @@ launcherCrit = defaultCreature
 retreatFire :: Action
 retreatFire = ImpulsesList ( [ UseItem ] : replicate 20 [ Turn 0.16 ])
     `DoActionThen`
-    HolsterWeapon
+    holsterWeapon
     `DoActionThen`
     ImpulsesList ( replicate 30 [ MoveForward 3 ])
     `DoActionThen`
-    DrawWeapon
+    drawWeapon
     `DoActionThen`
     ImpulsesList ( [UseItem] : replicate 20 [ Turn $ negate 0.16 ] )
     `DoActionThen`
-    HolsterWeapon
+    holsterWeapon
     `DoActionThen`
     ImpulsesList ( replicate 15 [ MoveForward 3 ] )
     `DoActionThen`
-    DrawWeapon
+    drawWeapon
     `DoActionThen`
     ImpulsesList (
     replicate 100 [UseItem, ImpulseUseTarget $ \tcr -> TurnToward (_crPos tcr) (pi/16) ] )
     `DoActionThen`
     20
     `WaitThen`
-    HolsterWeapon
+    holsterWeapon
     `DoActionThen`
     ImpulsesList ( replicate 15 [ MoveForward 3 ] )
     `DoActionThen`