nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 18:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Instance): InstanceScript: create Remove functions (#17702)

Browse Source 
InstanceScript: create `Remove` helper functions
This commit is contained in:
KJack
2023-11-14 06:13:28 -05:00
committed by GitHub
parent 2e4ad36d20
commit 3d20f8902b
16 changed files with 77 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
View File

@@ -176,7 +176,7 @@ public:
creature->AI()->Talk(SAY_FINKLE_GANG);
break;
case NPC_CHROMATIC_ELITE_GUARD:
AddMinion(creature, true);
AddMinion(creature);
break;
}
}

6
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
View File

@@ -111,7 +111,7 @@ public:
case NPC_FLAMEWALKER_HEALER:
case NPC_FLAMEWALKER_ELITE:
{
AddMinion(creature, true);
AddMinion(creature);
break;
}
}
@@ -123,7 +123,7 @@ public:
{
case NPC_FIRESWORN:
{
AddMinion(creature, false);
RemoveMinion(creature);
break;
}
case NPC_FLAMEWALKER:
@@ -132,7 +132,7 @@ public:
case NPC_FLAMEWALKER_HEALER:
case NPC_FLAMEWALKER_ELITE:
{
AddMinion(creature, false);
RemoveMinion(creature);
break;
}
}

4
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
View File

@@ -154,7 +154,7 @@ public:
case GO_FIRE_BARRIER:
case GO_MURUS_GATE_1:
case GO_MURUS_GATE_2:
AddDoor(go, true);
AddDoor(go);
break;
case GO_ICE_BARRIER:
IceBarrierGUID = go->GetGUID();
@@ -187,7 +187,7 @@ public:
case GO_BOSS_COLLISION_1:
case GO_BOSS_COLLISION_2:
case GO_FORCE_FIELD:
AddDoor(go, false);
RemoveDoor(go);
break;
default:
break;

4
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
View File

@@ -87,7 +87,7 @@ public:
case GO_ANUBARAK_DOORS1:
case GO_ANUBARAK_DOORS2:
case GO_ANUBARAK_DOORS3:
AddDoor(go, true);
AddDoor(go);
break;
}
}
@@ -100,7 +100,7 @@ public:
case GO_ANUBARAK_DOORS1:
case GO_ANUBARAK_DOORS2:
case GO_ANUBARAK_DOORS3:
AddDoor(go, false);
RemoveDoor(go);
break;
}
}

4
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
View File

@@ -125,7 +125,7 @@ public:
case GO_BURNING_TREE_3:
case GO_BURNING_TREE_4:
case GO_TWILIGHT_FLAME_RING:
AddDoor(go, true);
AddDoor(go);
break;
case GO_FLAME_RING:
FlameRingGUID = go->GetGUID();
@@ -143,7 +143,7 @@ public:
case GO_BURNING_TREE_2:
case GO_BURNING_TREE_3:
case GO_BURNING_TREE_4:
AddDoor(go, false);
RemoveDoor(go);
break;
}
}

4
src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
View File

@@ -50,7 +50,7 @@ public:
case GO_NOVOS_CRYSTAL_2:
case GO_NOVOS_CRYSTAL_3:
case GO_NOVOS_CRYSTAL_4:
AddDoor(go, true);
AddDoor(go);
break;
}
}
@@ -63,7 +63,7 @@ public:
case GO_NOVOS_CRYSTAL_2:
case GO_NOVOS_CRYSTAL_3:
case GO_NOVOS_CRYSTAL_4:
AddDoor(go, false);
RemoveDoor(go);
break;
}
}

4
src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
View File

@@ -107,7 +107,7 @@ public:
case GO_GAL_DARAH_DOORS0:
case GO_GAL_DARAH_DOORS1:
case GO_GAL_DARAH_DOORS2:
AddDoor(gameobject, true);
AddDoor(gameobject);
break;
}
}
@@ -121,7 +121,7 @@ public:
case GO_GAL_DARAH_DOORS0:
case GO_GAL_DARAH_DOORS1:
case GO_GAL_DARAH_DOORS2:
AddDoor(gameobject, false);
RemoveDoor(gameobject);
break;
}
}

10
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -727,7 +727,7 @@ public:
case GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR:
case GO_ICE_WALL:
case GO_SINDRAGOSA_ENTRANCE_DOOR:
AddDoor(go, true);
AddDoor(go);
break;
case GO_SCIENTIST_ENTRANCE:
PutricideEnteranceDoorGUID = go->GetGUID();
@@ -737,7 +737,7 @@ public:
case GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_01:
case GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_04:
if (instance->Is25ManRaid())
AddDoor(go, true);
AddDoor(go);
break;
case GO_LADY_DEATHWHISPER_ELEVATOR:
LadyDeathwisperElevatorGUID = go->GetGUID();
@@ -758,7 +758,7 @@ public:
break;
case GO_SAURFANG_S_DOOR:
DeathbringerSaurfangDoorGUID = go->GetGUID();
AddDoor(go, true);
AddDoor(go);
break;
case GO_DEATHBRINGER_S_CACHE_10N:
case GO_DEATHBRINGER_S_CACHE_25N:
@@ -873,7 +873,7 @@ public:
go->SetRespawnTime(7 * DAY);
break;
case GO_SCOURGE_TRANSPORTER_FIRST:
AddDoor(go, true);
AddDoor(go);
ScourgeTransporterFirstGUID = go->GetGUID();
if (GetBossState(DATA_LORD_MARROWGAR) == DONE)
go->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
@@ -911,7 +911,7 @@ public:
case GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR:
case GO_ICE_WALL:
case GO_SCOURGE_TRANSPORTER_FIRST:
AddDoor(go, false);
RemoveDoor(go);
break;
case GO_THE_SKYBREAKER_A:
case GO_ORGRIMS_HAMMER_H:

