diff --git a/src/Dodge/Creature/Update.hs b/src/Dodge/Creature/Update.hs index c6ff9d209..04ca068d3 100644 --- a/src/Dodge/Creature/Update.hs +++ b/src/Dodge/Creature/Update.hs @@ -42,7 +42,7 @@ updateCreature cr | cr ^. crPos . _z < negate 100 = (tocr . crHP .~ CrIsPitted) . destroyAllInvItems 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) +-- | cr ^. crPos . _z < 0 = (tocr . crZVel -~ 0.5) . (tocr . crPos . _z +~ _crZVel cr) | otherwise = updateLivingCreature cr where tocr = cWorld . lWorld . creatures . ix (_crID cr) diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs index 1b9b71b3e..fcbad6856 100644 --- a/src/Dodge/Data/Creature.hs +++ b/src/Dodge/Data/Creature.hs @@ -36,7 +36,7 @@ data Creature = Creature { _crPos :: Point3 , _crOldPos :: Point3 , _crOldOldPos :: Point3 - , _crZVel :: Float +-- , _crZVel :: Float , _crDir :: Float , _crMvDir :: Float -- , _crMvAim :: Float diff --git a/src/Dodge/Default/Creature.hs b/src/Dodge/Default/Creature.hs index 8937b6307..86652aeed 100644 --- a/src/Dodge/Default/Creature.hs +++ b/src/Dodge/Default/Creature.hs @@ -16,7 +16,7 @@ defaultCreature = , _crOldPos = V3 0 0 0 , _crOldOldPos = V3 0 0 0 -- , _crZ = 0 - , _crZVel = 0 +-- , _crZVel = 0 , _crDir = 0 , _crMvDir = 0 -- , _crMvAim = 0 diff --git a/src/Dodge/SpawnAt.hs b/src/Dodge/SpawnAt.hs index a44e0b2de..714a5241e 100644 --- a/src/Dodge/SpawnAt.hs +++ b/src/Dodge/SpawnAt.hs @@ -27,4 +27,4 @@ spawnAt p d w = w -- [MakeStartCloudAt (V3 x y 20 & _xy +~ p) | x <- [-5, -4 .. 5], y <- [-5, -4 .. 5]] where --f = set (crPos . _xy) p . set crDir d . set crMvDir d . set crMvAim d . set (crPos . _z) 0 . set crZVel 0 - f = set (crPos . _xy) p . set crDir d . set crMvDir d . set (crPos . _z) 0 . set crZVel 0 + f = set (crPos . _xy) p . set crDir d . set crMvDir d . set (crPos . _z) 0 -- . set crZVel 0