diff --git a/src/Dodge/Creature/State/WalkCycle.hs b/src/Dodge/Creature/State/WalkCycle.hs index 609a05efe..9bfa9a8d5 100644 --- a/src/Dodge/Creature/State/WalkCycle.hs +++ b/src/Dodge/Creature/State/WalkCycle.hs @@ -66,13 +66,11 @@ walkCliffPush cr xs = pushAgainst (cr ^. crOldPos . _xy - cr ^. crOldOldPos . _x h = circSegsInside cxy (cr ^. crType . to crRad) groundCliffPush :: Creature -> [(Point2,Point2)] -> Point2 -groundCliffPush cr xs = x *^ h xs +groundCliffPush cr xs = x *^ circSegsInside cxy r xs where - --x = max 0.05 $ 0.05 + 0.05 * (1 - dist cxy p / (2*r)) x = max 0 $ 0.25 * (1 - dist cxy p / (2*r)) ** 2 cxy = cr ^. crPos . _xy r = cr ^. crType . to crRad - h = circSegsInside cxy r p = circSegsInside' cxy r xs circSegsInside' :: Point2 -> Float -> [(Point2,Point2)] -> Point2