From 0d84a73e9f8acfa81eaaee7c08cabc89197ef051 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sun, 15 Jan 2017 22:54:50 -0500 Subject: [PATCH] Clean up MonkSpecialAttack too --- zone/special_attacks.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index a9fcf82b1..929c272d9 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -476,27 +476,24 @@ int Mob::MonkSpecialAttack(Mob *other, uint8 unchecked_type) if (IsClient()) { if (GetWeaponDamage(other, CastToClient()->GetInv().GetItem(itemslot)) <= 0) { - ndamage = -5; + max_dmg = -5; } } else { if (GetWeaponDamage(other, (const EQEmu::ItemData *)nullptr) <= 0) { - ndamage = -5; + max_dmg = -5; } } int32 ht = 0; - if (ndamage == 0) { + if (max_dmg > 0) ht = max_dmg; - if (other->CheckHitChance(this, skill_type, 0)) - ndamage = max_dmg; - } // This can potentially stack with changes to kick damage ht = ndamage = mod_monk_special_damage(ndamage, skill_type); - DoSpecialAttackDamage(other, skill_type, ndamage, min_dmg, ht, reuse); + DoSpecialAttackDamage(other, skill_type, max_dmg, min_dmg, ht, reuse, true); - return (reuse); + return reuse; } void Mob::TryBackstab(Mob *other, int ReuseTime) {