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

Core/Gameobject: Rename GO_STATE_ACTIVE_ALTERNATIVE to GO_STATE_DESTROYED (#24062)

Browse Source 
* Step 1: Rename GO_STATE_ACTIVE_ALTERNATIVE to GO_STATE_DESTROYED

* Update src/server/shared/SharedDefines.h

Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com>

Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com>
This commit is contained in:
NoName
2020-01-19 18:51:30 +02:00
committed by Giacomo Pozzoni
parent bfac09bbcf
commit 50d9d9196d
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
View File

@@ -175,7 +175,7 @@ class instance_deadmines : public InstanceMapScript
{
if (GameObject* pIronCladDoor = instance->GetGameObject(IronCladDoorGUID))
{
pIronCladDoor->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
pIronCladDoor->SetGoState(GO_STATE_DESTROYED);
pIronCladDoor->PlayDirectSound(SOUND_DESTROYDOOR);
}
}

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

@@ -129,7 +129,7 @@ class instance_gundrak : public InstanceMapScript
go->SetGoState(MoorabiStatueState);
break;
case GO_GAL_DARAH_STATUE:
go->SetGoState(CheckRequiredBosses(DATA_GAL_DARAH) ? GO_STATE_ACTIVE_ALTERNATIVE : GO_STATE_READY);
go->SetGoState(CheckRequiredBosses(DATA_GAL_DARAH) ? GO_STATE_DESTROYED : GO_STATE_READY);
break;
case GO_DRAKKARI_COLOSSUS_STATUE:
go->SetGoState(DrakkariColossusStatueState);
@@ -204,9 +204,9 @@ class instance_gundrak : public InstanceMapScript
return false;
break;
case DATA_GAL_DARAH:
if (SladRanStatueState != GO_STATE_ACTIVE_ALTERNATIVE
|| DrakkariColossusStatueState != GO_STATE_ACTIVE_ALTERNATIVE
|| MoorabiStatueState != GO_STATE_ACTIVE_ALTERNATIVE)
if (SladRanStatueState != GO_STATE_DESTROYED
|| DrakkariColossusStatueState != GO_STATE_DESTROYED
|| MoorabiStatueState != GO_STATE_DESTROYED)
return false;
break;
default:
@@ -311,7 +311,7 @@ class instance_gundrak : public InstanceMapScript
break;
case DATA_BRIDGE:
for (uint32 type = DATA_SLAD_RAN_STATUE; type <= DATA_GAL_DARAH_STATUE; ++type)
ToggleGameObject(type, GO_STATE_ACTIVE_ALTERNATIVE);
ToggleGameObject(type, GO_STATE_DESTROYED);
ToggleGameObject(DATA_TRAPDOOR, GO_STATE_READY);
ToggleGameObject(DATA_COLLISION, GO_STATE_ACTIVE);
SaveToDB();

2
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -1064,7 +1064,7 @@ struct go_empowering_blood_orb : public GameObjectAI
{
me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
me->SetGoAnimProgress(255);
me->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
me->SetGoState(GO_STATE_DESTROYED);
if (Creature* trigger = ObjectAccessor::GetCreature(*me, _triggerGuid))
trigger->DespawnOrUnsummon();
_scheduler.Schedule(3s, [this](TaskContext /*context*/)

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

@@ -618,14 +618,14 @@ class instance_icecrown_citadel : public InstanceMapScript
case GO_SCIENTIST_AIRLOCK_DOOR_ORANGE:
PutricideGateGUIDs[0] = go->GetGUID();
if (GetBossState(DATA_FESTERGUT) == DONE && GetBossState(DATA_ROTFACE) == DONE)
go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
go->SetGoState(GO_STATE_DESTROYED);
else if (GetBossState(DATA_FESTERGUT) == DONE)
HandleGameObject(PutricideGateGUIDs[1], false, go);
break;
case GO_SCIENTIST_AIRLOCK_DOOR_GREEN:
PutricideGateGUIDs[1] = go->GetGUID();
if (GetBossState(DATA_ROTFACE) == DONE && GetBossState(DATA_FESTERGUT) == DONE)
go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
go->SetGoState(GO_STATE_DESTROYED);
else if (GetBossState(DATA_ROTFACE) == DONE)
HandleGameObject(PutricideGateGUIDs[1], false, go);
break;
@@ -942,9 +942,9 @@ class instance_icecrown_citadel : public InstanceMapScript
{
HandleGameObject(PutricideCollisionGUID, true);
if (GameObject* go = instance->GetGameObject(PutricideGateGUIDs[0]))
go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
go->SetGoState(GO_STATE_DESTROYED);
if (GameObject* go = instance->GetGameObject(PutricideGateGUIDs[1]))
go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
go->SetGoState(GO_STATE_DESTROYED);
}
else
HandleGameObject(PutricideGateGUIDs[0], false);
@@ -958,9 +958,9 @@ class instance_icecrown_citadel : public InstanceMapScript
{
HandleGameObject(PutricideCollisionGUID, true);
if (GameObject* go = instance->GetGameObject(PutricideGateGUIDs[0]))
go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
go->SetGoState(GO_STATE_DESTROYED);
if (GameObject* go = instance->GetGameObject(PutricideGateGUIDs[1]))
go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
go->SetGoState(GO_STATE_DESTROYED);
}
else
HandleGameObject(PutricideGateGUIDs[1], false);

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
View File

@@ -543,7 +543,7 @@ class boss_mimiron : public CreatureScript
break;
case EVENT_VX001_ACTIVATION_5:
if (GameObject* elevator = instance->GetGameObject(DATA_MIMIRON_ELEVATOR))
elevator->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
elevator->SetGoState(GO_STATE_DESTROYED);
if (Creature* vx001 = me->SummonCreature(NPC_VX_001, VX001SummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000))
vx001->CastSpell(vx001, SPELL_FREEZE_ANIM);
events.ScheduleEvent(EVENT_VX001_ACTIVATION_6, 19000);

4
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
View File

@@ -499,7 +499,7 @@ class instance_ulduar : public InstanceMapScript
case GO_LEVIATHAN_GATE:
LeviathanGateGUID = gameObject->GetGUID();
if (GetBossState(BOSS_LEVIATHAN) == DONE)
gameObject->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
gameObject->SetGoState(GO_STATE_DESTROYED);
break;
case GO_BRAIN_ROOM_DOOR_1:
BrainRoomDoorGUIDs[0] = gameObject->GetGUID();
@@ -1019,7 +1019,7 @@ class instance_ulduar : public InstanceMapScript
if (Creature* leviathan = GetCreature(BOSS_LEVIATHAN))
leviathan->AI()->DoAction(ACTION_MOVE_TO_CENTER_POSITION);
if (GameObject* gameObject = instance->GetGameObject(LeviathanGateGUID))
gameObject->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
gameObject->SetGoState(GO_STATE_DESTROYED);
break;
}
}