From ea8f60eddf614c04330a5befdf310a98eea28c6a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 15 Jan 2014 16:30:16 +0100
Subject: [PATCH] Implement movement speed formula for creatures. Still moving
 a bit too slow.

---
 apps/openmw/mwclass/creature.cpp | 62 ++++++++++++++++++++++++++++++--
 apps/openmw/mwclass/creature.hpp |  8 +++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index ac8f85d13..a18df6d9f 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -61,6 +61,14 @@ namespace MWClass
 
                 fMinWalkSpeedCreature = gmst.find("fMinWalkSpeedCreature");
                 fMaxWalkSpeedCreature = gmst.find("fMaxWalkSpeedCreature");
+                fEncumberedMoveEffect = gmst.find("fEncumberedMoveEffect");
+                fSneakSpeedMultiplier = gmst.find("fSneakSpeedMultiplier");
+                fAthleticsRunBonus = gmst.find("fAthleticsRunBonus");
+                fBaseRunMultiplier = gmst.find("fBaseRunMultiplier");
+                fMinFlySpeed = gmst.find("fMinFlySpeed");
+                fMaxFlySpeed = gmst.find("fMaxFlySpeed");
+                fSwimRunBase = gmst.find("fSwimRunBase");
+                fSwimRunAthleticsMult = gmst.find("fSwimRunAthleticsMult");
 
                 inited = true;
             }
@@ -286,10 +294,51 @@ namespace MWClass
     float Creature::getSpeed(const MWWorld::Ptr &ptr) const
     {
         MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
+
         float walkSpeed = fMinWalkSpeedCreature->getFloat() + 0.01 * stats.getAttribute(ESM::Attribute::Speed).getModified()
                 * (fMaxWalkSpeedCreature->getFloat() - fMinWalkSpeedCreature->getFloat());
-        /// \todo what about the rest?
-        return walkSpeed;
+
+        const MWBase::World *world = MWBase::Environment::get().getWorld();
+        const MWMechanics::MagicEffects &mageffects = stats.getMagicEffects();
+
+        const float normalizedEncumbrance = 0; //getEncumbrance(ptr) / getCapacity(ptr);
+
+        bool running = ptr.getClass().getCreatureStats(ptr).getStance(MWMechanics::CreatureStats::Stance_Run);
+
+        float runSpeed = walkSpeed*(0.01f * getSkill(ptr, ESM::Skill::Athletics) *
+                                    fAthleticsRunBonus->getFloat() + fBaseRunMultiplier->getFloat());
+
+        float moveSpeed;
+        if(normalizedEncumbrance >= 1.0f)
+            moveSpeed = 0.0f;
+        else if(mageffects.get(ESM::MagicEffect::Levitate).mMagnitude > 0 &&
+                world->isLevitationEnabled())
+        {
+            float flySpeed = 0.01f*(stats.getAttribute(ESM::Attribute::Speed).getModified() +
+                                    mageffects.get(ESM::MagicEffect::Levitate).mMagnitude);
+            flySpeed = fMinFlySpeed->getFloat() + flySpeed*(fMaxFlySpeed->getFloat() - fMinFlySpeed->getFloat());
+            flySpeed *= 1.0f - fEncumberedMoveEffect->getFloat() * normalizedEncumbrance;
+            flySpeed = std::max(0.0f, flySpeed);
+            moveSpeed = flySpeed;
+        }
+        else if(world->isSwimming(ptr))
+        {
+            float swimSpeed = walkSpeed;
+            if(running)
+                swimSpeed = runSpeed;
+            swimSpeed *= 1.0f + 0.01f * mageffects.get(ESM::MagicEffect::SwiftSwim).mMagnitude;
+            swimSpeed *= fSwimRunBase->getFloat() + 0.01f*getSkill(ptr, ESM::Skill::Athletics) *
+                                                    fSwimRunAthleticsMult->getFloat();
+            moveSpeed = swimSpeed;
+        }
+        else if(running)
+            moveSpeed = runSpeed;
+        else
+            moveSpeed = walkSpeed;
+        if(getMovementSettings(ptr).mPosition[0] != 0 && getMovementSettings(ptr).mPosition[1] == 0)
+            moveSpeed *= 0.75f;
+
+        return moveSpeed;
     }
 
     MWMechanics::Movement& Creature::getMovementSettings (const MWWorld::Ptr& ptr) const
@@ -483,4 +532,13 @@ namespace MWClass
 
     const ESM::GameSetting* Creature::fMinWalkSpeedCreature;
     const ESM::GameSetting* Creature::fMaxWalkSpeedCreature;
+    const ESM::GameSetting *Creature::fEncumberedMoveEffect;
+    const ESM::GameSetting *Creature::fSneakSpeedMultiplier;
+    const ESM::GameSetting *Creature::fAthleticsRunBonus;
+    const ESM::GameSetting *Creature::fBaseRunMultiplier;
+    const ESM::GameSetting *Creature::fMinFlySpeed;
+    const ESM::GameSetting *Creature::fMaxFlySpeed;
+    const ESM::GameSetting *Creature::fSwimRunBase;
+    const ESM::GameSetting *Creature::fSwimRunAthleticsMult;
+
 }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 461410a49..7d2f95fae 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -16,6 +16,14 @@ namespace MWClass
 
             static const ESM::GameSetting *fMinWalkSpeedCreature;
             static const ESM::GameSetting *fMaxWalkSpeedCreature;
+            static const ESM::GameSetting *fEncumberedMoveEffect;
+            static const ESM::GameSetting *fSneakSpeedMultiplier;
+            static const ESM::GameSetting *fAthleticsRunBonus;
+            static const ESM::GameSetting *fBaseRunMultiplier;
+            static const ESM::GameSetting *fMinFlySpeed;
+            static const ESM::GameSetting *fMaxFlySpeed;
+            static const ESM::GameSetting *fSwimRunBase;
+            static const ESM::GameSetting *fSwimRunAthleticsMult;
 
         public: