Apply "cast when strikes" enchantments when hitting with a weapon

apps/openmw/mwclass/npc.cpp

@@ -444,6 +444,36 @@ namespace MWClass
         if(ptr.getRefData().getHandle() == "player")
             skillUsageSucceeded(ptr, weapskill, 0);
 
+        // Apply "On hit" enchanted weapons
+        std::string enchantmentName = weapon.getClass().getEnchantment(weapon);
+        if (!enchantmentName.empty())
+        {
+            const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
+                        enchantmentName);
+            if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
+            {
+                // Check if we have enough charges
+                const float enchantCost = enchantment->mData.mCost;
+                int eSkill = stats.getSkill(ESM::Skill::Enchant).getModified();
+                const float castCost = enchantCost - (enchantCost / 100) * (eSkill - 10);
+
+                if (weapon.getCellRef().mEnchantmentCharge == -1)
+                    weapon.getCellRef().mEnchantmentCharge = enchantment->mData.mCharge;
+                if (weapon.getCellRef().mEnchantmentCharge < castCost)
+                {
+                    if (ptr.getRefData().getHandle() == "player")
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInsufficientCharge}");
+                }
+                else
+                {
+                    weapon.getCellRef().mEnchantmentCharge -= castCost;
+                    othercls.getCreatureStats(victim).getActiveSpells().addSpell(enchantmentName, victim, ESM::RT_Touch, weapon.getClass().getName(weapon));
+                    getCreatureStats(ptr).getActiveSpells().addSpell(enchantmentName, ptr, ESM::RT_Self, weapon.getClass().getName(weapon));
+                    // TODO: RT_Target
+                }
+            }
+        }
+
         othercls.onHit(victim, damage, healthdmg, weapon, ptr, true);
     }
 

apps/openmw/mwmechanics/activespells.cpp

@@ -245,8 +245,11 @@ namespace MWMechanics
                     sndMgr->playSound3D(actor, schools[magicEffect->mData.mSchool]+" hit", 1.0f, 1.0f);
             }
 
-            const ESM::Static* castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find (magicEffect->mHit);
-            MWBase::Environment::get().getWorld()->getAnimation(actor)->addEffect("meshes\\" + castStatic->mModel, "");
+            if (!magicEffect->mHit.empty())
+            {
+                const ESM::Static* castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find (magicEffect->mHit);
+                MWBase::Environment::get().getWorld()->getAnimation(actor)->addEffect("meshes\\" + castStatic->mModel, "");
+            }
 
             first = false;
         }

apps/openmw/mwworld/worldimp.cpp

@@ -2094,7 +2094,9 @@ namespace MWWorld
                 return;
             }
 
-            actor.getClass().skillUsageSucceeded(actor, MWMechanics::spellSchoolToSkill(MWMechanics::getSpellSchool(selectedSpell, actor)), 0);
+            if (actor == getPlayer().getPlayer())
+                actor.getClass().skillUsageSucceeded(actor,
+                    MWMechanics::spellSchoolToSkill(MWMechanics::getSpellSchool(selectedSpell, actor)), 0);
 
             effects = spell->mEffects;
         }