Commit before simplifying actions

src/Dodge/Creature/Action.hs

@@ -147,6 +147,8 @@ crMoveImpulses cr p = case crMvType cr of
     MvWalking {} -> [MvTurnToward p, MvForward]
     JitMvType {_mvTurnJit = x} -> [MvTurnToward p, MvForward, RandomTurn x]
     StartStopMvType {} -> [MvTurnToward p, MvForward]
+    BeeMvType {} | cr ^?! crType . beeRandomMovement -> [MvForward]
+    BeeMvType {} -> [MvTurnToward p, MvForward]
 
 performTurnToA :: Creature -> Point2 -> ActionUpdate
 performTurnToA cr p

src/Dodge/Creature/ChaseCrit.hs

@@ -91,7 +91,7 @@ beeCrit =
     defaultCreature
         & crName .~ "beeCrit"
         & crHP .~ HP 100
-        & crType .~ BeeCrit 0 Nothing 0 0 0
+        & crType .~ BeeCrit 0 Nothing 0 0 0 False
         & crFaction .~ ColorFaction yellow
         & crStance . carriage .~ Flying 15
 

src/Dodge/Creature/Impulse/Movement.hs

@@ -80,6 +80,11 @@ crMvForward' lw cr = case crMvType cr of
                 | otherwise = s
         in crMvBy (V2 speed 0) lw cr
             & crType . startStopMv %~ ((`mod` (n*2)) . (+1))
+    BeeMvType s _ n ->
+        let speed | cr ^?! crType . startStopMv > n = 0
+                | otherwise = s
+        in crMvBy (V2 speed 0) lw cr
+            & crType . startStopMv %~ ((`mod` (n*2)) . (+1))
     NoMvType -> cr
     MvWalking s -> crMvBy (V2 s 0) lw cr
     

src/Dodge/Creature/MoveType.hs

@@ -17,7 +17,7 @@ crMvType cr = case _crType cr of
     BarrelCrit {} -> defaultAimMvType
     LampCrit {} -> defaultAimMvType
     SlimeCrit {} -> NoMvType
-    BeeCrit {} -> StartStopMvType 0.2 0.1 25
+    BeeCrit {} -> BeeMvType 0.2 0.1 25
     HiveCrit{} -> NoMvType
 
 defaultAimMvType :: CrMvType

src/Dodge/Data/Creature/Misc.hs

@@ -36,6 +36,11 @@ data CrMvType
         , _mvTurnSpeed :: Float
         , _mvPulseTime :: Int
         }
+    | BeeMvType
+        { _mvSpeed :: Float
+        , _mvTurnSpeed :: Float
+        , _mvPulseTime :: Int
+        }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Pulse = PulseStatus
@@ -86,6 +91,7 @@ data CreatureType
         , _startStopMv :: Int
         , _beeAggro :: Int
         , _meleeCooldown :: Int
+        , _beeRandomMovement :: Bool
         }
     | HiveCrit
         { _hiveChildren :: IS.IntSet