pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Combat] Legacy Combat Middleware Affected by PR #1858 (#1939)

Browse Source
This commit is contained in:
Chris Miles 2022-01-29 17:47:35 -08:00 committed by GitHub
parent 7f5706abcf
commit cba95851a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/mods/legacy_combat.lua
View File

@ -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( 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.self:GetCleanName(),
e.hit.damage_done, e.hit.damage_done,
e.other:GetSkillDmgTaken(e.hit.skill), e.other:GetSkillDmgTaken(e.hit.skill),
e.self:GetSkillDmgAmt(e.hit.skill), e.self:GetSkillDmgAmt(e.hit.skill)
e.other:GetFcDamageAmtIncoming(e.self, 0, true, e.hit.skill)
) )
); );
@ -997,4 +996,4 @@ function ApplyMeleeDamageBonus(e)
e.hit.damage_done = e.hit.damage_done + (e.hit.damage_done * dmgbonusmod / 100); e.hit.damage_done = e.hit.damage_done + (e.hit.damage_done * dmgbonusmod / 100);
return e; return e;
end end