Work on Falling carriage state

src/Dodge/Creature/Update.hs

@@ -37,7 +37,7 @@ import ShapePicture.Data
 updateCreature :: Creature -> World -> World
 updateCreature cr
     | cr ^. crPos . _z < negate 100 = (tocr . crHP .~ CrIsPitted) . destroyAllInvItems cr
-    | CrIsCorpse _ <- cr ^. crHP = chasmTestCorpse cr
+    | CrIsCorpse _ <- cr ^. crHP = updateCarriage (_crID cr) . chasmTestCorpse cr
     | null (cr ^? crHP . _HP) = id
     | cr ^. crPos . _z < 0 = (tocr . crZVel -~ 0.5) . (tocr . crPos . _z +~ _crZVel cr)
     | otherwise = updateLivingCreature cr
@@ -142,8 +142,8 @@ chasmTestLiving cr w
     | Flying {} <- cr ^. crStance . carriage = w
     | Falling {} <- cr ^. crStance . carriage =
         w
-            & tocr . crZVel -~ 0.5
-            & tocr . crPos . _z +~ _crZVel cr
+--            & tocr . crZVel -~ 0.5
+--            & tocr . crPos . _z +~ _crZVel cr
     | Just (x, y) <- List.find g (w ^. cWorld . cliffs) =
         w
             & soundContinue (CrChasm (_crID cr)) (cr ^. crPos . _xy) debrisS (Just 100)
@@ -158,22 +158,22 @@ chasmTestLiving cr w
 
 startFalling :: Creature -> Creature
 startFalling cr = case cr ^. crStance . carriage of
-    Walking a b -> cr & crZVel -~ 0.5
-        & crStance . carriage .~ Falling a b
-    _ -> cr
+    Walking a b -> cr & crStance . carriage .~ Falling a b
+    _ -> cr & crStance . carriage .~ Falling 0 RightForward
 
 chasmTestCorpse :: Creature -> World -> World
 chasmTestCorpse cr w
-    | _crZVel cr < 0 =
-        w
-            & tocr . crZVel -~ 0.5
-            & tocr . crPos . _z +~ _crZVel cr
+--    | _crZVel cr < 0 =
+--        w
+--            & tocr . crZVel -~ 0.5
+--            & tocr . crPos . _z +~ _crZVel cr
     -- only look for TWO cliffs to push along
     | (xy:xys) <- filter g (w ^. cWorld . cliffs) =
         w
             & soundContinue (CrChasm (_crID cr)) (cr ^. crPos . _xy) debrisS (Just 100)
             & tocr . crPos . _xy +~ h xy xys
-    | any f (w ^. cWorld . chasms) = w & tocr . crZVel -~ 0.5
+--    | any f (w ^. cWorld . chasms) = w & tocr . crZVel -~ 0.5
+    | any f (w ^. cWorld . chasms) = w & tocr %~ startFalling
     | otherwise = w
   where