Count werewolf kills (Fixes #1525)

apps/openmw/mwclass/npc.cpp

@@ -757,11 +757,16 @@ namespace MWClass
         if (!wasDead && getCreatureStats(ptr).isDead())
         {
             // NPC was killed
+            if (!attacker.isEmpty() && attacker.getClass().isNpc() && attacker.getClass().getNpcStats(attacker).isWerewolf())
+            {
+                attacker.getClass().getNpcStats(attacker).addWerewolfKill();
+            }
+
             // Simple check for who attacked first: if the player attacked first, a crimeId should be set
             // Doesn't handle possible edge case where no one reported the assault, but in such a case,
             // for bystanders it is not possible to tell who attacked first, anyway.
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            if (ptr.getClass().getNpcStats(ptr).getCrimeId() != -1 && ptr != player)
+            if (attacker == player && ptr.getClass().getNpcStats(ptr).getCrimeId() != -1 && ptr != player)
                 MWBase::Environment::get().getMechanicsManager()->commitCrime(player, ptr, MWBase::MechanicsManager::OT_Murder);
         }
     }

apps/openmw/mwmechanics/actors.cpp

@@ -460,6 +460,9 @@ namespace MWMechanics
         {
             // The actor was killed by a magic effect. Figure out if the player was responsible for it.
             const ActiveSpells& spells = creatureStats.getActiveSpells();
+            bool killedByPlayer = false;
+            bool murderedByPlayer = false;
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
             for (ActiveSpells::TIterator it = spells.begin(); it != spells.end(); ++it)
             {
                 const ActiveSpells::ActiveSpellParams& spell = it->second;
@@ -478,20 +481,23 @@ namespace MWMechanics
                     if (effectId == ESM::MagicEffect::DamageHealth || effectId == ESM::MagicEffect::AbsorbHealth)
                         isDamageEffect = true;
 
-                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
                     MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.mCasterActorId);
                     if (isDamageEffect && caster == player)
                     {
+                        killedByPlayer = true;
                         // Simple check for who attacked first: if the player attacked first, a crimeId should be set
                         // Doesn't handle possible edge case where no one reported the assault, but in such a case,
                         // for bystanders it is not possible to tell who attacked first, anyway.
                         if (ptr.getClass().isNpc() && ptr.getClass().getNpcStats(ptr).getCrimeId() != -1
                                 && ptr != player)
-                            MWBase::Environment::get().getMechanicsManager()->commitCrime(player, ptr, MWBase::MechanicsManager::OT_Murder);
+                            murderedByPlayer = true;
-                        break;
                     }
                 }
             }
+            if (murderedByPlayer)
+                MWBase::Environment::get().getMechanicsManager()->commitCrime(player, ptr, MWBase::MechanicsManager::OT_Murder);
+            if (killedByPlayer && player.getClass().getNpcStats(player).isWerewolf())
+                player.getClass().getNpcStats(player).addWerewolfKill();
         }
 
         // TODO: dirty flag for magic effects to avoid some unnecessary work below?

apps/openmw/mwmechanics/npcstats.cpp

@@ -396,6 +396,8 @@ void MWMechanics::NpcStats::setWerewolf (bool set)
     {
         const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
+        mWerewolfKills = 0;
+
         for(size_t i = 0;i < ESM::Attribute::Length;i++)
         {
             mWerewolfAttributes[i] = getAttribute(i);
@@ -427,6 +429,11 @@ int MWMechanics::NpcStats::getWerewolfKills() const
     return mWerewolfKills;
 }
 
+void MWMechanics::NpcStats::addWerewolfKill()
+{
+    ++mWerewolfKills;
+}
+
 int MWMechanics::NpcStats::getProfit() const
 {
     return mProfit;

apps/openmw/mwmechanics/npcstats.hpp

@@ -126,6 +126,9 @@ namespace MWMechanics
 
             int getWerewolfKills() const;
 
+            /// Increments mWerewolfKills by 1.
+            void addWerewolfKill();
+
             float getTimeToStartDrowning() const;
             /// Sets time left for the creature to drown if it stays underwater.
             /// @param time value from [0,20]

components/compiler/extensions0.cpp

@@ -441,7 +441,7 @@ namespace Compiler
 
             extensions.registerFunction ("getrace", 'l', "c", opcodeGetRace,
                 opcodeGetRaceExplicit);
-            extensions.registerFunction ("getwerewolfkills", 'f', "", opcodeGetWerewolfKills);
+            extensions.registerFunction ("getwerewolfkills", 'l', "", opcodeGetWerewolfKills);
             extensions.registerFunction ("pcexpelled", 'l', "/S", opcodePcExpelled, opcodePcExpelledExplicit);
             extensions.registerInstruction ("pcexpell", "/S", opcodePcExpell, opcodePcExpellExplicit);
             extensions.registerInstruction ("pcclearexpelled", "/S", opcodePcClearExpelled, opcodePcClearExpelledExplicit);