From cba95851a2661af2b6f13f3f85b9af84e8d63acd Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sat, 29 Jan 2022 17:47:35 -0800 Subject: [PATCH] [Combat] Legacy Combat Middleware Affected by PR #1858 (#1939) --- utils/mods/legacy_combat.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/mods/legacy_combat.lua b/utils/mods/legacy_combat.lua index c04644a8d..6a031ec86 100644 --- a/utils/mods/legacy_combat.lua +++ b/utils/mods/legacy_combat.lua @@ -962,15 +962,14 @@ function CommonOutgoingHitSuccess(e) ) ); - e.hit.damage_done = e.hit.damage_done + (e.hit.damage_done * e.other:GetSkillDmgTaken(e.hit.skill) / 100) + (e.self:GetSkillDmgAmt(e.hit.skill) + e.other:GetFcDamageAmtIncoming(e.self, 0, true, e.hit.skill)); + e.hit.damage_done = e.hit.damage_done + (e.hit.damage_done * e.other:GetSkillDmgTaken(e.hit.skill) / 100) + e.self:GetSkillDmgAmt(e.hit.skill); eq.log_combat( - string.format("[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] SkillDmgTaken [%i] SkillDmgtAmt [%i] FcDmgAmtIncoming [%i] Post DmgCalcs", + string.format("[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] SkillDmgTaken [%i] SkillDmgtAmt [%i] Post DmgCalcs", e.self:GetCleanName(), e.hit.damage_done, e.other:GetSkillDmgTaken(e.hit.skill), - e.self:GetSkillDmgAmt(e.hit.skill), - e.other:GetFcDamageAmtIncoming(e.self, 0, true, e.hit.skill) + e.self:GetSkillDmgAmt(e.hit.skill) ) ); @@ -997,4 +996,4 @@ function ApplyMeleeDamageBonus(e) e.hit.damage_done = e.hit.damage_done + (e.hit.damage_done * dmgbonusmod / 100); return e; -end \ No newline at end of file +end