From 23960b9c776b977516e2b857e91287852be06210 Mon Sep 17 00:00:00 2001 From: nytmyr <53322305+nytmyr@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:47:04 -0600 Subject: [PATCH] Cleanup CanThisClassTripleAttack --- zone/mob.cpp | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/zone/mob.cpp b/zone/mob.cpp index 6531ce478..ed2276cf7 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -4663,30 +4663,22 @@ bool Mob::CanThisClassDoubleAttack(void) const } } -bool Mob::CanThisClassTripleAttack() const -{ +bool Mob::CanThisClassTripleAttack() const { if (!IsOfClientBot()) { - return false; // When they added the real triple attack skill, mobs lost the ability to triple - } else { - if (RuleB(Combat, ClassicTripleAttack)) { - return ( - GetLevel() >= 60 && - ( - GetClass() == Class::Warrior || - GetClass() == Class::Ranger || - GetClass() == Class::Monk || - GetClass() == Class::Berserker - ) - ); - } else { - if (IsClient()) { - return CastToClient()->HasSkill(EQ::skills::SkillTripleAttack); - } - else { - return GetSkill(EQ::skills::SkillTripleAttack) > 0; - } - } + return false; // Mobs lost the ability to triple attack when the real skill was added } + + if (RuleB(Combat, ClassicTripleAttack)) { + return GetLevel() >= 60 && ( + GetClass() == Class::Warrior || + GetClass() == Class::Ranger || + GetClass() == Class::Monk || + GetClass() == Class::Berserker + ); + } + + return IsClient() ? CastToClient()->HasSkill(EQ::skills::SkillTripleAttack) + : GetSkill(EQ::skills::SkillTripleAttack) > 0; } bool Mob::CanThisClassParry(void) const