8
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
View File

@@ -93,17 +93,17 @@ public:
case GO_TELESTRA_SPHERE:
if (GetBossState(DATA_TELESTRA_ORB) != DONE && GetBossState(DATA_MAGUS_TELESTRA_EVENT) == DONE)
gameObject->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
AddDoor(gameObject, true);
AddDoor(gameObject);
break;
case GO_ANOMALUS_SPHERE:
if (GetBossState(DATA_ANOMALUS_ORB) != DONE && GetBossState(DATA_ANOMALUS_EVENT) == DONE)
gameObject->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
AddDoor(gameObject, true);
AddDoor(gameObject);
break;
case GO_ORMOROK_SPHERE:
if (GetBossState(DATA_ORMOROK_ORB) != DONE && GetBossState(DATA_ORMOROK_EVENT) == DONE)
gameObject->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
AddDoor(gameObject, true);
AddDoor(gameObject);
break;
}
}
@@ -115,7 +115,7 @@ public:
case GO_TELESTRA_SPHERE:
case GO_ANOMALUS_SPHERE:
case GO_ORMOROK_SPHERE:
AddDoor(gameObject, false);
RemoveDoor(gameObject);
break;
}
}

4
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
View File

@@ -156,7 +156,7 @@ public:
case GO_ILLIDAN_GATE:
case GO_ILLIDAN_DOOR_R:
case GO_ILLIDAN_DOOR_L:
AddDoor(go, true);
AddDoor(go);
break;
}
}
@@ -178,7 +178,7 @@ public:
case GO_ILLIDAN_GATE:
case GO_ILLIDAN_DOOR_R:
case GO_ILLIDAN_DOOR_L:
AddDoor(go, false);
RemoveDoor(go);
break;
}
}

4
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
View File

@@ -86,7 +86,7 @@ public:
case GO_COILFANG_BRIDGE1:
case GO_COILFANG_BRIDGE2:
case GO_COILFANG_BRIDGE3:
AddDoor(go, true);
AddDoor(go);
break;
case GO_SHIELD_GENERATOR1:
case GO_SHIELD_GENERATOR2:
@@ -105,7 +105,7 @@ public:
case GO_COILFANG_BRIDGE1:
case GO_COILFANG_BRIDGE2:
case GO_COILFANG_BRIDGE3:
AddDoor(go, false);
RemoveDoor(go);
break;
}
}

8
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
View File

@@ -66,7 +66,7 @@ public:
_magtheridonGUID = creature->GetGUID();
break;
case NPC_HELLFIRE_CHANNELER:
AddMinion(creature, true);
AddMinion(creature);
break;
case NPC_HELLFIRE_WARDER:
_wardersSet.insert(creature->GetGUID());
@@ -79,7 +79,7 @@ public:
switch (creature->GetEntry())
{
case NPC_HELLFIRE_CHANNELER:
AddMinion(creature, false);
RemoveMinion(creature);
break;
}
}
@@ -89,7 +89,7 @@ public:
switch (go->GetEntry())
{
case GO_MAGTHERIDON_DOORS:
AddDoor(go, true);
AddDoor(go);
break;
case GO_MANTICRON_CUBE:
_cubesSet.insert(go->GetGUID());
@@ -111,7 +111,7 @@ public:
switch (go->GetEntry())
{
case GO_MAGTHERIDON_DOORS:
AddDoor(go, false);
RemoveDoor(go);
break;
case GO_MANTICRON_CUBE:
_cubesSet.erase(go->GetGUID());

4
src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
View File

@@ -50,7 +50,7 @@ public:
case GO_DOOR_MOARG_1:
case GO_DOOR_MOARG_2:
case GO_DOOR_NETHERMANCER:
AddDoor(gameObject, true);
AddDoor(gameObject);
break;
default:
break;
@@ -64,7 +64,7 @@ public:
case GO_DOOR_MOARG_1:
case GO_DOOR_MOARG_2:
case GO_DOOR_NETHERMANCER:
AddDoor(gameObject, false);
RemoveDoor(gameObject);
break;
default:
break;

2
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
View File

@@ -55,7 +55,7 @@ public:
{
case GO_CONTAINMENT_CORE_SECURITY_FIELD_ALPHA:
case GO_CONTAINMENT_CORE_SECURITY_FIELD_BETA:
AddDoor(go, true);
AddDoor(go);
break;
case GO_STASIS_POD_ALPHA:
StasisPodGUIDs[0] = go->GetGUID();