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

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

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

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

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

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

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:

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