From e41080468f8c79199ce4aed5aa613886b8365e4a Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Thu, 4 Jul 2024 08:26:23 -0400 Subject: [PATCH] fix(Scripts/TheEye): Kael'thas adjustments. (#19213) * Init. * Update advisor phase timer. --- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index b1f07c880..cce6acefd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -392,34 +392,14 @@ struct boss_kaelthas : public BossAI } } }); - scheduler.Schedule(2min, GROUP_PROGRESS_PHASE, [this](TaskContext) + scheduler.Schedule(90s, GROUP_PROGRESS_PHASE, [this](TaskContext) { PhaseAllAdvisorsExecute(); }); }, EVENT_PREFIGHT_PHASE52); break; case ACTION_PROGRESS_PHASE_CHECK: - if (_phase == PHASE_WEAPONS) - { - bool aliveWeapon = false; - summons.DoForAllSummons([&aliveWeapon](WorldObject* summon) - { - if (Creature* summonedCreature = summon->ToCreature()) - { - if (summonedCreature->IsAlive()) - { - if (summonedCreature->GetEntry() >= NPC_NETHERSTRAND_LONGBOW && summonedCreature->GetEntry() <= NPC_STAFF_OF_DISINTEGRATION) - { - aliveWeapon = true; - return; - } - } - } - }); - if (!aliveWeapon) - PhaseAllAdvisorsExecute(); - } - else if (_phase == PHASE_ALL_ADVISORS) + if (_phase == PHASE_ALL_ADVISORS) { bool advisorAlive = false; summons.DoForAllSummons([&advisorAlive](WorldObject* summon)