Add pistolCrit file, tweak shell spin params

src/Dodge/Data.hs

@@ -476,7 +476,8 @@ data Impulse
     | MakeSound Int
     | ChangeStrategy Strategy
     | AddGoal Goal
-    | ArbitraryCreatureImpulse (World -> Creature -> Creature) 
+    | ArbitraryImpulseFunction (World -> Creature -> Creature) 
+    | ArbitraryImpulse (Creature -> World -> Impulse) 
     | ImpulseUseTargetCID
         {_impulseUseTargetCID :: Int -> Impulse
         }
@@ -489,6 +490,8 @@ data Impulse
 --  deriving (Eq,Ord,Show)
 infixr 9 `WaitThen`
 infixr 9 `DoActionThen`
+infixr 9 `DoActionWhile`
+infixr 9 `DoReplicate`
 data Action
     = Attack 
         {_attackTargetID :: Int}
@@ -535,8 +538,13 @@ data Action
         ,_waitThenAction :: Action
         }
     | DoActionWhile 
-        {_doActionWhileAction :: Action 
+        {_doActionWhileCondition :: ( (World, Creature) -> Bool)
+        ,_doActionWhileAction :: Action 
+        }
+    | DoActionWhilePartial
+        {_doActionWhilePartial :: Action
         ,_doActionWhileCondition :: ( (World, Creature) -> Bool)
+        ,_doActionWhileAction :: Action 
         }
     | DoActionIfElse 
         {_doActionIfElseIfAction :: Action 
@@ -561,10 +569,14 @@ data Action
     | DoGuardActions 
         {_doGuardActionsList :: [( (World, Creature) -> Bool, Action, Maybe Action)]
         }
-    | DoReplicateThen 
-        {_doReplicateThenDo :: Action 
-        ,_doReplicateThenTimes :: Int 
-        ,_doReplicateThenAfter :: Action
+    | DoReplicate 
+        {_doReplicateTimes :: Int 
+        ,_doReplicateAction :: Action
+        }
+    | DoReplicatePartial
+        {_partialAction :: Action
+        ,_doReplicateTimes :: Int
+        ,_doReplicateAction :: Action
         }
     | LeadTarget
         {_leadTargetBy :: Point2
@@ -577,6 +589,16 @@ data Action
     | UseAheadPos
         {_useAheadPos :: Point2 -> Action
         }
+    | ArbitraryAction
+        { _arbitraryAction :: Creature -> World -> Action }
+    | DoActionAlongside -- ^ Repeatedly perform a side action alongside a main action until the main action terminates
+        {_sideAction :: Action
+        ,_mainAction :: Action
+        }
+    | DoImpulsesAlongside -- ^ Repeatedly perform impulses alongside a main action until the main action terminates
+        {_sideImpulses :: [Impulse]
+        ,_mainAction :: Action
+        }
   deriving (Generic)
 --  deriving (Eq,Ord,Show)
 data Strategy