diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-09-27 16:17:43 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-09-27 16:17:43 +0200 |
| commit | 7114bc6881701798fa32947d8275686dcd258d19 (patch) | |
| tree | aca3526f7c3bcb418a909b73280a33a47c6ceccd /src | |
| parent | d6b54905139623cf0e8271e07fb0ec14e23f60d6 (diff) | |
Scripts/Halls of Reflection: Prevent repeating Falric kills after wiping on Marwyn or add waves > 5
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index cc493bcf086..0d1b6b11020 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -712,7 +712,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript case EVENT_INTRO_LK_9: if (Creature* falric = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FALRIC))) falric->AI()->Talk(SAY_FALRIC_INTRO_2); - _instance->ProcessEvent(0, EVENT_SPAWN_WAVES); + _instance->ProcessEvent(nullptr, EVENT_SPAWN_WAVES); _events.ScheduleEvent(EVENT_INTRO_LK_10, 4s); break; case EVENT_INTRO_LK_10: @@ -2076,7 +2076,7 @@ class at_hor_waves_restarter : public AreaTriggerScript if (_instance->GetData(DATA_INTRO_EVENT) == DONE && _instance->GetBossState(DATA_MARWYN) != DONE) { - _instance->ProcessEvent(0, EVENT_SPAWN_WAVES); + _instance->ProcessEvent(nullptr, EVENT_SPAWN_WAVES); if (Creature* falric = ObjectAccessor::GetCreature(*player, _instance->GetGuidData(DATA_FALRIC))) { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index a623bde0876..a6301396b1f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -535,7 +535,7 @@ class instance_halls_of_reflection : public InstanceMapScript { // spawning all wave npcs at once case EVENT_SPAWN_WAVES: - _waveCount = 1; + _waveCount = GetBossState(DATA_FALRIC) == DONE ? 6 : 1; DoUpdateWorldState(WORLD_STATE_HOR_WAVES_ENABLED, 1); DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, _waveCount); { @@ -549,7 +549,7 @@ class instance_halls_of_reflection : public InstanceMapScript possibilityList.push_back(NPC_WAVE_MAGE); // iterate each wave - for (uint8 i = 0; i < 8; ++i) + for (uint8 i = GetBossState(DATA_FALRIC) == DONE ? 4 : 0; i < 8; ++i) { tempList = possibilityList; |