Scripts
* Introduced GetGuidData/SetGuidData to store guids in instance scripts (GetData64/SetData64 are still there) * CONDITION_INSTANCE_INFO: Changed existing DATA64 condition to GUID_DATA to preserve current use of this instance info type (most/all assume the data is a guid) and moved DATA64 to a different value - no db changes needed * Fixed compile in boss scripts starting with letter A
This commit is contained in:
1 parent
d72c4085de
commit
56f46e3ce5
223 files changed
+1255
-1249
No files matched your search
+2
-3
@@ -269,7 +269,6 @@ public:
|
||||
Initialize();
|
||||
instance = creature->GetInstanceScript();
|
||||
|
||||
MemoryGUID = 0;
|
||||
creature->SetReactState(REACT_PASSIVE);
|
||||
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
creature->RestoreFaction();
|
||||
@@ -288,7 +287,7 @@ public:
|
||||
}
|
||||
|
||||
InstanceScript* instance;
|
||||
uint64 MemoryGUID;
|
||||
ObjectGuid MemoryGUID;
|
||||
|
||||
bool bHealth;
|
||||
bool bDone;
|
||||
@@ -584,7 +583,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
Start(false, true, 0);
|
||||
Start(false, true);
|
||||
uiWaypoint = uiType;
|
||||
}
|
||||
|
||||
|
||||
+18
-18
@@ -126,9 +126,9 @@ bool GrandChampionsOutVehicle(Creature* me)
|
||||
if (!instance)
|
||||
return false;
|
||||
|
||||
Creature* pGrandChampion1 = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_1));
|
||||
Creature* pGrandChampion2 = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_2));
|
||||
Creature* pGrandChampion3 = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_3));
|
||||
Creature* pGrandChampion1 = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_GRAND_CHAMPION_1));
|
||||
Creature* pGrandChampion2 = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_GRAND_CHAMPION_2));
|
||||
Creature* pGrandChampion3 = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_GRAND_CHAMPION_3));
|
||||
|
||||
if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3)
|
||||
{
|
||||
@@ -375,11 +375,11 @@ public:
|
||||
{
|
||||
bDone = true;
|
||||
|
||||
if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
|
||||
if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_1))
|
||||
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_2))
|
||||
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_3))
|
||||
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
|
||||
|
||||
EnterEvadeMode();
|
||||
@@ -514,11 +514,11 @@ public:
|
||||
{
|
||||
bDone = true;
|
||||
|
||||
if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
|
||||
if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_1))
|
||||
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_2))
|
||||
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_3))
|
||||
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
|
||||
|
||||
instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
|
||||
@@ -663,11 +663,11 @@ public:
|
||||
{
|
||||
bDone = true;
|
||||
|
||||
if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
|
||||
if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_1))
|
||||
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_2))
|
||||
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_3))
|
||||
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
|
||||
|
||||
instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
|
||||
@@ -813,11 +813,11 @@ public:
|
||||
{
|
||||
bDone = true;
|
||||
|
||||
if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
|
||||
if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_1))
|
||||
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_2))
|
||||
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_3))
|
||||
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
|
||||
|
||||
instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
|
||||
@@ -965,11 +965,11 @@ public:
|
||||
{
|
||||
bDone = true;
|
||||
|
||||
if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
|
||||
if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_1))
|
||||
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_2))
|
||||
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
|
||||
else if (me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
|
||||
else if (me->GetGUID() == instance->GetGuidData(DATA_GRAND_CHAMPION_3))
|
||||
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
|
||||
|
||||
instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
|
||||
|
||||
+2
-2
@@ -252,7 +252,7 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64 GetData64(uint32 uiData) const override
|
||||
ObjectGuid GetGuidData(uint32 uiData) const override
|
||||
{
|
||||
switch (uiData)
|
||||
{
|
||||
@@ -267,7 +267,7 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
void SetData64(uint32 uiType, uint64 uiData) override
|
||||
void SetGuidData(uint32 uiType, ObjectGuid uiData) override
|
||||
{
|
||||
switch (uiType)
|
||||
{
|
||||
|
||||
+7
-7
@@ -138,7 +138,7 @@ public:
|
||||
break;
|
||||
case DATA_IN_POSITION: //movement done.
|
||||
me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f);
|
||||
if (GameObject* go = ObjectAccessor::GetGameObject(*me, instance->GetData64(DATA_MAIN_GATE)))
|
||||
if (GameObject* go = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(DATA_MAIN_GATE)))
|
||||
instance->HandleGameObject(go->GetGUID(), false);
|
||||
NextStep(10000, false, 3);
|
||||
break;
|
||||
@@ -234,8 +234,8 @@ public:
|
||||
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
|
||||
if (Unit* unit = pVehicle->GetPassenger(0))
|
||||
uiGrandChampionBoss1 = unit->GetGUID();
|
||||
instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID);
|
||||
instance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1);
|
||||
instance->SetGuidData(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID);
|
||||
instance->SetGuidData(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1);
|
||||
pBoss->AI()->SetData(1, 0);
|
||||
break;
|
||||
}
|
||||
@@ -246,8 +246,8 @@ public:
|
||||
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
|
||||
if (Unit* unit = pVehicle->GetPassenger(0))
|
||||
uiGrandChampionBoss2 = unit->GetGUID();
|
||||
instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID);
|
||||
instance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2);
|
||||
instance->SetGuidData(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID);
|
||||
instance->SetGuidData(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2);
|
||||
pBoss->AI()->SetData(2, 0);
|
||||
break;
|
||||
}
|
||||
@@ -258,8 +258,8 @@ public:
|
||||
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
|
||||
if (Unit* unit = pVehicle->GetPassenger(0))
|
||||
uiGrandChampionBoss3 = unit->GetGUID();
|
||||
instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID);
|
||||
instance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3);
|
||||
instance->SetGuidData(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID);
|
||||
instance->SetGuidData(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3);
|
||||
pBoss->AI()->SetData(3, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
+5
-5
@@ -346,7 +346,7 @@ class boss_anubarak_trial : public CreatureScript
|
||||
/* WORKAROUND
|
||||
* - The correct implementation is more likely the comment below but it needs spell knowledge
|
||||
*/
|
||||
std::list<uint64>::iterator i = _burrowGUID.begin();
|
||||
GuidList::iterator i = _burrowGUID.begin();
|
||||
uint32 at = urand(0, _burrowGUID.size()-1);
|
||||
for (uint32 k = 0; k < at; k++)
|
||||
++i;
|
||||
@@ -421,8 +421,8 @@ class boss_anubarak_trial : public CreatureScript
|
||||
}
|
||||
|
||||
private:
|
||||
std::list<uint64> _burrowGUID;
|
||||
uint64 _sphereGUID[6];
|
||||
GuidList _burrowGUID;
|
||||
ObjectGuid _sphereGUID[6];
|
||||
bool _intro;
|
||||
bool _reachedPhase3;
|
||||
};
|
||||
@@ -458,7 +458,7 @@ class npc_swarm_scarab : public CreatureScript
|
||||
DoCast(me, SPELL_ACID_MANDIBLE);
|
||||
me->SetInCombatWithZone();
|
||||
if (me->IsInCombat())
|
||||
if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK)))
|
||||
if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_ANUBARAK)))
|
||||
Anubarak->AI()->JustSummoned(me);
|
||||
}
|
||||
|
||||
@@ -538,7 +538,7 @@ class npc_nerubian_burrower : public CreatureScript
|
||||
DoCast(me, SPELL_AWAKENED);
|
||||
me->SetInCombatWithZone();
|
||||
if (me->IsInCombat())
|
||||
if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK)))
|
||||
if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_ANUBARAK)))
|
||||
Anubarak->AI()->JustSummoned(me);
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -565,7 +565,7 @@ struct boss_faction_championsAI : public BossAI
|
||||
|
||||
void JustReachedHome() override
|
||||
{
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetGuidData(NPC_CHAMPIONS_CONTROLLER)))
|
||||
pChampionController->AI()->SetData(2, FAIL);
|
||||
me->DespawnOrUnsummon();
|
||||
}
|
||||
@@ -615,7 +615,7 @@ struct boss_faction_championsAI : public BossAI
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
if (_aiType != AI_PET)
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetGuidData(NPC_CHAMPIONS_CONTROLLER)))
|
||||
pChampionController->AI()->SetData(2, DONE);
|
||||
}
|
||||
|
||||
@@ -623,7 +623,7 @@ struct boss_faction_championsAI : public BossAI
|
||||
{
|
||||
DoCast(me, SPELL_ANTI_AOE, true);
|
||||
_EnterCombat();
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetGuidData(NPC_CHAMPIONS_CONTROLLER)))
|
||||
pChampionController->AI()->SetData(2, IN_PROGRESS);
|
||||
}
|
||||
|
||||
@@ -640,11 +640,11 @@ struct boss_faction_championsAI : public BossAI
|
||||
|
||||
if (TeamInInstance == ALLIANCE)
|
||||
{
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_VARIAN)))
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_VARIAN)))
|
||||
temp->AI()->Talk(SAY_KILL_PLAYER);
|
||||
}
|
||||
else
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_GARROSH)))
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GARROSH)))
|
||||
temp->AI()->Talk(SAY_KILL_PLAYER);
|
||||
|
||||
|
||||
|
||||
+11
-11
@@ -171,7 +171,7 @@ class boss_gormok : public CreatureScript
|
||||
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
}
|
||||
|
||||
@@ -183,7 +183,7 @@ class boss_gormok : public CreatureScript
|
||||
switch (pointId)
|
||||
{
|
||||
case 0:
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
me->SetInCombatWithZone();
|
||||
@@ -200,7 +200,7 @@ class boss_gormok : public CreatureScript
|
||||
|
||||
void JustReachedHome() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
instance->SetData(TYPE_NORTHREND_BEASTS, FAIL);
|
||||
|
||||
me->DespawnOrUnsummon();
|
||||
@@ -378,7 +378,7 @@ class npc_snobold_vassal : public CreatureScript
|
||||
{
|
||||
if (!target->IsAlive())
|
||||
{
|
||||
Unit* gormok = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_GORMOK));
|
||||
Unit* gormok = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_GORMOK));
|
||||
if (gormok && gormok->IsAlive())
|
||||
{
|
||||
SetCombatMovement(false);
|
||||
@@ -520,7 +520,7 @@ struct boss_jormungarAI : public BossAI
|
||||
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
if (Creature* otherWorm = ObjectAccessor::GetCreature(*me, instance->GetData64(OtherWormEntry)))
|
||||
if (Creature* otherWorm = ObjectAccessor::GetCreature(*me, instance->GetGuidData(OtherWormEntry)))
|
||||
{
|
||||
if (!otherWorm->IsAlive())
|
||||
{
|
||||
@@ -753,7 +753,7 @@ class boss_dreadscale : public CreatureScript
|
||||
switch (pointId)
|
||||
{
|
||||
case 0:
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
me->SetInCombatWithZone();
|
||||
@@ -765,13 +765,13 @@ class boss_dreadscale : public CreatureScript
|
||||
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
boss_jormungarAI::EnterEvadeMode();
|
||||
}
|
||||
|
||||
void JustReachedHome() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
|
||||
boss_jormungarAI::JustReachedHome();
|
||||
}
|
||||
@@ -926,7 +926,7 @@ class boss_icehowl : public CreatureScript
|
||||
_movementFinish = true;
|
||||
break;
|
||||
case 2:
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
me->SetInCombatWithZone();
|
||||
@@ -938,13 +938,13 @@ class boss_icehowl : public CreatureScript
|
||||
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
}
|
||||
|
||||
void JustReachedHome() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
instance->SetData(TYPE_NORTHREND_BEASTS, FAIL);
|
||||
me->DespawnOrUnsummon();
|
||||
}
|
||||
|
||||
+5
-5
@@ -267,7 +267,7 @@ struct boss_twin_baseAI : public BossAI
|
||||
// Called when sister pointer needed
|
||||
Creature* GetSister()
|
||||
{
|
||||
return ObjectAccessor::GetCreature((*me), instance->GetData64(SisterNpcId));
|
||||
return ObjectAccessor::GetCreature((*me), instance->GetGuidData(SisterNpcId));
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
@@ -447,13 +447,13 @@ class boss_fjola : public CreatureScript
|
||||
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
boss_twin_baseAI::EnterEvadeMode();
|
||||
}
|
||||
|
||||
void JustReachedHome() override
|
||||
{
|
||||
instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
instance->DoUseDoorOrButton(instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
|
||||
boss_twin_baseAI::JustReachedHome();
|
||||
}
|
||||
@@ -864,7 +864,7 @@ class spell_power_of_the_twins : public SpellScriptLoader
|
||||
{
|
||||
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
|
||||
{
|
||||
if (Creature* Valk = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(GetCaster()->GetEntry())))
|
||||
if (Creature* Valk = ObjectAccessor::GetCreature(*GetCaster(), instance->GetGuidData(GetCaster()->GetEntry())))
|
||||
ENSURE_AI(boss_twin_baseAI, Valk->AI())->EnableDualWield(true);
|
||||
}
|
||||
}
|
||||
@@ -873,7 +873,7 @@ class spell_power_of_the_twins : public SpellScriptLoader
|
||||
{
|
||||
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
|
||||
{
|
||||
if (Creature* Valk = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(GetCaster()->GetEntry())))
|
||||
if (Creature* Valk = ObjectAccessor::GetCreature(*GetCaster(), instance->GetGuidData(GetCaster()->GetEntry())))
|
||||
ENSURE_AI(boss_twin_baseAI, Valk->AI())->EnableDualWield(false);
|
||||
}
|
||||
}
|
||||
|
||||
+10
-10
@@ -96,10 +96,10 @@ class instance_trial_of_the_crusader : public InstanceMapScript
|
||||
// make sure Anub'arak isnt missing and floor is destroyed after a crash
|
||||
if (GetBossState(BOSS_LICH_KING) == DONE && TrialCounter && GetBossState(BOSS_ANUBARAK) != DONE)
|
||||
{
|
||||
if (Creature* anubArak = ObjectAccessor::GetCreature(*player, GetData64(NPC_ANUBARAK)))
|
||||
if (Creature* anubArak = ObjectAccessor::GetCreature(*player, GetGuidData(NPC_ANUBARAK)))
|
||||
anubArak = player->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
|
||||
|
||||
if (GameObject* floor = ObjectAccessor::GetGameObject(*player, GetData64(GO_ARGENT_COLISEUM_FLOOR)))
|
||||
if (GameObject* floor = ObjectAccessor::GetGameObject(*player, GetGuidData(GO_ARGENT_COLISEUM_FLOOR)))
|
||||
floor->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED);
|
||||
}
|
||||
}
|
||||
@@ -355,13 +355,13 @@ class instance_trial_of_the_crusader : public InstanceMapScript
|
||||
|
||||
if (IsEncounterInProgress())
|
||||
{
|
||||
CloseDoor(GetData64(GO_EAST_PORTCULLIS));
|
||||
CloseDoor(GetData64(GO_WEB_DOOR));
|
||||
CloseDoor(GetGuidData(GO_EAST_PORTCULLIS));
|
||||
CloseDoor(GetGuidData(GO_WEB_DOOR));
|
||||
}
|
||||
else
|
||||
{
|
||||
OpenDoor(GetData64(GO_EAST_PORTCULLIS));
|
||||
OpenDoor(GetData64(GO_WEB_DOOR));
|
||||
OpenDoor(GetGuidData(GO_EAST_PORTCULLIS));
|
||||
OpenDoor(GetGuidData(GO_WEB_DOOR));
|
||||
}
|
||||
|
||||
if (type < MAX_ENCOUNTERS)
|
||||
@@ -381,10 +381,10 @@ class instance_trial_of_the_crusader : public InstanceMapScript
|
||||
// if theres no more attemps allowed
|
||||
if (!TrialCounter)
|
||||
{
|
||||
if (Unit* announcer = instance->GetCreature(GetData64(NPC_BARRENT)))
|
||||
if (Unit* announcer = instance->GetCreature(GetGuidData(NPC_BARRENT)))
|
||||
announcer->ToCreature()->DespawnOrUnsummon();
|
||||
|
||||
if (Creature* anubArak = instance->GetCreature(GetData64(NPC_ANUBARAK)))
|
||||
if (Creature* anubArak = instance->GetCreature(GetGuidData(NPC_ANUBARAK)))
|
||||
anubArak->DespawnOrUnsummon();
|
||||
}
|
||||
}
|
||||
@@ -395,7 +395,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
|
||||
|
||||
if (state == DONE || NeedSave)
|
||||
{
|
||||
if (Unit* announcer = instance->GetCreature(GetData64(NPC_BARRENT)))
|
||||
if (Unit* announcer = instance->GetCreature(GetGuidData(NPC_BARRENT)))
|
||||
announcer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
|
||||
Save();
|
||||
}
|
||||
@@ -472,7 +472,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
|
||||
}
|
||||
}
|
||||
|
||||
uint64 GetData64(uint32 type) const override
|
||||
ObjectGuid GetGuidData(uint32 type) const override
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
|
||||
+21
-21
@@ -173,7 +173,7 @@ class npc_announcer_toc10 : public CreatureScript
|
||||
else if (instance->GetBossState(BOSS_JARAXXUS) != DONE)
|
||||
{
|
||||
// if Jaraxxus is spawned, but the raid wiped
|
||||
if (Creature* jaraxxus = ObjectAccessor::GetCreature(*player, instance->GetData64(NPC_JARAXXUS)))
|
||||
if (Creature* jaraxxus = ObjectAccessor::GetCreature(*player, instance->GetGuidData(NPC_JARAXXUS)))
|
||||
{
|
||||
jaraxxus->RemoveAurasDueToSpell(SPELL_JARAXXUS_CHAINS);
|
||||
jaraxxus->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
@@ -201,13 +201,13 @@ class npc_announcer_toc10 : public CreatureScript
|
||||
}
|
||||
else if (instance->GetBossState(BOSS_LICH_KING) != DONE)
|
||||
{
|
||||
if (GameObject* floor = ObjectAccessor::GetGameObject(*player, instance->GetData64(GO_ARGENT_COLISEUM_FLOOR)))
|
||||
if (GameObject* floor = ObjectAccessor::GetGameObject(*player, instance->GetGuidData(GO_ARGENT_COLISEUM_FLOOR)))
|
||||
floor->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED);
|
||||
|
||||
creature->CastSpell(creature, SPELL_CORPSE_TELEPORT, false);
|
||||
creature->CastSpell(creature, SPELL_DESTROY_FLOOR_KNOCKUP, false);
|
||||
|
||||
Creature* anubArak = ObjectAccessor::GetCreature(*creature, instance->GetData64(NPC_ANUBARAK));
|
||||
Creature* anubArak = ObjectAccessor::GetCreature(*creature, instance->GetGuidData(NPC_ANUBARAK));
|
||||
if (!anubArak || !anubArak->IsAlive())
|
||||
anubArak = creature->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
|
||||
|
||||
@@ -318,7 +318,7 @@ class boss_lich_king_toc : public CreatureScript
|
||||
break;
|
||||
case 5080:
|
||||
{
|
||||
if (GameObject* go = ObjectAccessor::GetGameObject(*me, _instance->GetData64(GO_ARGENT_COLISEUM_FLOOR)))
|
||||
if (GameObject* go = ObjectAccessor::GetGameObject(*me, _instance->GetGuidData(GO_ARGENT_COLISEUM_FLOOR)))
|
||||
{
|
||||
go->SetDisplayId(DISPLAYID_DESTROYED_FLOOR);
|
||||
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED | GO_FLAG_NODESPAWN);
|
||||
@@ -329,7 +329,7 @@ class boss_lich_king_toc : public CreatureScript
|
||||
me->CastSpell(me, SPELL_DESTROY_FLOOR_KNOCKUP, false);
|
||||
|
||||
_instance->SetBossState(BOSS_LICH_KING, DONE);
|
||||
Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK));
|
||||
Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_ANUBARAK));
|
||||
if (!temp || !temp->IsAlive())
|
||||
temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
|
||||
|
||||
@@ -382,7 +382,7 @@ class npc_fizzlebang_toc : public CreatureScript
|
||||
{
|
||||
Talk(SAY_STAGE_1_06, killer);
|
||||
_instance->SetData(TYPE_EVENT, 1180);
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_JARAXXUS)))
|
||||
{
|
||||
temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
temp->SetReactState(REACT_AGGRESSIVE);
|
||||
@@ -406,7 +406,7 @@ class npc_fizzlebang_toc : public CreatureScript
|
||||
{
|
||||
case 1:
|
||||
me->SetWalk(false);
|
||||
_instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
_instance->DoUseDoorOrButton(_instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
_instance->SetData(TYPE_EVENT, 1120);
|
||||
_instance->SetData(TYPE_EVENT_TIMER, 1*IN_MILLISECONDS);
|
||||
break;
|
||||
@@ -489,7 +489,7 @@ class npc_fizzlebang_toc : public CreatureScript
|
||||
_updateTimer = 5*IN_MILLISECONDS;
|
||||
break;
|
||||
case 1142:
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_JARAXXUS)))
|
||||
temp->SetTarget(me->GetGUID());
|
||||
if (Creature* pTrigger = ObjectAccessor::GetCreature(*me, _triggerGUID))
|
||||
pTrigger->DespawnOrUnsummon();
|
||||
@@ -499,13 +499,13 @@ class npc_fizzlebang_toc : public CreatureScript
|
||||
_updateTimer = 10*IN_MILLISECONDS;
|
||||
break;
|
||||
case 1144:
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_JARAXXUS)))
|
||||
temp->AI()->Talk(SAY_STAGE_1_05);
|
||||
_instance->SetData(TYPE_EVENT, 1150);
|
||||
_updateTimer = 5*IN_MILLISECONDS;
|
||||
break;
|
||||
case 1150:
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
|
||||
if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(NPC_JARAXXUS)))
|
||||
{
|
||||
//1-shot Fizzlebang
|
||||
temp->CastSpell(me, 67888, false);
|
||||
@@ -581,7 +581,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
|
||||
if (_instance->GetBossState(BOSS_BEASTS) != DONE)
|
||||
{
|
||||
_instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
_instance->DoUseDoorOrButton(_instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
|
||||
if (Creature* temp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS))
|
||||
{
|
||||
@@ -603,7 +603,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
Talk(SAY_STAGE_0_04);
|
||||
if (_instance->GetBossState(BOSS_BEASTS) != DONE)
|
||||
{
|
||||
_instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
_instance->DoUseDoorOrButton(_instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
if (Creature* temp = me->SummonCreature(NPC_DREADSCALE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN))
|
||||
{
|
||||
temp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ());
|
||||
@@ -621,7 +621,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
Talk(SAY_STAGE_0_05);
|
||||
if (_instance->GetBossState(BOSS_BEASTS) != DONE)
|
||||
{
|
||||
_instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
_instance->DoUseDoorOrButton(_instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
if (Creature* temp = me->SummonCreature(NPC_ICEHOWL, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_DEAD_DESPAWN))
|
||||
{
|
||||
temp->GetMotionMaster()->MovePoint(2, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ());
|
||||
@@ -649,7 +649,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
case 1010:
|
||||
Talk(SAY_STAGE_1_01);
|
||||
_updateTimer = 7*IN_MILLISECONDS;
|
||||
_instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
_instance->DoUseDoorOrButton(_instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
me->SummonCreature(NPC_FIZZLEBANG, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 2, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
|
||||
_instance->SetData(TYPE_EVENT, 0);
|
||||
break;
|
||||
@@ -703,7 +703,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
_instance->SetData(TYPE_EVENT, 3092);
|
||||
break;
|
||||
case 3092:
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
|
||||
if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), _instance->GetGuidData(NPC_CHAMPIONS_CONTROLLER)))
|
||||
pChampionController->AI()->SetData(1, NOT_STARTED);
|
||||
_instance->SetData(TYPE_EVENT, 3095);
|
||||
break;
|
||||
@@ -738,13 +738,13 @@ class npc_tirion_toc : public CreatureScript
|
||||
_instance->SetData(TYPE_EVENT, 4015);
|
||||
break;
|
||||
case 4015:
|
||||
_instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
if (Creature* temp = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_LIGHTBANE)))
|
||||
_instance->DoUseDoorOrButton(_instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
if (Creature* temp = ObjectAccessor::GetCreature((*me), _instance->GetGuidData(NPC_LIGHTBANE)))
|
||||
{
|
||||
temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ());
|
||||
temp->SetVisible(true);
|
||||
}
|
||||
if (Creature* temp = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_DARKBANE)))
|
||||
if (Creature* temp = ObjectAccessor::GetCreature((*me), _instance->GetGuidData(NPC_DARKBANE)))
|
||||
{
|
||||
temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ());
|
||||
temp->SetVisible(true);
|
||||
@@ -753,7 +753,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
_instance->SetData(TYPE_EVENT, 4016);
|
||||
break;
|
||||
case 4016:
|
||||
_instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
|
||||
_instance->DoUseDoorOrButton(_instance->GetGuidData(GO_MAIN_GATE_DOOR));
|
||||
_instance->SetData(TYPE_EVENT, 4017);
|
||||
break;
|
||||
case 4040:
|
||||
@@ -783,7 +783,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
_instance->SetData(TYPE_EVENT, 6005);
|
||||
break;
|
||||
case 6005:
|
||||
if (Creature* tirionFordring = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_TIRION_FORDRING)))
|
||||
if (Creature* tirionFordring = ObjectAccessor::GetCreature((*me), _instance->GetGuidData(NPC_TIRION_FORDRING)))
|
||||
tirionFordring->AI()->Talk(SAY_STAGE_4_06);
|
||||
_updateTimer = 20*IN_MILLISECONDS;
|
||||
_instance->SetData(TYPE_EVENT, 6010);
|
||||
@@ -791,7 +791,7 @@ class npc_tirion_toc : public CreatureScript
|
||||
case 6010:
|
||||
if (IsHeroic())
|
||||
{
|
||||
if (Creature* tirionFordring = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_TIRION_FORDRING)))
|
||||
if (Creature* tirionFordring = ObjectAccessor::GetCreature((*me), _instance->GetGuidData(NPC_TIRION_FORDRING)))
|
||||
tirionFordring->AI()->Talk(SAY_STAGE_4_07);
|
||||
_updateTimer = 1*MINUTE*IN_MILLISECONDS;
|
||||
_instance->SetBossState(BOSS_ANUBARAK, SPECIAL);
|
||||
|
||||
Reference in new issue
Block a user