Merge branch 'ijustwantedtheprivatefunction' into 'master'

Add additional parameters to onHit to disable default behaviour

See merge request OpenMW/openmw!5302

Author: Capostrophic

files/data-mw/scripts/omw/combat/local.lua

@@ -192,6 +192,9 @@ local function applyArmor(attack)
                 core.sendGlobalEvent('ModifyItemCondition', { actor = self, item = item, amount = diff })
             end
 
+            if attack.muteSound then
+                return
+            end
             if skillid == 'lightarmor' then
                 core.sound.playSound3d('Light Armor Hit', self)
             elseif skillid == 'mediumarmor' then
@@ -266,15 +269,21 @@ end
 
 local function onHit(data)
     if data.successful and not godMode() then
-        I.Combat.applyArmor(data)
-        I.Combat.adjustDamageForDifficulty(data)
+        if not data.ignoreArmor then
+            I.Combat.applyArmor(data)
+        end
+        if not data.ignoreDifficulty then
+            I.Combat.adjustDamageForDifficulty(data)
+        end
         if getDamage(data, 'health') > 0 then
-            core.sound.playSound3d('Health Damage', self)
+            if not data.muteSound then
+                core.sound.playSound3d('Health Damage', self)
+            end
             if data.hitPos then
                 I.Combat.spawnBloodEffect(data.hitPos)
             end
         end
-    elseif data.attacker and Player.objectIsInstance(data.attacker) then
+    elseif data.attacker and not data.muteSound and Player.objectIsInstance(data.attacker) then
         core.sound.playSound3d('miss', self)
     end
     Actor._onHit(self, data)

files/data/scripts/omw/combat/interface.lua

@@ -30,6 +30,9 @@ local onHitHandlers = {}
 -- @field [parent=#AttackInfo] openmw.types#Weapon weapon (Optional) Attacking weapon
 -- @field [parent=#AttackInfo] #string ammo (Optional) Ammo record ID
 -- @field [parent=#AttackInfo] openmw.util#Vector3 hitPos (Optional) Where on the victim the attack is landing. Used to spawn blood effects. Blood effects are skipped if nil.
+-- @field [parent=#AttackInfo] #boolean ignoreArmor (Optional) Whether to ignore armor.
+-- @field [parent=#AttackInfo] #boolean ignoreDifficulty (Optional) Whether to ignore difficulty scaling.
+-- @field [parent=#AttackInfo] #boolean muteSound (Optional) If true, does not play miss or damage sounds.
 return {
     --- Basic combat interface
     -- @module Combat
@@ -51,7 +54,7 @@ return {
     interface = {
         --- Interface version
         -- @field [parent=#Combat] #number version
-        version = 1,
+        version = 2,
 
         --- Add new onHit handler for this actor
         -- If `handler(attack)` returns false, other handlers for