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

Clean up MonkSpecialAttack too

Browse Source
This commit is contained in:
Michael Cook (mackal) 2017-01-15 22:54:50 -05:00
parent b92d6c57a1
commit 0d84a73e9f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zone/special_attacks.cpp
View File

@ -476,27 +476,24 @@ int Mob::MonkSpecialAttack(Mob *other, uint8 unchecked_type)
if (IsClient()) { if (IsClient()) {
if (GetWeaponDamage(other, CastToClient()->GetInv().GetItem(itemslot)) <= 0) { if (GetWeaponDamage(other, CastToClient()->GetInv().GetItem(itemslot)) <= 0) {
ndamage = -5; max_dmg = -5;
} }
} else { } else {
if (GetWeaponDamage(other, (const EQEmu::ItemData *)nullptr) <= 0) { if (GetWeaponDamage(other, (const EQEmu::ItemData *)nullptr) <= 0) {
ndamage = -5; max_dmg = -5;
} }
} }
int32 ht = 0; int32 ht = 0;
if (ndamage == 0) { if (max_dmg > 0)
ht = max_dmg; ht = max_dmg;
if (other->CheckHitChance(this, skill_type, 0))
ndamage = max_dmg;
}
// This can potentially stack with changes to kick damage // This can potentially stack with changes to kick damage
ht = ndamage = mod_monk_special_damage(ndamage, skill_type); 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) { void Mob::TryBackstab(Mob *other, int ReuseTime) {