From 67c1c5ce1811271a15d93b8e0be906432cfe8a06 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 9 Jul 2012 20:42:45 +0200
Subject: [PATCH] Issue #324: adjusted setSkill script instructions according
 to the recent research

---
 apps/openmw/mwscript/statsextensions.cpp | 30 ++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 42781d7669..c720e2c6aa 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1,8 +1,12 @@
 
 #include "statsextensions.hpp"
 
+#include <cmath>
+
 #include <boost/algorithm/string.hpp>
 
+#include <components/esm/loadnpc.hpp>
+
 #include <components/esm_store/store.hpp>
 
 #include <components/compiler/extensions.hpp>
@@ -260,8 +264,30 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr).getNpcStats (ptr).getSkill (mIndex).
-                        setModified (value, 0);
+                    MWMechanics::NpcStats& stats = MWWorld::Class::get (ptr).getNpcStats (ptr);
+
+                    MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+
+                    assert (ref);
+
+                    const ESM::Class& class_ =
+                        *MWBase::Environment::get().getWorld()->getStore().classes.find (ref->base->cls);
+
+                    float level = 0;
+                    float progress = std::modf (stats.getSkill (mIndex).getBase(), &level);
+
+                    float modifier = stats.getSkill (mIndex).getModifier();
+
+                    int newLevel = static_cast<int> (value-modifier);
+
+                    progress = (progress / stats.getSkillGain (mIndex, class_, -1, level))
+                        * stats.getSkillGain (mIndex, class_, -1, newLevel);
+
+                    if (progress>=1)
+                        progress = 0.999999999;
+
+                    stats.getSkill (mIndex).set (newLevel + progress);
+                    stats.getSkill (mIndex).setModifier (modifier);
                 }
         };