From 93394e0edc0d5787a00f18439a5a2982e05cb099 Mon Sep 17 00:00:00 2001 From: Brian Kinney Date: Wed, 6 Feb 2019 21:52:59 -0500 Subject: [PATCH 1/2] Reference the defender melee mitigation, not attacker --- zone/attack.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index 483cce368..d789639f0 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4514,7 +4514,9 @@ void Mob::ApplyMeleeDamageMods(uint16 skill, int &damage, Mob *defender, ExtraAt if (defender->IsClient() && defender->GetClass() == WARRIOR) dmgbonusmod -= 5; // 168 defensive - dmgbonusmod += (defender->spellbonuses.MeleeMitigationEffect + itembonuses.MeleeMitigationEffect + aabonuses.MeleeMitigationEffect); + dmgbonusmod -= (defender->spellbonuses.MeleeMitigationEffect + + defender->itembonuses.MeleeMitigationEffect + + defender->aabonuses.MeleeMitigationEffect); } damage += damage * dmgbonusmod / 100; From 1d0b00caf788e1cff8e30e43ba02c47b8b6e1d3d Mon Sep 17 00:00:00 2001 From: Brian Kinney Date: Wed, 6 Feb 2019 23:54:38 -0500 Subject: [PATCH 2/2] Raw numbers are negative so adding is correct --- zone/attack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index d789639f0..a51cd3163 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4514,7 +4514,7 @@ void Mob::ApplyMeleeDamageMods(uint16 skill, int &damage, Mob *defender, ExtraAt if (defender->IsClient() && defender->GetClass() == WARRIOR) dmgbonusmod -= 5; // 168 defensive - dmgbonusmod -= (defender->spellbonuses.MeleeMitigationEffect + + dmgbonusmod += (defender->spellbonuses.MeleeMitigationEffect + defender->itembonuses.MeleeMitigationEffect + defender->aabonuses.MeleeMitigationEffect); }