Add pistolCrit file, tweak shell spin params

src/Dodge/Creature/ActionRat.hs

@@ -78,18 +78,22 @@ shootFirstMiss tcid w cr = StrategyActions (ShootAt tcid) acs
           `DoActionThen`
           LeadTarget (0,0)
           `DoActionThen`
-          (advanceShoot `DoActionWhileThen` lostest
-          $ DoReplicateThen advanceShoot 75
-          $ DoImpulses [ChangeStrategy WatchAndWait]
-          )
+          lostest `DoActionWhile` 
+            advanceShoot `DoActionThen`
+            75 `DoReplicate` 
+            advanceShoot `DoActionThen`
+          DoImpulses [ChangeStrategy WatchAndWait]
+          
         ]
     lostest (w,cr') = canSee (_crID cr') tcid w 
     advanceShoot = ImpulsesList [[UseItem, MoveForward 3]]
     
 fleeTime :: Int -> World -> Creature -> Strategy
 fleeTime t w cr = StrategyActions Flee
-    [ UseTargetCID FleeFrom `DoReplicateThen` t
-            $ DoImpulses [ChangeStrategy WatchAndWait]
+    [ t `DoReplicate`
+        UseTargetCID FleeFrom 
+          `DoActionThen`
+        DoImpulses [ChangeStrategy WatchAndWait]
     ]
 
 aimThenShootStrat :: Int -> World -> Creature -> Strategy
@@ -115,10 +119,10 @@ shootMoveStrat :: Point2 -> Int -> World -> Creature -> Strategy
 shootMoveStrat moveV tcid _ _ = StrategyActions (ShootAt tcid)
     [ DoActionIfElse NoAction crIsAiming (DoActionThen DrawWeapon (WaitThen 50 NoAction))
       `DoActionThen`
-      (DoActionWhileThen advanceShoot lostest
-      . DoReplicateThen advanceShoot 75
-      $ DoImpulses [ChangeStrategy WatchAndWait]
-      )
+        lostest `DoActionWhile`
+        75 `DoReplicate` 
+        advanceShoot `DoActionThen`
+      DoImpulses [ChangeStrategy WatchAndWait]
     , AimAtCloseSlow 
         { _targetID = tcid
         , _targetSeenAt = (0,0) -- hack
@@ -135,10 +139,11 @@ shootAdvanceStrat :: Int -> World -> Creature -> Strategy
 shootAdvanceStrat tcid _ _ = StrategyActions (ShootAt tcid)
     [ DoActionIfElse NoAction crIsAiming (DoActionThen DrawWeapon (WaitThen 50 NoAction))
       `DoActionThen`
-      (DoActionWhileThen advanceShoot lostest
-      . DoReplicateThen advanceShoot 75
-      $ DoImpulses [ChangeStrategy WatchAndWait]
-      )
+        lostest `DoActionWhile`
+        advanceShoot `DoActionThen`
+        75 `DoReplicate` 
+        advanceShoot `DoActionThen`
+        DoImpulses [ChangeStrategy WatchAndWait]
     , AimAtCloseSlow 
         { _targetID = tcid
         , _targetSeenAt = (0,0) -- hack
@@ -183,10 +188,12 @@ shootAdvance w cr tcr as
         && cr ^? crInv . ix (_crInvSel cr) . wpReloadState == Just 0 = 
         [ DrawWeapon
         , DoImpulses [ChangeStrategy $ ShootAt $ _crID tcr]
-        , WaitThen 50 
-            . DoActionWhileThen advanceShoot lostest
-            . DoReplicateThen advanceShoot 50
-            $ DoImpulses [ChangeStrategy WatchAndWait]
+        , 50 `WaitThen` 
+            lostest `DoActionWhile` 
+            advanceShoot `DoActionThen`
+            50 `DoReplicate`
+            advanceShoot `DoActionThen`
+            DoImpulses [ChangeStrategy WatchAndWait]
         , AimAtCloseSlow 
             { _targetID = _crID tcr
             , _targetSeenAt = _crPos cr