Fix enemy stride/footsteps

src/Dodge/Creature/ChaseCrit.hs

@@ -5,7 +5,7 @@ module Dodge.Creature.ChaseCrit (
 ) where
 
 --import Dodge.Data.Equipment.Misc
---import Control.Lens
+import Control.Lens
 import Dodge.Data.Creature
 import Dodge.Default
 --import Dodge.Item.Equipment
@@ -27,12 +27,11 @@ invisibleChaseCrit =
 chaseCrit :: Creature
 chaseCrit =
     defaultCreature
-        { _crName = "chaseCrit"
-        , _crHP = HP 150
-        , _crInv = mempty
-        , _crFaction = ColorFaction green
-        , _crVocalization = chaseCritVocalization
-        }
+        & crName .~ "chaseCrit"
+        & crHP .~ HP 150
+        & crFaction .~ ColorFaction green
+        & crVocalization .~ chaseCritVocalization
+        & crStance . strideLength .~ 30
 
 chaseCritVocalization :: Vocalization
 chaseCritVocalization = Vocalization (50, 200) 0

src/Dodge/Creature/Impulse.hs

@@ -45,6 +45,7 @@ followImpulse cr w imp = case imp of
     Bark sid -> (soundStart (CrMouth cid) cpos sid Nothing, resetCrVocCoolDown w cr)
     Move p -> crup $ crMvBy p (w ^. cWorld . lWorld) cr
     MoveForward x -> crup $ crMvForward x (w ^. cWorld . lWorld) cr
+    MoveNoStride p -> crup $ crMvByNoStride p (w ^. cWorld . lWorld) cr
     Turn a -> crup $ cr & crDir +~ a
     TurnToward p a -> crup $ creatureTurnToward p a cr
     TurnTo p -> crup $ creatureTurnTo p cr

src/Dodge/Creature/Impulse/Movement.hs

@@ -3,6 +3,7 @@ module Dodge.Creature.Impulse.Movement (
     creatureTurnTowardDir,
     crMvAbsolute,
     crMvBy,
+    crMvByNoStride,
     crMvForward,
     creatureTurnTo,
 ) where
@@ -26,6 +27,14 @@ crMvBy ::
     Creature
 crMvBy p lw cr = crMvAbsolute lw (rotateV (_crDir cr) p) cr
 
+crMvByNoStride ::
+    -- | Movement translation vector, will be made relative to creature direction
+    Point2 ->
+    LWorld ->
+    Creature ->
+    Creature
+crMvByNoStride p lw cr = crMvAbsoluteNoStride lw (rotateV (_crDir cr) p) cr
+
 crMvAbsolute :: LWorld -> Point2 -> Creature -> Creature
 crMvAbsolute lw p' cr =
     advanceStepCounter (magV p) cr
@@ -34,6 +43,11 @@ crMvAbsolute lw p' cr =
   where
     p = strengthFactor (getCrMoveSpeed lw cr) *.* p'
 
+crMvAbsoluteNoStride :: LWorld -> Point2 -> Creature -> Creature
+crMvAbsoluteNoStride lw p' cr = cr & crPos . _xy +~ p
+  where
+    p = strengthFactor (getCrMoveSpeed lw cr) *.* p'
+
 strengthFactor :: Int -> Float
 strengthFactor i
     | i > 50 = 1

src/Dodge/Creature/State/WalkCycle.hs

@@ -10,7 +10,7 @@ import Sound.Data
 
 updateWalkCycle :: Int -> World -> World
 updateWalkCycle cid w
-    | Just cr <- w ^? cWorld . lWorld . creatures . ix 0
+    | Just cr <- w ^? cWorld . lWorld . creatures . ix cid
       , Walking x ff <- cr ^. crStance . carriage
       , x >= cr ^. crStance . strideLength =
         w

src/Dodge/Creature/Update.hs

@@ -47,6 +47,7 @@ updateCreature' cr =
         LampCrit{} -> updateLampoid cr
         BarrelCrit bt -> updateBarreloid bt cr
         AvatarDead -> id
+        ChaseCrit {} -> crUpdate updateHumanoid cr
         _ -> crUpdate updateHumanoid cr
 
 {- | this seems to work, but I am not sure about the ordering:

src/Dodge/Data/ActionPlan.hs

@@ -27,6 +27,7 @@ data ActionPlan
 data Impulse
     = Move Point2
     | MoveForward Float
+    | MoveNoStride Point2
     | Turn Float
     | RandomTurn Float
     | RandomImpulse RandImpulse -- (State StdGen Impulse)

src/Dodge/Default/Creature.hs

@@ -108,7 +108,7 @@ defaultAimingCrit :: Creature
 defaultAimingCrit = defaultCreature
 
 yourDefaultStrideLength :: Float
-yourDefaultStrideLength = 40
+yourDefaultStrideLength = 35
 
 --defaultState :: CreatureState
 --defaultState =

src/Dodge/Humanoid.hs

@@ -179,26 +179,8 @@ updateHumanoid cr = case cr ^?! crType of
 --        , WaitThen 1 $  (DoImpulses [ChangeStrategy WatchAndWait])
 --        ]
 
-humanoidAIList ::
-    [World -> Creature -> Creature] ->
-    Creature ->
-    World ->
-    World
-humanoidAIList
-    = impulsiveAIBefore . chainCreatureUpdates
-
----- bit of a hack to get new random generators after each creature's update
---defaultImpulsive ::
---    [World -> Creature -> Creature] ->
---    Creature ->
---    World ->
---    World
---defaultImpulsive
---    = fmap (fmap updateRandGen) . crUpdate . impulsiveAIBefore . chainCreatureUpdates
---  where
---    updateRandGen w =
---        let (_, g) = randomR (0, 1 :: Int) (_randGen w)
---         in w & randGen .~ g
+humanoidAIList :: [World -> Creature -> Creature] -> Creature -> World -> World
+humanoidAIList = impulsiveAIBefore . chainCreatureUpdates
 
 chooseMovementPistol :: Creature -> World -> Action
 chooseMovementPistol cr w =

src/Dodge/RandImpulse.hs

@@ -7,4 +7,4 @@ import RandomHelp
 doRandImpulse :: RandImpulse -> State StdGen Impulse
 doRandImpulse ri = case ri of
     RandImpulseList xs -> takeOne xs
-    RandImpulseCircMove r -> Move <$> randInCirc r
+    RandImpulseCircMove r -> MoveNoStride <$> randInCirc r

src/Dodge/Room/Room.hs

@@ -399,9 +399,9 @@ critsRoom :: Int -> State LayoutVars (Tree Room)
 critsRoom i =
     join $
         takeOne
---            [ return <$> roomCCrits i
---            , return <$> critsPillarRoom i
-            [ return <$> glassSwitchBackCrits i
+            [ return <$> roomCCrits i
+            , return <$> critsPillarRoom i
+            , return <$> glassSwitchBackCrits i
             ]
 
 --    cor <- shuffleLinks corridor

src/Dodge/Room/Tutorial.hs

@@ -1,5 +1,6 @@
 module Dodge.Room.Tutorial where
 
+--import Dodge.Room.LongDoor
 import Dodge.Layout
 import Dodge.Item.Held.Utility
 import Control.Monad
@@ -42,6 +43,10 @@ tutAnoTree = do
     foldMTRS
         [ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
         , corDoor
+--        , corDoor
+--        , tToBTree "t" . return . cleatOnward <$> slowDoorRoom
+--        , corDoor
+--        , corDoor
         , tutHub
         , tutLight
         , tutDrop