Merge pull request #4614 from kelppo/automaton-fix

Pass wsID to xi.weaponskills.takeWeaponskillDamage()
LandSandBoat · Oct 24, 2023 · 15f1d32 · 15f1d32
2 parents 8e6050d + 5afa98f
commit 15f1d32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/scripts/actions/weaponskills/atonement.lua b/scripts/actions/weaponskills/atonement.lua
@@ -45,6 +45,7 @@ weaponskillObject.onUseWeaponSkill = function(player, target, wsID, tp, primary,
     }
     local calcParams =
     {
+        wsID = wsID,
         criticalHit = false,
         tpHitsLanded = 0,
         extraHitsLanded = 0,

diff --git a/scripts/globals/automatonweaponskills.lua b/scripts/globals/automatonweaponskills.lua
@@ -190,6 +190,7 @@ xi.autows.doAutoPhysicalWeaponskill = function(attacker, target, wsID, tp, prima
     }
 
     local calcParams = {}
+    calcParams.wsID = wsID
     calcParams.weaponDamage = xi.weaponskills.getMeleeDmg(attacker, attack.weaponType, wsParams.kick)
     calcParams.attackInfo = attack
     calcParams.fSTR = utils.clamp(attacker:getStat(xi.mod.STR) - target:getStat(xi.mod.VIT), -10, 10)
@@ -282,6 +283,7 @@ xi.autows.doAutoRangedWeaponskill = function(attacker, target, wsID, wsParams, t
 
     local calcParams =
     {
+        wsID = wsID,
         weaponDamage = { wsParams.weaponDamage or rangedDamage },
         attackInfo = attack,
         fSTR = utils.clamp(attacker:getStat(xi.mod.STR) - target:getStat(xi.mod.VIT), -10, 10),