Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 17:08:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Halls of Reflection: Prevent repeating Falric kills after wiping on Marwyn or add waves > 5

Browse Source
This commit is contained in:
Shauren
2022-09-27 16:17:43 +02:00
parent d6b5490513
commit 7114bc6881
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
View File

@@ -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)))
{

4
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
View File

@@ -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;