From b0ca98fd14b6d42863298467bd359b9e0f4bada5 Mon Sep 17 00:00:00 2001 From: Gildor Date: Sat, 16 Nov 2024 20:20:38 +0100 Subject: Scripts/ForgeOfSouls: Ensure that Bronjahm teleport is executed when entering the second phase (#30428) --- .../FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 75b55d566d5..04098b968b7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -50,11 +50,12 @@ enum Spells enum Events { - EVENT_MAGIC_BANE = 1, - EVENT_SHADOW_BOLT = 2, - EVENT_CORRUPT_SOUL = 3, - EVENT_SOULSTORM = 4, - EVENT_FEAR = 5 + EVENT_MAGIC_BANE = 1, + EVENT_SHADOW_BOLT, + EVENT_CORRUPT_SOUL, + EVENT_SOULSTORM, + EVENT_FEAR, + EVENT_TELEPORT }; enum CombatPhases @@ -114,9 +115,7 @@ struct boss_bronjahm : public BossAI if (events.IsInPhase(PHASE_1) && !HealthAbovePct(30)) { events.SetPhase(PHASE_2); - DoCast(me, SPELL_TELEPORT); - events.ScheduleEvent(EVENT_FEAR, 12s, 16s, 0, PHASE_2); - events.ScheduleEvent(EVENT_SOULSTORM, 100ms, 0, PHASE_2); + events.ScheduleEvent(EVENT_TELEPORT, 1ms, 0, PHASE_2); } } @@ -196,6 +195,11 @@ struct boss_bronjahm : public BossAI me->CastSpell(nullptr, SPELL_FEAR, { SPELLVALUE_MAX_TARGETS, 1 }); events.ScheduleEvent(EVENT_FEAR, 8s, 12s, 0, PHASE_2); break; + case EVENT_TELEPORT: + DoCastSelf(SPELL_TELEPORT); + events.ScheduleEvent(EVENT_FEAR, 12s, 16s, 0, PHASE_2); + events.ScheduleEvent(EVENT_SOULSTORM, 100ms, 0, PHASE_2); + break; default: break; } -- cgit v1.2.3