Scripts/Misc: fixed instance teleporter for Throne of the Tides, The Stonecore and Blackrock Caverns

This commit is contained in:
Ovahlord committed 2020-07-14 16:42:30 +02:00
1 parent f79a5a6938
commit 66069bcef1
8 files changed
+165 -39

No files matched your search

@@ -41,11 +41,16 @@ ObjectData const creatureData[] =
{ BOSS_SLABHIDE, DATA_SLABHIDE },
{ BOSS_OZRUK, DATA_OZRUK, },
{ BOSS_HIGH_PRIESTESS_AZIL, DATA_HIGH_PRIESTESS_AZIL },
{ NPC_STONECORE_TELEPORTER, DATA_STONECORE_TELEPORTER },
{ NPC_STONECORE_TELEPORTER_1, DATA_STONECORE_TELEPORTER_1 },
{ NPC_STONECORE_TELEPORTER_2, DATA_STONECORE_TELEPORTER_2 },
{ 0, 0 } // END
};
enum Spells
{
SPELL_TELEPORTER_ACTIVE_VISUAL = 95298
};
class instance_stonecore : public InstanceMapScript
{
public:
@@ -111,10 +116,13 @@ class instance_stonecore : public InstanceMapScript
{
switch (creature->GetEntry())
{
case NPC_STONECORE_TELEPORTER:
case NPC_STONECORE_TELEPORTER_1:
case NPC_STONECORE_TELEPORTER_2:
if (GetBossState(DATA_SLABHIDE) == DONE)
ActivateTeleporter(creature);
{
creature->CastSpell(creature, SPELL_TELEPORTER_ACTIVE_VISUAL);
creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
}
break;
case BOSS_CORBORUS:
case BOSS_SLABHIDE:
@@ -162,8 +170,17 @@ class instance_stonecore : public InstanceMapScript
// Activate teleporters
if (state == DONE)
{
ActivateTeleporter(GetCreature(DATA_STONECORE_TELEPORTER));
ActivateTeleporter(GetCreature(DATA_STONECORE_TELEPORTER_2));
if (Creature* teleporter1 = GetCreature(DATA_STONECORE_TELEPORTER_1))
{
teleporter1->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
teleporter1->CastSpell(teleporter1, SPELL_TELEPORTER_ACTIVE_VISUAL);
}
if (Creature* teleporter2 = GetCreature(DATA_STONECORE_TELEPORTER_2))
{
teleporter2->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
teleporter2->CastSpell(teleporter2, SPELL_TELEPORTER_ACTIVE_VISUAL);
}
}
if (state == FAIL)
@@ -280,15 +297,6 @@ class instance_stonecore : public InstanceMapScript
creature->DespawnOrUnsummon(Seconds(3));
}
void ActivateTeleporter(Creature* teleporter)
{
if (!teleporter)
return;
teleporter->CastSpell(teleporter, SPELL_TELEPORTER_ACTIVE_VISUAL, true);
teleporter->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
}
EventMap _events;
GuidVector _millhouseTrashGUIDs;
GuidVector _millhouseLastGroupGUIDs;
@@ -42,7 +42,7 @@ enum SCDataTypes
DATA_EVENT_PROGRESS,
// Teleporters
DATA_STONECORE_TELEPORTER,
DATA_STONECORE_TELEPORTER_1,
DATA_STONECORE_TELEPORTER_2,
};
@@ -72,7 +72,11 @@ enum SCCreatureIds
// High Priestess Azil
NPC_DEVOUT_FOLLOWER = 42428,
NPC_SEISMIC_SHARD = 42355
NPC_SEISMIC_SHARD = 42355,
// Generic Creatures
NPC_STONECORE_TELEPORTER_1 = 51396,
NPC_STONECORE_TELEPORTER_2 = 51397
};
enum SCGameobjectIds
@@ -90,9 +94,6 @@ enum SCMisc
// Stonecore Teleporter misc
MAX_STONECORE_TELEPORTERS = 2,
NPC_STONECORE_TELEPORTER = 51396, // Entrance teleporter
NPC_STONECORE_TELEPORTER_2 = 51397, // Slabhide teleporter
SPELL_TELEPORTER_ACTIVE_VISUAL = 95298,
SPELL_RING_WYRM_KNOCKBACK = 81235,
// Creature Formation IDs