Properly implement SetWerewolfAcrobatics

apps/openmw/mwbase/world.hpp

@@ -389,6 +389,10 @@ namespace MWBase
 
             /// Turn actor into werewolf or normal form.
             virtual void setWerewolf(const MWWorld::Ptr& actor, bool werewolf) = 0;
+
+            /// Sets the NPC's Acrobatics skill to match the fWerewolfAcrobatics GMST.
+            /// It only applies to the current form the NPC is in.
+            virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) = 0;
     };
 }
 

apps/openmw/mwmechanics/npcstats.cpp

@@ -393,6 +393,11 @@ void MWMechanics::NpcStats::setWerewolf (bool set)
         for(size_t i = 0;i < ESM::Skill::Length;i++)
         {
             mWerewolfSkill[i] = getSkill(i);
+
+            // Acrobatics is set separately for some reason.
+            if(i == ESM::Skill::Acrobatics)
+                continue;
+
             // "Mercantile"! >_<
             std::string name = "fWerewolf"+((i==ESM::Skill::Mercantile) ? std::string("Merchantile") :
                                             ESM::Skill::sSkillNames[i]);

apps/openmw/mwscript/statsextensions.cpp

@@ -1076,8 +1076,8 @@ namespace MWScript
 
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
-                    // What to do? Stats (attributes, skills) are already set and unset with
+                    MWWorld::Ptr ptr = R()(runtime);
-                    // BecomeWerewolf and UndoWerewolf.
+                    MWBase::Environment::get().getWorld()->applyWerewolfAcrobatics(ptr);
                 }
         };
 

apps/openmw/mwworld/worldimp.cpp

@@ -1925,4 +1925,12 @@ namespace MWWorld
         mRendering->rebuildPtr(actor);
     }
 
+    void World::applyWerewolfAcrobatics(const Ptr &actor)
+    {
+        const Store<ESM::GameSetting> &gmst = getStore().get<ESM::GameSetting>();
+        MWMechanics::NpcStats &stats = Class::get(actor).getNpcStats(actor);
+
+        stats.getSkill(ESM::Skill::Acrobatics).setModified(gmst.find("fWerewolfAcrobatics")->getFloat(), 0);
+    }
+
 }

apps/openmw/mwworld/worldimp.hpp

@@ -432,6 +432,8 @@ namespace MWWorld
             virtual bool isTeleportingEnabled() const;
 
             virtual void setWerewolf(const MWWorld::Ptr& actor, bool werewolf);
+
+            virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor);
     };
 }