diff --git a/utils/mods/legacy_combat.lua b/utils/mods/legacy_combat.lua index 7c2c8ac3c..a07019a95 100644 --- a/utils/mods/legacy_combat.lua +++ b/utils/mods/legacy_combat.lua @@ -874,8 +874,27 @@ end -- Source Function: Mob::CommonOutgoingHitSuccess() function CommonOutgoingHitSuccess(e) - e = ApplyMeleeDamageBonus(e); + e = ApplyMeleeDamageBonus(e); + + eq.debug( + string.format("[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] Post ApplyMeleeDamageBonus", + e.self:GetCleanName(), + e.hit.damage_done + ) + ); + 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)); + + eq.debug( + string.format("[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] SkillDmgTaken [%i] SkillDmgtAmt [%i] FcDmgAmtIncoming [%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 = TryCriticalHit(e); e.self:CheckNumHitsRemaining(5, -1, 65535); e.IgnoreDefault = true; diff --git a/zone/attack.cpp b/zone/attack.cpp index ffeb756f8..5659a1f0f 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4515,7 +4515,28 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, int32 &damage, EQEmu::skills:: return; ApplyMeleeDamageBonus(skillInUse, damage, opts); + + Log.Out( + Logs::General, + Logs::Combat, + "[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] Post ApplyMeleeDamageBonus", + GetCleanName(), + damage + ); + damage += (damage * defender->GetSkillDmgTaken(skillInUse, opts) / 100) + (GetSkillDmgAmt(skillInUse) + defender->GetFcDamageAmtIncoming(this, 0, true, skillInUse)); + + Log.Out( + Logs::General, + Logs::Combat, + "[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] SkillDmgTaken [%i] SkillDmgtAmt [%i] FcDmgAmtIncoming [%i] Post DmgCalcs", + GetCleanName(), + damage, + defender->GetSkillDmgTaken(skillInUse, opts), + GetSkillDmgAmt(skillInUse), + defender->GetFcDamageAmtIncoming(this, 0, true, skillInUse) + ); + TryCriticalHit(defender, skillInUse, damage,opts); CheckNumHitsRemaining(NumHit::OutgoingHitSuccess); }