sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core): Add definition file for area table entries. (#22054)

Browse Source
This commit is contained in:
Benjamin Jackson
2025-05-09 09:48:02 -04:00
committed by GitHub
parent db62fe8310
commit 52799d76f6
146 changed files with 866 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_misc.cpp
+1 -1
View File
@@ -2949,7 +2949,7 @@ public:
return false;
}
handler->GetSession()->GetPlayer()->CastSpell(unit, 530, true);
handler->GetSession()->GetPlayer()->CastSpell(unit, MAP_OUTLAND, true);
return true;
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ private:
class instance_blackrock_depths : public InstanceMapScript
{
public:
instance_blackrock_depths() : InstanceMapScript("instance_blackrock_depths", 230) { }
instance_blackrock_depths() : InstanceMapScript("instance_blackrock_depths", MAP_BLACKROCK_DEPTHS) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ DoorData const doorData[] =
class instance_blackrock_spire : public InstanceMapScript
{
public:
instance_blackrock_spire() : InstanceMapScript(BRSScriptName, 229) { }
instance_blackrock_spire() : InstanceMapScript(BRSScriptName, MAP_BLACKROCK_SPIRE) { }
struct instance_blackrock_spireMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+2 -1
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "GameObject.h"
#include "InstanceMapScript.h"
@@ -269,7 +270,7 @@ public:
{
Initialize();
if (me->GetMapId() == 469)
if (me->GetMapId() == MAP_BLACKWING_LAIR)
{
if (Creature* nefarian = me->FindNearestCreature(NPC_NEFARIAN, 1000.0f, true))
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+3 -4
View File
@@ -75,7 +75,7 @@ uint32 const Entry[3] = { 12422, 12416, 12420 };
class instance_blackwing_lair : public InstanceMapScript
{
public:
instance_blackwing_lair() : InstanceMapScript(BWLScriptName, 469) { }
instance_blackwing_lair() : InstanceMapScript(BWLScriptName, MAP_BLACKWING_LAIR) { }
struct instance_blackwing_lair_InstanceMapScript : public InstanceScript
{
@@ -504,8 +504,7 @@ class spell_bwl_shadowflame : public SpellScript
enum orb_of_command_misc
{
QUEST_BLACKHANDS_COMMAND = 7761,
MAP_BWL = 469
QUEST_BLACKHANDS_COMMAND = 7761
};
const Position orbOfCommandTP = { -7672.46f, -1107.19f, 396.65f, 0.59f };
@@ -519,7 +518,7 @@ public:
{
if (!player->IsAlive() && player->GetQuestRewardStatus(QUEST_BLACKHANDS_COMMAND))
{
player->TeleportTo(MAP_BWL, orbOfCommandTP.m_positionX, orbOfCommandTP.m_positionY, orbOfCommandTP.m_positionZ, orbOfCommandTP.m_orientation);
player->TeleportTo(MAP_BLACKWING_LAIR, orbOfCommandTP.m_positionX, orbOfCommandTP.m_positionY, orbOfCommandTP.m_positionZ, orbOfCommandTP.m_orientation);
return true;
}
return false;
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ constexpr uint8 SAY_SPAWN = 1;
class instance_molten_core : public InstanceMapScript
{
public:
instance_molten_core() : InstanceMapScript(MCScriptName, 409) {}
instance_molten_core() : InstanceMapScript(MCScriptName, MAP_MOLTEN_CORE) {}
struct instance_molten_core_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
class instance_deadmines : public InstanceMapScript
{
public:
instance_deadmines() : InstanceMapScript("instance_deadmines", 36) { }
instance_deadmines() : InstanceMapScript("instance_deadmines", MAP_DEADMINES) { }
struct instance_deadmines_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
class instance_gnomeregan : public InstanceMapScript
{
public:
instance_gnomeregan() : InstanceMapScript("instance_gnomeregan", 90) { }
instance_gnomeregan() : InstanceMapScript("instance_gnomeregan", MAP_GNOMEREGAN) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ DoorData const doorData[] =
class instance_karazhan : public InstanceMapScript
{
public:
instance_karazhan() : InstanceMapScript("instance_karazhan", 532) { }
instance_karazhan() : InstanceMapScript("instance_karazhan", MAP_KARAZHAN) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ Position const KalecgosSpawnPos = { 164.3747f, -397.1197f, 2.151798f, 1.66219f }
class instance_magisters_terrace : public InstanceMapScript
{
public:
instance_magisters_terrace() : InstanceMapScript("instance_magisters_terrace", 585) { }
instance_magisters_terrace() : InstanceMapScript("instance_magisters_terrace", MAP_MAGISTERS_TERRACE) { }
struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ float const CATHEDRAL_PULL_RANGE = 80.0f; // Distance from the Cathedral doors t
class instance_scarlet_monastery : public InstanceMapScript
{
public:
instance_scarlet_monastery() : InstanceMapScript("instance_scarlet_monastery", 189) {}
instance_scarlet_monastery() : InstanceMapScript("instance_scarlet_monastery", MAP_SCARLET_MONASTERY) {}
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ Position KirtonosSpawn = Position(315.028, 70.5385, 102.15, 0.385971);
class instance_scholomance : public InstanceMapScript
{
public:
instance_scholomance() : InstanceMapScript(ScholomanceScriptName, 289) { }
instance_scholomance() : InstanceMapScript(ScholomanceScriptName, MAP_SCHOLOMANCE) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ enum Spells
class instance_shadowfang_keep : public InstanceMapScript
{
public:
instance_shadowfang_keep() : InstanceMapScript("instance_shadowfang_keep", 33) { }
instance_shadowfang_keep() : InstanceMapScript("instance_shadowfang_keep", MAP_SHADOWFANG_KEEP) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ Position const SlaughterPos = { 4032.20f, -3378.06f, 119.75f, 4.67f };
class instance_stratholme : public InstanceMapScript
{
public:
instance_stratholme() : InstanceMapScript("instance_stratholme", 329) { }
instance_stratholme() : InstanceMapScript("instance_stratholme", MAP_STRATHOLME) { }
struct instance_stratholme_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
class instance_sunken_temple : public InstanceMapScript
{
public:
instance_sunken_temple() : InstanceMapScript("instance_sunken_temple", 109) { }
instance_sunken_temple() : InstanceMapScript("instance_sunken_temple", MAP_SUNKEN_TEMPLE) { }
struct instance_sunken_temple_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ ObjectData const summonData[] =
class instance_sunwell_plateau : public InstanceMapScript
{
public:
instance_sunwell_plateau() : InstanceMapScript("instance_sunwell_plateau", 580) { }
instance_sunwell_plateau() : InstanceMapScript("instance_sunwell_plateau", MAP_THE_SUNWELL) { }
struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
class instance_the_stockade : public InstanceMapScript
{
public:
instance_the_stockade() : InstanceMapScript("instance_the_stockade", 34) { }
instance_the_stockade() : InstanceMapScript("instance_the_stockade", MAP_STORMWIND_STOCKADE) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+2 -6
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureAI.h"
#include "InstanceMapScript.h"
#include "InstanceScript.h"
@@ -36,7 +37,7 @@ enum Events
class instance_uldaman : public InstanceMapScript
{
public:
instance_uldaman() : InstanceMapScript("instance_uldaman", 70) { }
instance_uldaman() : InstanceMapScript("instance_uldaman", MAP_ULDAMAN) { }
struct instance_uldaman_InstanceMapScript : public InstanceScript
{
@@ -156,11 +157,6 @@ class spell_uldaman_sub_boss_agro_keepers : public SpellScript
}
};
enum UldamanStonedEnum
{
MAP_ULDAMAN = 70
};
class spell_uldaman_stoned_aura : public AuraScript
{
PrepareAuraScript(spell_uldaman_stoned_aura);
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ BossBoundaryData const boundaries =
class instance_zulaman : public InstanceMapScript
{
public:
instance_zulaman() : InstanceMapScript("instance_zulaman", 568) { }
instance_zulaman() : InstanceMapScript("instance_zulaman", MAP_ZUL_AMAN) { }
struct instance_zulaman_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ ObjectData const creatureData[] =
class instance_zulgurub : public InstanceMapScript
{
public:
instance_zulgurub(): InstanceMapScript(ZGScriptName, 309) { }
instance_zulgurub(): InstanceMapScript(ZGScriptName, MAP_ZUL_GURUB) { }
struct instance_zulgurub_InstanceMapScript : public InstanceScript
{
src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
+5 -4
View File
@@ -27,6 +27,7 @@ npc_the_scourge_cauldron
npc_andorhal_tower
EndContentData */
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "Player.h"
#include "ScriptedCreature.h"
@@ -74,7 +75,7 @@ public:
switch (me->GetAreaId())
{
case 199: //felstone
case AREA_FELSTONE_FIELD:
if (player->GetQuestStatus(5216) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(5229) == QUEST_STATUS_INCOMPLETE)
{
@@ -82,7 +83,7 @@ public:
DoDie();
}
break;
case 200: //dalson
case AREA_DALSONS_TEARS:
if (player->GetQuestStatus(5219) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(5231) == QUEST_STATUS_INCOMPLETE)
{
@@ -90,7 +91,7 @@ public:
DoDie();
}
break;
case 201: //gahrron
case AREA_GAHRRONS_WITHERING:
if (player->GetQuestStatus(5225) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(5235) == QUEST_STATUS_INCOMPLETE)
{
@@ -98,7 +99,7 @@ public:
DoDie();
}
break;
case 202: //writhing
case AREA_THE_WRITHING_HAUNT:
if (player->GetQuestStatus(5222) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(5233) == QUEST_STATUS_INCOMPLETE)
{
src/server/scripts/Events/brewfest.cpp
+15 -14
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CellImpl.h"
#include "CreatureScript.h"
#include "GameEventMgr.h"
@@ -154,8 +155,8 @@ struct npc_brewfest_bark_trigger : public ScriptedAI
bool allow = false;
uint32 quest = 0;
Player* player = who->ToPlayer();
// Kalimdor
if (me->GetMapId() == 1)
if (me->GetMapId() == MAP_KALIMDOR)
{
if (player->GetQuestStatus(QUEST_BARK_FOR_DROHN) == QUEST_STATUS_INCOMPLETE)
{
@@ -168,7 +169,7 @@ struct npc_brewfest_bark_trigger : public ScriptedAI
quest = QUEST_BARK_FOR_VOODOO;
}
}
else if (me->GetMapId() == 0)
else if (me->GetMapId() == MAP_EASTERN_KINGDOMS)
{
if (player->GetQuestStatus(QUEST_BARK_FOR_BARLEY) == QUEST_STATUS_INCOMPLETE)
{
@@ -374,7 +375,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
}
case EVENT_SPAWN_MOLE_MACHINE:
{
if (me->GetMapId() == 1) // Kalimdor
if (me->GetMapId() == MAP_KALIMDOR)
{
float rand = 8 + rand_norm() * 12;
float angle = rand_norm() * 2 * M_PI;
@@ -383,7 +384,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
if (Creature* cr = me->SummonCreature(NPC_MOLE_MACHINE_TRIGGER, x, y, 21.3f, 0.0f))
cr->CastSpell(cr, SPELL_SPAWN_MOLE_MACHINE, true);
}
else if (me->GetMapId() == 0) // EK
else if (me->GetMapId() == MAP_EASTERN_KINGDOMS)
{
float rand = rand_norm() * 20;
float angle = rand_norm() * 2 * M_PI;
@@ -457,7 +458,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
herald->Yell(amount, LANG_UNIVERSAL);
}
me->CastSpell(me, (me->GetMapId() == 1 ? SPELL_SUMMON_PLANS_H : SPELL_SUMMON_PLANS_A), true);
me->CastSpell(me, (me->GetMapId() == MAP_KALIMDOR ? SPELL_SUMMON_PLANS_H : SPELL_SUMMON_PLANS_A), true);
Reset();
}
@@ -473,7 +474,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
}
Creature* cr;
if (me->GetMapId() == 1) // Kalimdor
if (me->GetMapId() == MAP_KALIMDOR)
{
if ((cr = me->SummonCreature(NPC_DROHN_KEG, 1183.69f, -4315.15f, 21.1875f, 0.750492f)))
{
@@ -494,7 +495,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
revelerGUIDs.push_back(cr->GetGUID());
}
}
else if (me->GetMapId() == 0) // Eastern Kingdom
else if (me->GetMapId() == MAP_EASTERN_KINGDOMS)
{
if ((cr = me->SummonCreature(NPC_BARLEYBREW_KEG, -5187.23f, -599.779f, 397.176f, 0.017453f)))
{
@@ -544,10 +545,10 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
switch (urand(0, 2))
{
case 0:
entry = (me->GetMapId() == 1 ? NPC_NORMAL_DROHN : NPC_NORMAL_THUNDERBREW);
entry = (me->GetMapId() == MAP_KALIMDOR ? NPC_NORMAL_DROHN : NPC_NORMAL_THUNDERBREW);
break;
case 1:
entry = (me->GetMapId() == 1 ? NPC_NORMAL_VOODOO : NPC_NORMAL_BARLEYBREW);
entry = (me->GetMapId() == MAP_KALIMDOR ? NPC_NORMAL_VOODOO : NPC_NORMAL_BARLEYBREW);
break;
case 2:
entry = NPC_NORMAL_GORDOK;
@@ -649,13 +650,13 @@ struct npc_dark_iron_guzzler : public ScriptedAI
uint32 entry[3] = {0, 0, 0};
uint32 shuffled[3] = {0, 0, 0};
if (me->GetMapId() == 1) // Kalimdor
if (me->GetMapId() == MAP_KALIMDOR)
{
entry[0] = NPC_DROHN_KEG;
entry[1] = NPC_VOODOO_KEG;
entry[2] = NPC_GORDOK_KEG;
}
else// if (me->GetMapId() == 0) // EK
else// if (me->GetMapId() == MAP_EASTERN_KINGDOMS)
{
entry[0] = NPC_THUNDERBREW_KEG;
entry[1] = NPC_BARLEYBREW_KEG;
@@ -1231,7 +1232,7 @@ class spell_brewfest_toss_mug : public SpellScript
return;
std::vector<Creature*> bakers;
if (caster->GetMapId() == 1) // Kalimdor
if (caster->GetMapId() == MAP_KALIMDOR)
{
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_VOODOO, 40.0f))
{
@@ -1248,7 +1249,7 @@ class spell_brewfest_toss_mug : public SpellScript
bakers.push_back(creature);
}
}
else // EK
else // Eastern Kingdoms
{
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_THUNDERBREW, 40.0f))
{
src/server/scripts/Events/firework_show/firework_show.cpp
+11 -10
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "firework_show.h"
#include "firework_show_BootyBay.h"
#include "firework_show_Exodar.h"
@@ -32,16 +33,16 @@
// <mapId, zoneId>, show
std::map<std::pair<uint32, uint32>, FireworkShow const *> const FireworkShowStore = {
{ { 0, 1 }, &fireworkShowIronforge },
{ { 0, 33 }, &fireworkShowBootyBay },
{ { 0, 1497 }, &fireworkShowUndercity },
{ { 0, 1519 }, &fireworkShowStormwind },
{ { 1, 141 }, &fireworkShowTeldrassil },
{ { 1, 1637 }, &fireworkShowOrgrimmar },
{ { 1, 1638 }, &fireworkShowThunderBluff },
{ { 530, 3430 }, &fireworkShowSilvermoon },
{ { 530, 3557 }, &fireworkShowExodar },
{ { 530, 3703 }, &fireworkShowShattrath },
{ { MAP_EASTERN_KINGDOMS, AREA_DUN_MOROGH }, &fireworkShowIronforge },
{ { MAP_EASTERN_KINGDOMS, AREA_STRANGLETHORN_VALE }, &fireworkShowBootyBay },
{ { MAP_EASTERN_KINGDOMS, AREA_UNDERCITY }, &fireworkShowUndercity },
{ { MAP_EASTERN_KINGDOMS, AREA_STORMWIND_CITY }, &fireworkShowStormwind },
{ { MAP_KALIMDOR, AREA_TELDRASSIL }, &fireworkShowTeldrassil },
{ { MAP_KALIMDOR, AREA_ORGRIMMAR }, &fireworkShowOrgrimmar },
{ { MAP_KALIMDOR, AREA_THUNDER_BLUFF }, &fireworkShowThunderBluff },
{ { MAP_OUTLAND, AREA_EVERSONG_WOODS }, &fireworkShowSilvermoon },
{ { MAP_OUTLAND, AREA_THE_EXODAR }, &fireworkShowExodar },
{ { MAP_OUTLAND, AREA_SHATTRATH_CITY }, &fireworkShowShattrath },
};
struct go_firework_show : public GameObjectAI
src/server/scripts/Events/hallows_end.cpp
+7 -6
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CellImpl.h"
#include "CreatureScript.h"
#include "GameObjectAI.h"
@@ -371,42 +372,42 @@ struct npc_costumed_orphan_matron : public ScriptedAI
{
switch (me->GetAreaId())
{
case 87: // Goldshire
case AREA_GOLDSHIRE:
x = -9494.4f;
y = 48.53f;
z = 70.5f;
o = 0.5f;
path = 235431;
break;
case 131: // Kharanos
case AREA_KHARANOS:
x = -5558.34f;
y = -499.46f;
z = 414.12f;
o = 2.08f;
path = 235432;
break;
case 3576: // Azure Watch
case AREA_AZURE_WATCH:
x = -4163.58f;
y = -12460.30f;
z = 63.02f;
o = 4.31f;
path = 235433;
break;
case 362: // Razor Hill
case AREA_RAZOR_HILL:
x = 373.2f;
y = -4723.4f;
z = 31.2f;
o = 3.2f;
path = 235434;
break;
case 159: // Brill
case AREA_BRILL:
x = 2195.2f;
y = 264.0f;
z = 55.62f;
o = 0.15f;
path = 235435;
break;
case 3665: // Falcon Wing Square
case AREA_FALCONWING_SQUARE:
x = 9547.91f;
y = -6809.9f;
z = 27.96f;
src/server/scripts/Events/midsummer.cpp
+85 -88
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "GameEventMgr.h"
#include "GameObjectScript.h"
@@ -59,91 +60,87 @@ static bool BonfireStampedOutState[COUNT_GO_BONFIRE_ALLIANCE + COUNT_GO_BONFIRE_
// <mapId, zoneId, teamId>, <state>
const std::map<std::tuple<uint32, uint32, TeamId>, bool*> BonfireStateStore = {
// Map 0
{ { 0, 1, TEAM_ALLIANCE }, &BonfireStampedOutState[0] },
{ { 0, 3, TEAM_HORDE }, &BonfireStampedOutState[1] },
{ { 0, 4, TEAM_ALLIANCE }, &BonfireStampedOutState[2] },
{ { 0, 8, TEAM_HORDE }, &BonfireStampedOutState[3] },
{ { 0, 10, TEAM_ALLIANCE }, &BonfireStampedOutState[4] },
{ { 0, 11, TEAM_ALLIANCE }, &BonfireStampedOutState[5] },
{ { 0, 12, TEAM_ALLIANCE }, &BonfireStampedOutState[6] },
{ { 0, 28, TEAM_ALLIANCE }, &BonfireStampedOutState[7] },
{ { 0, 33, TEAM_ALLIANCE }, &BonfireStampedOutState[8] },
{ { 0, 33, TEAM_HORDE }, &BonfireStampedOutState[9] },
{ { 0, 38, TEAM_ALLIANCE }, &BonfireStampedOutState[10] },
{ { 0, 40, TEAM_ALLIANCE }, &BonfireStampedOutState[11] },
{ { 0, 44, TEAM_ALLIANCE }, &BonfireStampedOutState[12] },
{ { 0, 45, TEAM_ALLIANCE }, &BonfireStampedOutState[13] },
{ { 0, 45, TEAM_HORDE }, &BonfireStampedOutState[14] },
{ { 0, 46, TEAM_ALLIANCE }, &BonfireStampedOutState[15] },
{ { 0, 46, TEAM_HORDE }, &BonfireStampedOutState[16] },
{ { 0, 47, TEAM_ALLIANCE }, &BonfireStampedOutState[17] },
{ { 0, 47, TEAM_HORDE }, &BonfireStampedOutState[18] },
{ { 0, 85, TEAM_HORDE }, &BonfireStampedOutState[19] },
{ { 0, 130, TEAM_HORDE }, &BonfireStampedOutState[20] },
{ { 0, 267, TEAM_ALLIANCE }, &BonfireStampedOutState[21] },
{ { 0, 267, TEAM_HORDE }, &BonfireStampedOutState[22] },
{ { MAP_EASTERN_KINGDOMS, AREA_DUN_MOROGH, TEAM_ALLIANCE }, &BonfireStampedOutState[0] },
{ { MAP_EASTERN_KINGDOMS, AREA_BADLANDS, TEAM_HORDE }, &BonfireStampedOutState[1] },
{ { MAP_EASTERN_KINGDOMS, AREA_BLASTED_LANDS, TEAM_ALLIANCE }, &BonfireStampedOutState[2] },
{ { MAP_EASTERN_KINGDOMS, AREA_SWAMP_OF_SORROWS, TEAM_HORDE }, &BonfireStampedOutState[3] },
{ { MAP_EASTERN_KINGDOMS, AREA_DUSKWOOD, TEAM_ALLIANCE }, &BonfireStampedOutState[4] },
{ { MAP_EASTERN_KINGDOMS, AREA_WETLANDS, TEAM_ALLIANCE }, &BonfireStampedOutState[5] },
{ { MAP_EASTERN_KINGDOMS, AREA_ELWYNN_FOREST, TEAM_ALLIANCE }, &BonfireStampedOutState[6] },
{ { MAP_EASTERN_KINGDOMS, AREA_WESTERN_PLAGUELANDS, TEAM_ALLIANCE }, &BonfireStampedOutState[7] },
{ { MAP_EASTERN_KINGDOMS, AREA_STRANGLETHORN_VALE, TEAM_ALLIANCE }, &BonfireStampedOutState[8] },
{ { MAP_EASTERN_KINGDOMS, AREA_STRANGLETHORN_VALE, TEAM_HORDE }, &BonfireStampedOutState[9] },
{ { MAP_EASTERN_KINGDOMS, AREA_LOCH_MODAN, TEAM_ALLIANCE }, &BonfireStampedOutState[10] },
{ { MAP_EASTERN_KINGDOMS, AREA_WESTFALL, TEAM_ALLIANCE }, &BonfireStampedOutState[11] },
{ { MAP_EASTERN_KINGDOMS, AREA_REDRIDGE_MOUNTAINS, TEAM_ALLIANCE }, &BonfireStampedOutState[12] },
{ { MAP_EASTERN_KINGDOMS, AREA_ARATHI_HIGHLANDS, TEAM_ALLIANCE }, &BonfireStampedOutState[13] },
{ { MAP_EASTERN_KINGDOMS, AREA_ARATHI_HIGHLANDS, TEAM_HORDE }, &BonfireStampedOutState[14] },
{ { MAP_EASTERN_KINGDOMS, AREA_BURNING_STEPPES, TEAM_ALLIANCE }, &BonfireStampedOutState[15] },
{ { MAP_EASTERN_KINGDOMS, AREA_BURNING_STEPPES, TEAM_HORDE }, &BonfireStampedOutState[16] },
{ { MAP_EASTERN_KINGDOMS, AREA_THE_HINTERLANDS, TEAM_ALLIANCE }, &BonfireStampedOutState[17] },
{ { MAP_EASTERN_KINGDOMS, AREA_THE_HINTERLANDS, TEAM_HORDE }, &BonfireStampedOutState[18] },
{ { MAP_EASTERN_KINGDOMS, AREA_TIRISFAL_GLADES, TEAM_HORDE }, &BonfireStampedOutState[19] },
{ { MAP_EASTERN_KINGDOMS, AREA_SILVERPINE_FOREST, TEAM_HORDE }, &BonfireStampedOutState[20] },
{ { MAP_EASTERN_KINGDOMS, AREA_HILLSBRAD_FOOTHILLS, TEAM_ALLIANCE }, &BonfireStampedOutState[21] },
{ { MAP_EASTERN_KINGDOMS, AREA_HILLSBRAD_FOOTHILLS, TEAM_HORDE }, &BonfireStampedOutState[22] },
// Map 1
{ { 1, 14, TEAM_HORDE }, &BonfireStampedOutState[23] },
{ { 1, 15, TEAM_ALLIANCE }, &BonfireStampedOutState[24] },
{ { 1, 15, TEAM_HORDE }, &BonfireStampedOutState[25] },
{ { 1, 17, TEAM_HORDE }, &BonfireStampedOutState[26] },
{ { 1, 141, TEAM_ALLIANCE }, &BonfireStampedOutState[27] },
{ { 1, 148, TEAM_ALLIANCE }, &BonfireStampedOutState[28] },
{ { 1, 215, TEAM_HORDE }, &BonfireStampedOutState[29] },
{ { 1, 331, TEAM_ALLIANCE }, &BonfireStampedOutState[30] },
{ { 1, 331, TEAM_HORDE }, &BonfireStampedOutState[31] },
{ { 1, 357, TEAM_ALLIANCE }, &BonfireStampedOutState[32] },
{ { 1, 357, TEAM_HORDE }, &BonfireStampedOutState[33] },
{ { 1, 400, TEAM_HORDE }, &BonfireStampedOutState[34] },
{ { 1, 405, TEAM_ALLIANCE }, &BonfireStampedOutState[35] },
{ { 1, 405, TEAM_HORDE }, &BonfireStampedOutState[36] },
{ { 1, 406, TEAM_HORDE }, &BonfireStampedOutState[37] },
{ { 1, 440, TEAM_ALLIANCE }, &BonfireStampedOutState[38] },
{ { 1, 440, TEAM_HORDE }, &BonfireStampedOutState[39] },
{ { 1, 618, TEAM_ALLIANCE }, &BonfireStampedOutState[40] },
{ { 1, 618, TEAM_HORDE }, &BonfireStampedOutState[41] },
{ { 1, 1377, TEAM_ALLIANCE }, &BonfireStampedOutState[42] },
{ { 1, 1377, TEAM_HORDE }, &BonfireStampedOutState[43] },
{ { MAP_KALIMDOR, AREA_DUROTAR, TEAM_HORDE }, &BonfireStampedOutState[23] },
{ { MAP_KALIMDOR, AREA_DUSTWALLOW_MARSH, TEAM_ALLIANCE }, &BonfireStampedOutState[24] },
{ { MAP_KALIMDOR, AREA_DUSTWALLOW_MARSH, TEAM_HORDE }, &BonfireStampedOutState[25] },
{ { MAP_KALIMDOR, AREA_THE_BARRENS, TEAM_HORDE }, &BonfireStampedOutState[26] },
{ { MAP_KALIMDOR, AREA_TELDRASSIL, TEAM_ALLIANCE }, &BonfireStampedOutState[27] },
{ { MAP_KALIMDOR, AREA_DARKSHORE, TEAM_ALLIANCE }, &BonfireStampedOutState[28] },
{ { MAP_KALIMDOR, AREA_MULGORE, TEAM_HORDE }, &BonfireStampedOutState[29] },
{ { MAP_KALIMDOR, AREA_ASHENVALE, TEAM_ALLIANCE }, &BonfireStampedOutState[30] },
{ { MAP_KALIMDOR, AREA_ASHENVALE, TEAM_HORDE }, &BonfireStampedOutState[31] },
{ { MAP_KALIMDOR, AREA_FERALAS, TEAM_ALLIANCE }, &BonfireStampedOutState[32] },
{ { MAP_KALIMDOR, AREA_FERALAS, TEAM_HORDE }, &BonfireStampedOutState[33] },
{ { MAP_KALIMDOR, AREA_THOUSAND_NEEDLES, TEAM_HORDE }, &BonfireStampedOutState[34] },
{ { MAP_KALIMDOR, AREA_DESOLACE, TEAM_ALLIANCE }, &BonfireStampedOutState[35] },
{ { MAP_KALIMDOR, AREA_DESOLACE, TEAM_HORDE }, &BonfireStampedOutState[36] },
{ { MAP_KALIMDOR, AREA_STONETALON_MOUNTAINS, TEAM_HORDE }, &BonfireStampedOutState[37] },
{ { MAP_KALIMDOR, AREA_TANARIS, TEAM_ALLIANCE }, &BonfireStampedOutState[38] },
{ { MAP_KALIMDOR, AREA_TANARIS, TEAM_HORDE }, &BonfireStampedOutState[39] },
{ { MAP_KALIMDOR, AREA_WINTERSPRING, TEAM_ALLIANCE }, &BonfireStampedOutState[40] },
{ { MAP_KALIMDOR, AREA_WINTERSPRING, TEAM_HORDE }, &BonfireStampedOutState[41] },
{ { MAP_KALIMDOR, AREA_SILITHUS, TEAM_ALLIANCE }, &BonfireStampedOutState[42] },
{ { MAP_KALIMDOR, AREA_SILITHUS, TEAM_HORDE }, &BonfireStampedOutState[43] },
// Map 530
{ { 530, 3430, TEAM_HORDE }, &BonfireStampedOutState[44] },
{ { 530, 3433, TEAM_HORDE }, &BonfireStampedOutState[45] },
{ { 530, 3483, TEAM_ALLIANCE }, &BonfireStampedOutState[46] },
{ { 530, 3483, TEAM_HORDE }, &BonfireStampedOutState[47] },
{ { 530, 3518, TEAM_ALLIANCE }, &BonfireStampedOutState[48] },
{ { 530, 3518, TEAM_HORDE }, &BonfireStampedOutState[49] },
{ { 530, 3519, TEAM_ALLIANCE }, &BonfireStampedOutState[50] },
{ { 530, 3519, TEAM_HORDE }, &BonfireStampedOutState[51] },
{ { 530, 3520, TEAM_ALLIANCE }, &BonfireStampedOutState[52] },
{ { 530, 3520, TEAM_HORDE }, &BonfireStampedOutState[53] },
{ { 530, 3521, TEAM_ALLIANCE }, &BonfireStampedOutState[54] },
{ { 530, 3521, TEAM_HORDE }, &BonfireStampedOutState[55] },
{ { 530, 3522, TEAM_ALLIANCE }, &BonfireStampedOutState[56] },
{ { 530, 3522, TEAM_HORDE }, &BonfireStampedOutState[57] },
{ { 530, 3523, TEAM_ALLIANCE }, &BonfireStampedOutState[58] },
{ { 530, 3523, TEAM_HORDE }, &BonfireStampedOutState[59] },
{ { 530, 3524, TEAM_ALLIANCE }, &BonfireStampedOutState[60] },
{ { 530, 3525, TEAM_ALLIANCE }, &BonfireStampedOutState[61] },
{ { MAP_OUTLAND, AREA_EVERSONG_WOODS, TEAM_HORDE }, &BonfireStampedOutState[44] },
{ { MAP_OUTLAND, AREA_GHOSTLANDS, TEAM_HORDE }, &BonfireStampedOutState[45] },
{ { MAP_OUTLAND, AREA_HELLFIRE_PENINSULA, TEAM_ALLIANCE }, &BonfireStampedOutState[46] },
{ { MAP_OUTLAND, AREA_HELLFIRE_PENINSULA, TEAM_HORDE }, &BonfireStampedOutState[47] },
{ { MAP_OUTLAND, AREA_NAGRAND, TEAM_ALLIANCE }, &BonfireStampedOutState[48] },
{ { MAP_OUTLAND, AREA_NAGRAND, TEAM_HORDE }, &BonfireStampedOutState[49] },
{ { MAP_OUTLAND, AREA_TEROKKAR_FOREST, TEAM_ALLIANCE }, &BonfireStampedOutState[50] },
{ { MAP_OUTLAND, AREA_TEROKKAR_FOREST, TEAM_HORDE }, &BonfireStampedOutState[51] },
{ { MAP_OUTLAND, AREA_SHADOWMOON_VALLEY, TEAM_ALLIANCE }, &BonfireStampedOutState[52] },
{ { MAP_OUTLAND, AREA_SHADOWMOON_VALLEY, TEAM_HORDE }, &BonfireStampedOutState[53] },
{ { MAP_OUTLAND, AREA_ZANGARMARSH, TEAM_ALLIANCE }, &BonfireStampedOutState[54] },
{ { MAP_OUTLAND, AREA_ZANGARMARSH, TEAM_HORDE }, &BonfireStampedOutState[55] },
{ { MAP_OUTLAND, AREA_BLADES_EDGE_MOUNTAINS, TEAM_ALLIANCE }, &BonfireStampedOutState[56] },
{ { MAP_OUTLAND, AREA_BLADES_EDGE_MOUNTAINS, TEAM_HORDE }, &BonfireStampedOutState[57] },
{ { MAP_OUTLAND, AREA_NETHERSTORM, TEAM_ALLIANCE }, &BonfireStampedOutState[58] },
{ { MAP_OUTLAND, AREA_NETHERSTORM, TEAM_HORDE }, &BonfireStampedOutState[59] },
{ { MAP_OUTLAND, AREA_AZUREMYST_ISLE, TEAM_ALLIANCE }, &BonfireStampedOutState[60] },
{ { MAP_OUTLAND, AREA_BLOODMYST_ISLE, TEAM_ALLIANCE }, &BonfireStampedOutState[61] },
// Map 571
{ { 571, 65, TEAM_ALLIANCE }, &BonfireStampedOutState[62] },
{ { 571, 65, TEAM_HORDE }, &BonfireStampedOutState[63] },
{ { 571, 66, TEAM_ALLIANCE }, &BonfireStampedOutState[64] },
{ { 571, 66, TEAM_HORDE }, &BonfireStampedOutState[65] },
{ { 571, 67, TEAM_ALLIANCE }, &BonfireStampedOutState[66] },
{ { 571, 67, TEAM_HORDE }, &BonfireStampedOutState[67] },
{ { 571, 394, TEAM_ALLIANCE }, &BonfireStampedOutState[68] },
{ { 571, 394, TEAM_HORDE }, &BonfireStampedOutState[69] },
{ { 571, 495, TEAM_ALLIANCE }, &BonfireStampedOutState[70] },
{ { 571, 495, TEAM_HORDE }, &BonfireStampedOutState[71] },
{ { 571, 2817, TEAM_ALLIANCE }, &BonfireStampedOutState[72] },
{ { 571, 2817, TEAM_HORDE }, &BonfireStampedOutState[73] },
{ { 571, 3537, TEAM_ALLIANCE }, &BonfireStampedOutState[74] },
{ { 571, 3537, TEAM_HORDE }, &BonfireStampedOutState[75] },
{ { 571, 3711, TEAM_ALLIANCE }, &BonfireStampedOutState[76] },
{ { 571, 3711, TEAM_HORDE }, &BonfireStampedOutState[77] },
{ { MAP_NORTHREND, AREA_DRAGONBLIGHT, TEAM_ALLIANCE }, &BonfireStampedOutState[62] },
{ { MAP_NORTHREND, AREA_DRAGONBLIGHT, TEAM_HORDE }, &BonfireStampedOutState[63] },
{ { MAP_NORTHREND, AREA_ZUL_DRAK, TEAM_ALLIANCE }, &BonfireStampedOutState[64] },
{ { MAP_NORTHREND, AREA_ZUL_DRAK, TEAM_HORDE }, &BonfireStampedOutState[65] },
{ { MAP_NORTHREND, AREA_THE_STORM_PEAKS, TEAM_ALLIANCE }, &BonfireStampedOutState[66] },
{ { MAP_NORTHREND, AREA_THE_STORM_PEAKS, TEAM_HORDE }, &BonfireStampedOutState[67] },
{ { MAP_NORTHREND, AREA_GRIZZLY_HILLS, TEAM_ALLIANCE }, &BonfireStampedOutState[68] },
{ { MAP_NORTHREND, AREA_GRIZZLY_HILLS, TEAM_HORDE }, &BonfireStampedOutState[69] },
{ { MAP_NORTHREND, AREA_HOWLING_FJORD, TEAM_ALLIANCE }, &BonfireStampedOutState[70] },
{ { MAP_NORTHREND, AREA_HOWLING_FJORD, TEAM_HORDE }, &BonfireStampedOutState[71] },
{ { MAP_NORTHREND, AREA_CRYSTALSONG_FOREST, TEAM_ALLIANCE }, &BonfireStampedOutState[72] },
{ { MAP_NORTHREND, AREA_CRYSTALSONG_FOREST, TEAM_HORDE }, &BonfireStampedOutState[73] },
{ { MAP_NORTHREND, AREA_BOREAN_TUNDRA, TEAM_ALLIANCE }, &BonfireStampedOutState[74] },
{ { MAP_NORTHREND, AREA_BOREAN_TUNDRA, TEAM_HORDE }, &BonfireStampedOutState[75] },
{ { MAP_NORTHREND, AREA_SHOLAZAR_BASIN, TEAM_ALLIANCE }, &BonfireStampedOutState[76] },
{ { MAP_NORTHREND, AREA_SHOLAZAR_BASIN, TEAM_HORDE }, &BonfireStampedOutState[77] },
};
uint32 const GoBonfireAlliance[COUNT_GO_BONFIRE_ALLIANCE] = { 187564, 187914, 187916, 187917, 187919, 187920, 187921, 187922, 187923, 187924, 187925, 187926, 187927, 187928, 187929, 187930, 187931, 187932, 187933, 187934, 187935, 187936, 187937, 187938, 187939, 187940, 187941, 187942, 187943, 187944, 187945, 187946, 194032, 194035, 194036, 194038, 194040, 194044, 194045, 194049 };
@@ -1254,22 +1251,22 @@ class spell_midsummer_summon_ahune_lieutenant : public SpellScript
switch (zoneId)
{
case 331: // Ashenvale
case AREA_ASHENVALE:
npcEntry = 26116; // Frostwave Lieutenant
break;
case 405: // Desolace
case AREA_DESOLACE:
npcEntry = 26178; // Hailstone Lieutenant
break;
case 33: // Stranglethorn Vale
case AREA_STRANGLETHORN_VALE:
npcEntry = 26204; // Chillwind Lieutenant
break;
case 51: // Searing Gorge
case AREA_SEARING_GORGE:
npcEntry = 26214; // Frigid Lieutenant
break;
case 1377: // Silithus
case AREA_SILITHUS:
npcEntry = 26215; // Glacial Lieutenant
break;
case 3483: // Hellfire Peninsula
case AREA_HELLFIRE_PENINSULA:
npcEntry = 26216; // Glacial Templar
break;
}
src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
class instance_blackfathom_deeps : public InstanceMapScript
{
public:
instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", 48) { }
instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", MAP_BLACKFATHOM_DEEPS) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
-2
View File
@@ -139,8 +139,6 @@ enum HyjalMisc
CONTEXT_GROUP_WAVES = 1,
AREA_NORDRASSIL = 3710,
SPELL_ETERNAL_SILENCE = 42201,
GUID_GAIN_SOUL_CHARGE_PLAYER = 1
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+2 -1
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "Chat.h"
#include "InstanceMapScript.h"
#include "InstanceScript.h"
@@ -72,7 +73,7 @@ Milliseconds hyjalNightElfWaveTimers[1][MAX_WAVES_NIGHT_ELF]
class instance_hyjal : public InstanceMapScript
{
public:
instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { }
instance_hyjal() : InstanceMapScript("instance_hyjal", MAP_THE_BATTLE_FOR_MOUNT_HYJAL) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
class instance_culling_of_stratholme : public InstanceMapScript
{
public:
instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", 595) { }
instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", MAP_THE_CULLING_OF_STRATHOLME) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ const Position thrallPositions[THRALL_POSITIONS_COUNT] =
class instance_old_hillsbrad : public InstanceMapScript
{
public:
instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", 560) { }
instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", MAP_THE_ESCAPE_FROM_DURNHOLDE) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ ObjectData const creatureData[] =
class instance_the_black_morass : public InstanceMapScript
{
public:
instance_the_black_morass() : InstanceMapScript("instance_the_black_morass", 269) { }
instance_the_black_morass() : InstanceMapScript("instance_the_black_morass", MAP_OPENING_OF_THE_DARK_PORTAL) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
class instance_dire_maul : public InstanceMapScript
{
public:
instance_dire_maul() : InstanceMapScript(DMScriptName, 429) { }
instance_dire_maul() : InstanceMapScript(DMScriptName, MAP_DIRE_MAUL) { }
struct instance_dire_maul_InstanceMapScript : public InstanceScript
{
src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
class instance_maraudon : public InstanceMapScript
{
public:
instance_maraudon() : InstanceMapScript("instance_maraudon", 349) { }
instance_maraudon() : InstanceMapScript("instance_maraudon", MAP_MARAUDON) { }
struct instance_maraudon_InstanceMapScript : public InstanceScript
{
src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ ObjectData const creatureData[] =
class instance_onyxias_lair : public InstanceMapScript
{
public:
instance_onyxias_lair() : InstanceMapScript("instance_onyxias_lair", 249) { }
instance_onyxias_lair() : InstanceMapScript("instance_onyxias_lair", MAP_ONYXIAS_LAIR) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
class instance_ragefire_chasm : public InstanceMapScript
{
public:
instance_ragefire_chasm() : InstanceMapScript("instance_ragefire_chasm", 389) { }
instance_ragefire_chasm() : InstanceMapScript("instance_ragefire_chasm", MAP_RAGEFIRE_CHASM) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
class instance_razorfen_downs : public InstanceMapScript
{
public:
instance_razorfen_downs() : InstanceMapScript("instance_razorfen_downs", 129) { }
instance_razorfen_downs() : InstanceMapScript("instance_razorfen_downs", MAP_RAZORFEN_DOWNS) { }
struct instance_razorfen_downs_InstanceMapScript : public InstanceScript
{
src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
class instance_razorfen_kraul : public InstanceMapScript
{
public:
instance_razorfen_kraul() : InstanceMapScript("instance_razorfen_kraul", 47) { }
instance_razorfen_kraul() : InstanceMapScript("instance_razorfen_kraul", MAP_RAZORFEN_KRAUL) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ std::array<uint32, 8> RajaxxWavesData[] =
class instance_ruins_of_ahnqiraj : public InstanceMapScript
{
public:
instance_ruins_of_ahnqiraj() : InstanceMapScript("instance_ruins_of_ahnqiraj", 509) { }
instance_ruins_of_ahnqiraj() : InstanceMapScript("instance_ruins_of_ahnqiraj", MAP_RUINS_OF_AHN_QIRAJ) { }
struct instance_ruins_of_ahnqiraj_InstanceMapScript : public InstanceScript
{
src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ DoorData const doorData[] =
class instance_temple_of_ahnqiraj : public InstanceMapScript
{
public:
instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { }
instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", MAP_AHN_QIRAJ_TEMPLE) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
class instance_wailing_caverns : public InstanceMapScript
{
public:
instance_wailing_caverns() : InstanceMapScript("instance_wailing_caverns", 43) { }
instance_wailing_caverns() : InstanceMapScript("instance_wailing_caverns", MAP_WAILING_CAVERNS) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ static PyramidEventData pyramidSpawns[pyramidSpawnTotal] =
class instance_zulfarrak : public InstanceMapScript
{
public:
instance_zulfarrak() : InstanceMapScript(ZFScriptName, 209) {}
instance_zulfarrak() : InstanceMapScript(ZFScriptName, MAP_ZUL_FARRAK) {}
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
+2 -6
View File
@@ -27,6 +27,7 @@ npc_shenthul
npc_thrall_warchief
EndContentData */
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "Player.h"
#include "ScriptedCreature.h"
@@ -148,11 +149,6 @@ enum ThrallWarchief : uint32
SAY_THRALL_ON_QUEST_REWARD_0 = 0,
SAY_THRALL_ON_QUEST_REWARD_1 = 1,
AREA_ORGRIMMAR = 1637,
AREA_RAZOR_HILL = 362,
AREA_CAMP_TAURAJO = 378,
AREA_CROSSROADS = 380,
GO_UNADORNED_SPIKE = 175787,
// What the Wind Carries (ID: 6566)
@@ -279,7 +275,7 @@ public:
{
if (player->IsAlive() && !player->IsGameMaster())
{
if (player->GetAreaId() == AREA_CROSSROADS)
if (player->GetAreaId() == AREA_THE_CROSSROADS)
{
player->CastSpell(player, SPELL_WARCHIEF_BLESSING, true);
}
src/server/scripts/Kalimdor/zone_the_barrens.cpp
+3 -3
View File
@@ -31,6 +31,7 @@ npc_twiggy_flathead
npc_wizzlecrank_shredder
EndContentData */
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "Player.h"
#include "ScriptedCreature.h"
@@ -52,8 +53,7 @@ enum Gilthares
SAY_GIL_SWEET = 6,
SAY_GIL_FREED = 7,
QUEST_FREE_FROM_HOLD = 898,
AREA_MERCHANT_COAST = 391
QUEST_FREE_FROM_HOLD = 898
};
class npc_gilthares : public CreatureScript
@@ -124,7 +124,7 @@ public:
return;
//only aggro text if not player and only in this area
if (!who->IsPlayer() && me->GetAreaId() == AREA_MERCHANT_COAST)
if (!who->IsPlayer() && me->GetAreaId() == AREA_THE_MERCHANT_COAST)
{
//appears to be pretty much random (possible only if escorter not in combat with who yet?)
Talk(SAY_GIL_AGGRO, who);
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ BossBoundaryData const boundaries =
class instance_azjol_nerub : public InstanceMapScript
{
public:
instance_azjol_nerub() : InstanceMapScript("instance_azjol_nerub", 601) { }
instance_azjol_nerub() : InstanceMapScript("instance_azjol_nerub", MAP_AZJOL_NERUB) { }
struct instance_azjol_nerub_InstanceScript : public InstanceScript
{
src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ DoorData const doorData[] =
class instance_ahnkahet : public InstanceMapScript
{
public:
instance_ahnkahet() : InstanceMapScript(AhnKahetScriptName, 619) { }
instance_ahnkahet() : InstanceMapScript(AhnKahetScriptName, MAP_AHN_KAHET_THE_OLD_KINGDOM) { }
struct instance_ahnkahet_InstanceScript : public InstanceScript
{
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ BossBoundaryData const boundaries =
class instance_obsidian_sanctum : public InstanceMapScript
{
public:
instance_obsidian_sanctum() : InstanceMapScript("instance_obsidian_sanctum", 615) { }
instance_obsidian_sanctum() : InstanceMapScript("instance_obsidian_sanctum", MAP_THE_OBSIDIAN_SANCTUM) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+3 -2
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "GameObjectAI.h"
#include "MapMgr.h"
@@ -187,7 +188,7 @@ public:
bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
{
InstanceScript* instance = _owner->GetInstanceScript();
if (!instance || _owner->GetMapId() != 724)
if (!instance || _owner->GetMapId() != MAP_THE_RUBY_SANCTUM)
return true;
if (instance->GetBossState(DATA_HALION) != IN_PROGRESS)
@@ -950,7 +951,7 @@ public:
if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE)
return;
if (!GetTarget()->GetInstanceScript() || !GetTarget()->GetInstanceScript()->IsEncounterInProgress() || GetTarget()->GetMapId() != 724)
if (!GetTarget()->GetInstanceScript() || !GetTarget()->GetInstanceScript()->IsEncounterInProgress() || GetTarget()->GetMapId() != MAP_THE_RUBY_SANCTUM)
return;
GetTarget()->CastCustomSpell(_summonSpellId, SPELLVALUE_BASE_POINT1, GetAura()->GetStackAmount(), GetTarget(), TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ DoorData const doorData[] =
class instance_ruby_sanctum : public InstanceMapScript
{
public:
instance_ruby_sanctum() : InstanceMapScript("instance_ruby_sanctum", 724) { }
instance_ruby_sanctum() : InstanceMapScript("instance_ruby_sanctum", MAP_THE_RUBY_SANCTUM) { }
struct instance_ruby_sanctum_InstanceMapScript : public InstanceScript
{
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ class Group;
class instance_trial_of_the_champion : public InstanceMapScript
{
public:
instance_trial_of_the_champion() : InstanceMapScript("instance_trial_of_the_champion", 650) { }
instance_trial_of_the_champion() : InstanceMapScript("instance_trial_of_the_champion", MAP_TRIAL_OF_THE_CHAMPION) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ std::map<uint32, bool> validDedicatedInsanityItems;
class instance_trial_of_the_crusader : public InstanceMapScript
{
public:
instance_trial_of_the_crusader() : InstanceMapScript("instance_trial_of_the_crusader", 649) { }
instance_trial_of_the_crusader() : InstanceMapScript("instance_trial_of_the_crusader", MAP_TRIAL_OF_THE_CRUSADER) { }
struct instance_trial_of_the_crusader_InstanceMapScript : public InstanceScript
{
src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ DoorData const doorData[] =
class instance_drak_tharon_keep : public InstanceMapScript
{
public:
instance_drak_tharon_keep() : InstanceMapScript("instance_drak_tharon_keep", 600) { }
instance_drak_tharon_keep() : InstanceMapScript("instance_drak_tharon_keep", MAP_DRAK_THARON_KEEP) { }
struct instance_drak_tharon_keep_InstanceScript : public InstanceScript
{
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ BossBoundaryData const boundaries =
class instance_forge_of_souls : public InstanceMapScript
{
public:
instance_forge_of_souls() : InstanceMapScript("instance_forge_of_souls", 632) { }
instance_forge_of_souls() : InstanceMapScript("instance_forge_of_souls", MAP_THE_FORGE_OF_SOULS) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ private:
class instance_halls_of_reflection : public InstanceMapScript
{
public:
instance_halls_of_reflection() : InstanceMapScript("instance_halls_of_reflection", 668) { }
instance_halls_of_reflection() : InstanceMapScript("instance_halls_of_reflection", MAP_HALLS_OF_REFLECTION) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
class instance_pit_of_saron : public InstanceMapScript
{
public:
instance_pit_of_saron() : InstanceMapScript("instance_pit_of_saron", 658) { }
instance_pit_of_saron() : InstanceMapScript("instance_pit_of_saron", MAP_PIT_OF_SARON) { }
struct instance_pit_of_saron_InstanceScript : public InstanceScript
{
src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ DoorData const doorData[] =
class instance_gundrak : public InstanceMapScript
{
public:
instance_gundrak() : InstanceMapScript("instance_gundrak", 604) { }
instance_gundrak() : InstanceMapScript("instance_gundrak", MAP_GUNDRAK) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+3 -2
View File
@@ -16,6 +16,7 @@
*/
#include "AchievementCriteriaScript.h"
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "GridNotifiers.h"
#include "ObjectMgr.h"
@@ -798,7 +799,7 @@ class spell_blood_queen_vampiric_bite : public SpellScript
SpellCastResult CheckTarget()
{
if (GetExplTargetUnit()->GetMapId() != 631)
if (GetExplTargetUnit()->GetMapId() != MAP_ICECROWN_CITADEL)
return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW;
if (IsVampire(GetExplTargetUnit()))
{
@@ -819,7 +820,7 @@ class spell_blood_queen_vampiric_bite : public SpellScript
return;
}
if (!GetCaster()->IsPlayer() || GetCaster()->GetMapId() != 631)
if (!GetCaster()->IsPlayer() || GetCaster()->GetMapId() != MAP_ICECROWN_CITADEL)
return;
InstanceScript* instance = GetCaster()->GetInstanceScript();
if (!instance || instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != IN_PROGRESS)
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+1
View File
@@ -16,6 +16,7 @@
*/
#include "AchievementCriteriaScript.h"
#include "AreaDefines.h"
#include "Config.h"
#include "CreatureScript.h"
#include "CreatureTextMgr.h"
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+1
View File
@@ -16,6 +16,7 @@
*/
#include "AchievementCriteriaScript.h"
#include "AreaDefines.h"
#include "Cell.h"
#include "CellImpl.h"
#include "CreatureScript.h"
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+2 -1
View File
@@ -16,6 +16,7 @@
*/
#include "icecrown_citadel.h"
#include "AreaDefines.h"
#include "AreaTriggerScript.h"
#include "Cell.h"
#include "CellImpl.h"
@@ -2397,7 +2398,7 @@ class spell_icc_yd_summon_undead : public SpellScript
void HandleDummyLaunch(SpellEffIndex /*effIndex*/)
{
if (Unit* c = GetCaster())
if (c->GetMapId() == 631)
if (c->GetMapId() == MAP_ICECROWN_CITADEL)
for (uint8 i = 0; i < 5; ++i)
c->CastSpell(c, 71302, true);
}
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
-6
View File
@@ -565,12 +565,6 @@ enum PutricideEventFlags
PUTRICIDE_EVENT_FLAG_TRAP_FINISHED = 8,
};
enum AreaIds
{
AREA_ICECROWN_CITADEL = 4812,
AREA_THE_FROZEN_THRONE = 4859,
};
enum ItemIds
{
ITEM_GOBLIN_ROCKET_PACK = 49278
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+7 -6
View File
@@ -16,6 +16,7 @@
*/
#include "AccountMgr.h"
#include "AreaDefines.h"
#include "CreatureTextMgr.h"
#include "Group.h"
#include "InstanceMapScript.h"
@@ -199,7 +200,7 @@ private:
class instance_icecrown_citadel : public InstanceMapScript
{
public:
instance_icecrown_citadel() : InstanceMapScript(ICCScriptName, 631) { }
instance_icecrown_citadel() : InstanceMapScript(ICCScriptName, MAP_ICECROWN_CITADEL) { }
struct instance_icecrown_citadel_InstanceMapScript : public InstanceScript
{
@@ -243,11 +244,11 @@ public:
void OnPlayerAreaUpdate(Player* player, uint32 /*oldArea*/, uint32 newArea) override
{
if (newArea == 4890 /*Putricide's Laboratory of Alchemical Horrors and Fun*/ ||
newArea == 4891 /*The Sanctum of Blood*/ ||
newArea == 4889 /*The Frost Queen's Lair*/ ||
newArea == 4859 /*The Frozen Throne*/ ||
newArea == 4910 /*Frostmourne*/)
if (newArea == AREA_PUTRICIDES_LABORATORY_OF_ALCHEMICAL_HORRORS_AND_FUN ||
newArea == AREA_THE_SANCTUM_OF_BLOOD ||
newArea == AREA_THE_FROST_QUEENS_LAIR ||
newArea == AREA_THE_FROZEN_THRONE ||
newArea == AREA_FROSTMOURNE)
{
player->SendInitWorldStates(player->GetZoneId(), player->GetAreaId());
}
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ static constexpr std::array<uint32, HorsemanCount> HorsemanDataGroup
static WorldLocation const SapphironTeleportPos
{
NaxxramasMapId, 3498.300049f, -5349.490234f, 144.968002f, 1.3698910f
MAP_NAXXRAMAS, 3498.300049f, -5349.490234f, 144.968002f, 1.3698910f
};
static DoorData const doorData[]
@@ -787,7 +787,7 @@ public:
void AddSC_instance_naxxramas()
{
RegisterInstanceScript(instance_naxxramas, NaxxramasMapId);
RegisterInstanceScript(instance_naxxramas, MAP_NAXXRAMAS);
RegisterNaxxramasCreatureAI(npc_mr_bigglesworth);
RegisterNaxxramasCreatureAI(npc_living_poison);
RegisterNaxxramasCreatureAI(npc_naxxramas_trigger);
src/server/scripts/Northrend/Naxxramas/naxxramas.h
-1
View File
@@ -305,7 +305,6 @@ enum NaxxramasMisc
SOUND_SCREAM = 8873
};
static constexpr uint32 NaxxramasMapId = 533;
static constexpr uint8 HeiganEruptSectionCount = 4;
static constexpr uint8 HorsemanCount = 4;
static constexpr uint8 AbominationKillCountReq = 18;
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ bool EoEDrakeEnterVehicleEvent::Execute(uint64 /*eventTime*/, uint32 /*updateTim
class instance_eye_of_eternity : public InstanceMapScript
{
public:
instance_eye_of_eternity() : InstanceMapScript("instance_eye_of_eternity", 616) { }
instance_eye_of_eternity() : InstanceMapScript("instance_eye_of_eternity", MAP_THE_EYE_OF_ETERNITY) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ DoorData const doorData[] =
class instance_nexus : public InstanceMapScript
{
public:
instance_nexus() : InstanceMapScript("instance_nexus", 576) { }
instance_nexus() : InstanceMapScript("instance_nexus", MAP_THE_NEXUS) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
class instance_oculus : public InstanceMapScript
{
public:
instance_oculus() : InstanceMapScript("instance_oculus", 578) { }
instance_oculus() : InstanceMapScript("instance_oculus", MAP_THE_OCULUS) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
class instance_halls_of_lightning : public InstanceMapScript
{
public:
instance_halls_of_lightning() : InstanceMapScript("instance_halls_of_lightning", 602) { }
instance_halls_of_lightning() : InstanceMapScript("instance_halls_of_lightning", MAP_HALLS_OF_LIGHTNING) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
class instance_halls_of_stone : public InstanceMapScript
{
public:
instance_halls_of_stone() : InstanceMapScript("instance_halls_of_stone", 599) { }
instance_halls_of_stone() : InstanceMapScript("instance_halls_of_stone", MAP_HALLS_OF_STONE) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+1 -5
View File
@@ -16,6 +16,7 @@
*/
#include "AchievementCriteriaScript.h"
#include "AreaDefines.h"
#include "CellImpl.h"
#include "CombatAI.h"
#include "CreatureScript.h"
@@ -1575,11 +1576,6 @@ class spell_systems_shutdown_aura : public AuraScript
class FlameLeviathanPursuedTargetSelector
{
enum Area
{
AREA_FORMATION_GROUNDS = 4652,
};
public:
explicit FlameLeviathanPursuedTargetSelector() {};
src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+2 -1
View File
@@ -17,6 +17,7 @@
#include "AccountMgr.h"
#include "AchievementCriteriaScript.h"
#include "AreaDefines.h"
#include "BanMgr.h"
#include "CreatureScript.h"
#include "GameObjectScript.h"
@@ -527,7 +528,7 @@ class spell_mark_of_the_faceless_periodic_aura : public AuraScript
{
if (Unit* caster = GetCaster())
if (Unit* target = GetTarget())
if (target->GetMapId() == 603)
if (target->GetMapId() == MAP_ULDUAR)
{
int32 dmg = 5000;
caster->CastCustomSpell(target, SPELL_MARK_OF_THE_FACELESS_EFFECT, 0, &dmg, 0, true);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+2 -1
View File
@@ -16,6 +16,7 @@
*/
#include "AchievementCriteriaScript.h"
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "PassiveAI.h"
#include "Player.h"
@@ -1244,7 +1245,7 @@ class spell_hodir_biting_cold_player_aura : public AuraScript
{
if (Unit* target = GetTarget())
{
if (target->GetMapId() == 603)
if (target->GetMapId() == MAP_ULDUAR)
SetDuration(GetMaxDuration());
if (target->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER))
return;
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+3 -2
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "GameTime.h"
#include "InstanceMapScript.h"
@@ -29,7 +30,7 @@
class instance_ulduar : public InstanceMapScript
{
public:
instance_ulduar() : InstanceMapScript("instance_ulduar", 603) { }
instance_ulduar() : InstanceMapScript("instance_ulduar", MAP_ULDUAR) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
@@ -1091,7 +1092,7 @@ public:
if (Creature* algalon = instance->GetCreature(m_uiAlgalonGUID))
algalon->AI()->DoAction(ACTION_FEEDS_ON_TEARS_FAILED);
}
else if (unit->IsCreature() && unit->GetAreaId() == 4656 /*Conservatory of Life*/)
else if (unit->IsCreature() && unit->GetAreaId() == AREA_THE_CONSERVATORY_OF_LIFE)
{
if (GameTime::GetGameTime().count() > (m_conspeedatoryAttempt + DAY))
{
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ ObjectData const creatureData[] =
class instance_utgarde_keep : public InstanceMapScript
{
public:
instance_utgarde_keep() : InstanceMapScript("instance_utgarde_keep", 574) { }
instance_utgarde_keep() : InstanceMapScript("instance_utgarde_keep", MAP_UTGARDE_KEEP) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
class instance_utgarde_pinnacle : public InstanceMapScript
{
public:
instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { }
instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", MAP_UTGARDE_PINNACLE) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
class instance_vault_of_archavon : public InstanceMapScript
{
public:
instance_vault_of_archavon() : InstanceMapScript("instance_vault_of_archavon", 624) { }
instance_vault_of_archavon() : InstanceMapScript("instance_vault_of_archavon", MAP_VAULT_OF_ARCHAVON) { }
struct instance_vault_of_archavon_InstanceMapScript : public InstanceScript
{
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ enum vYells
class instance_violet_hold : public InstanceMapScript
{
public:
instance_violet_hold() : InstanceMapScript("instance_violet_hold", 608) { }
instance_violet_hold() : InstanceMapScript("instance_violet_hold", MAP_VIOLET_HOLD) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
src/server/scripts/Northrend/zone_borean_tundra.cpp
+2 -2
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "PassiveAI.h"
#include "Player.h"
@@ -2043,7 +2044,6 @@ public:
// NPC 25301: Counselor Talbot
enum CounselorTalbot
{
AREA_LAST_RITES = 4128,
SPELL_DEFLECTION = 51009,
SPELL_SOUL_BLAST = 50992,
SPELL_VAMPIRIC_BOLT = 51016,
@@ -2077,7 +2077,7 @@ public:
return;
}
if (me->GetAreaId() == AREA_LAST_RITES)
if (me->GetAreaId() == AREA_NAXXANAR)
{
_events.Update(diff);
src/server/scripts/Northrend/zone_dalaran.cpp
+3 -6
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "MoveSplineInit.h"
#include "Player.h"
@@ -444,9 +445,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
// 4395 Dalaran
// 4569 Sewer Exit Pipe
if (!who || !who->IsInWorld()|| who->GetZoneId() != 4395 || who->GetAreaId() == 4569)
if (!who || !who->IsInWorld()|| who->GetZoneId() != AREA_DALARAN || who->GetAreaId() == AREA_SEWER_EXIT_PIPE)
return;
if (!me->IsWithinDist(who, 5.0f, false))
@@ -501,8 +500,6 @@ public:
enum MinigobData
{
ZONE_DALARAN = 4395,
SPELL_MANABONKED = 61834,
SPELL_TELEPORT_VISUAL = 51347,
SPELL_IMPROVED_BLINK = 61995,
@@ -539,7 +536,7 @@ struct npc_minigob_manabonk : public ScriptedAI
me->GetMap()->DoForAllPlayers([&](Player* player)
{
if (player->GetZoneId() == ZONE_DALARAN && !player->IsFlying() && !player->IsMounted() && !player->IsGameMaster())
if (player->GetZoneId() == AREA_DALARAN && !player->IsFlying() && !player->IsMounted() && !player->IsGameMaster())
playerInDalaranList.push_back(player);
});
src/server/scripts/Northrend/zone_dragonblight.cpp
+2 -2
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "AreaTriggerScript.h"
#include "CellImpl.h"
#include "Chat.h"
@@ -656,8 +657,7 @@ enum WintergardeGryphon
POINT_TAKE_OFF = 2,
QUEST_FLIGHT_OF_THE_WINTERGARDE_DEFENDER = 12237,
GO_TEMP_GRYPHON_STATION = 188679,
AREA_WINTERGARDE_KEEP = 4177
GO_TEMP_GRYPHON_STATION = 188679
};
class npc_wintergarde_gryphon : public VehicleAI
src/server/scripts/Northrend/zone_icecrown.cpp
+1 -3
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CombatAI.h"
#include "CreatureScript.h"
#include "MoveSplineInit.h"
@@ -1469,9 +1470,6 @@ class spell_deliver_gryphon : public SpellScript
enum GuardianPavilion
{
SPELL_TRESPASSER_H = 63987,
AREA_SUNREAVER_PAVILION = 4676,
AREA_SILVER_COVENANT_PAVILION = 4677,
SPELL_TRESPASSER_A = 63986,
};
src/server/scripts/Northrend/zone_storm_peaks.cpp
+1 -2
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CombatAI.h"
#include "CreatureScript.h"
#include "Player.h"
@@ -801,8 +802,6 @@ enum FreedProtoDrake
{
NPC_DRAKE = 29709,
AREA_VALLEY_OF_ANCIENT_WINTERS = 4437,
TEXT_EMOTE = 0,
SPELL_KILL_CREDIT_PRISONER = 55144,
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
+27 -22
View File
@@ -25,7 +25,7 @@ const uint32 EP_AllianceBuffs[4] = {11413, 11414, 11415, 1386};
const uint32 EP_HordeBuffs[4] = {30880, 30683, 30682, 29520};
const uint32 EP_GraveyardZone = 139;
const uint32 EP_GraveyardZone = AREA_EASTERN_PLAGUELANDS;
const uint32 EP_GraveyardId = 927;
@@ -36,7 +36,12 @@ const uint32 EP_CGT_CM = 17689;
const uint32 EP_NPT_CM = 17696;
const uint32 EP_PWT_CM = 17698;
const uint32 EPBuffZones[EPBuffZonesNum] = {139, 2017, 2057};
const uint32 EPBuffZones[EPBuffZonesNum] =
{
AREA_EASTERN_PLAGUELANDS,
AREA_STRATHOLME,
AREA_SCHOLOMANCE
};
//enum EP_TaxiNodes
//{
@@ -76,18 +81,18 @@ enum EP_Towers
const go_type EPCapturePoints[EP_TOWER_NUM] =
{
{182097, 0, 2574.51f, -4794.89f, 144.704f, -1.45003f, -0.097056f, 0.095578f, -0.656229f, 0.742165f},
{181899, 0, 3181.08f, -4379.36f, 174.123f, -2.03472f, -0.065392f, 0.119494f, -0.842275f, 0.521553f},
{182098, 0, 2962.71f, -3042.31f, 154.789f, 2.08426f, -0.074807f, -0.113837f, 0.855928f, 0.49883f},
{182096, 0, 1860.85f, -3731.23f, 196.716f, -2.53214f, 0.033967f, -0.131914f, 0.944741f, -0.298177f}
{182097, MAP_EASTERN_KINGDOMS, 2574.51f, -4794.89f, 144.704f, -1.45003f, -0.097056f, 0.095578f, -0.656229f, 0.742165f},
{181899, MAP_EASTERN_KINGDOMS, 3181.08f, -4379.36f, 174.123f, -2.03472f, -0.065392f, 0.119494f, -0.842275f, 0.521553f},
{182098, MAP_EASTERN_KINGDOMS, 2962.71f, -3042.31f, 154.789f, 2.08426f, -0.074807f, -0.113837f, 0.855928f, 0.49883f},
{182096, MAP_EASTERN_KINGDOMS, 1860.85f, -3731.23f, 196.716f, -2.53214f, 0.033967f, -0.131914f, 0.944741f, -0.298177f}
};
const go_type EPTowerFlags[EP_TOWER_NUM] =
{
{182106, 0, 2569.60f, -4772.93f, 115.399f, 2.72271f, 0.0f, 0.0f, 0.978148f, 0.207912f},
{182106, 0, 3148.17f, -4365.51f, 145.029f, 1.53589f, 0.0f, 0.0f, 0.694658f, 0.71934f},
{182106, 0, 2992.63f, -3022.95f, 125.593f, 3.03687f, 0.0f, 0.0f, 0.99863f, 0.052336f},
{182106, 0, 1838.42f, -3703.56f, 167.713f, 0.890118f, 0.0f, 0.0f, 0.430511f, 0.902585f}
{182106, MAP_EASTERN_KINGDOMS, 2569.60f, -4772.93f, 115.399f, 2.72271f, 0.0f, 0.0f, 0.978148f, 0.207912f},
{182106, MAP_EASTERN_KINGDOMS, 3148.17f, -4365.51f, 145.029f, 1.53589f, 0.0f, 0.0f, 0.694658f, 0.71934f},
{182106, MAP_EASTERN_KINGDOMS, 2992.63f, -3022.95f, 125.593f, 3.03687f, 0.0f, 0.0f, 0.99863f, 0.052336f},
{182106, MAP_EASTERN_KINGDOMS, 1838.42f, -3703.56f, 167.713f, 0.890118f, 0.0f, 0.0f, 0.430511f, 0.902585f}
};
//const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691, 10699, 10701, 10705};
@@ -101,20 +106,20 @@ const uint8 EP_EWT_NUM_CREATURES = 5;
// should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT
const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] =
{
{17635, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f},
{17647, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f},
{17647, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f},
{17647, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f},
{17647, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f}
{17635, MAP_EASTERN_KINGDOMS, 3167.61f, -4352.09f, 138.20f, 4.5811f},
{17647, MAP_EASTERN_KINGDOMS, 3172.74f, -4352.99f, 139.14f, 4.9873f},
{17647, MAP_EASTERN_KINGDOMS, 3165.89f, -4354.46f, 138.67f, 3.7244f},
{17647, MAP_EASTERN_KINGDOMS, 3164.65f, -4350.26f, 138.22f, 2.4794f},
{17647, MAP_EASTERN_KINGDOMS, 3169.91f, -4349.68f, 138.37f, 0.7444f}
};
const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] =
{
{17995, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f},
{17996, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f},
{17996, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f},
{17996, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f},
{17996, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f}
{17995, MAP_EASTERN_KINGDOMS, 3167.61f, -4352.09f, 138.20f, 4.5811f},
{17996, MAP_EASTERN_KINGDOMS, 3172.74f, -4352.99f, 139.14f, 4.9873f},
{17996, MAP_EASTERN_KINGDOMS, 3165.89f, -4354.46f, 138.67f, 3.7244f},
{17996, MAP_EASTERN_KINGDOMS, 3164.65f, -4350.26f, 138.22f, 2.4794f},
{17996, MAP_EASTERN_KINGDOMS, 3169.91f, -4349.68f, 138.37f, 0.7444f}
};
enum EP_TowerStates
@@ -129,10 +134,10 @@ enum EP_TowerStates
};
// when spawning, pay attention at setting the faction manually!
const creature_type EP_PWT_FlightMaster = {17209, 0, 2987.5f, -3049.11f, 120.126f, 5.75959f};
const creature_type EP_PWT_FlightMaster = {17209, MAP_EASTERN_KINGDOMS, 2987.5f, -3049.11f, 120.126f, 5.75959f};
// after spawning, modify the faction so that only the controller will be able to use it with SetUInt32Value(GAMEOBJECT_FACTION, faction_id);
const go_type EP_NPT_LordaeronShrine = {181682, 0, 3167.72f, -4355.91f, 138.785f, 1.69297f, 0.0f, 0.0f, 0.748956f, 0.66262f};
const go_type EP_NPT_LordaeronShrine = {181682, MAP_EASTERN_KINGDOMS, 3167.72f, -4355.91f, 138.785f, 1.69297f, 0.0f, 0.0f, 0.748956f, 0.66262f};
class OutdoorPvPEP;
src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ void OutdoorPvPGH::SendRemoveWorldStates(Player* player)
OPvPCapturePointGH::OPvPCapturePointGH(OutdoorPvP* pvp) : OPvPCapturePoint(pvp)
{
SetCapturePointData(189310, 571, 2483.68f, -1873.6f, 10.6877f, -0.104719f, 0.0f, 0.0f, 0.0f, 1.0f);
SetCapturePointData(189310, MAP_NORTHREND, 2483.68f, -1873.6f, 10.6877f, -0.104719f, 0.0f, 0.0f, 0.0f, 1.0f);
}
void OPvPCapturePointGH::FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet)
@@ -108,7 +108,7 @@ void OPvPCapturePointGH::ChangeState()
break;
}
Map* map = sMapMgr->FindMap(571, 0);
Map* map = sMapMgr->FindMap(MAP_NORTHREND, 0);
auto bounds = map->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId);
for (auto itr = bounds.first; itr != bounds.second; ++itr)
itr->second->SetGoArtKit(artkit);
src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+1 -1
View File
@@ -249,7 +249,7 @@ void OPvPCapturePointHP::ChangeState()
break;
}
Map* map = sMapMgr->FindMap(530, 0);
Map* map = sMapMgr->FindMap(MAP_OUTLAND, 0);
auto bounds = map->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId);
for (auto itr = bounds.first; itr != bounds.second; ++itr)
itr->second->SetGoArtKit(artkit);
src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
+16 -8
View File
@@ -22,8 +22,16 @@
#include "WorldStateDefines.h"
#define OutdoorPvPHPBuffZonesNum 6
// HP, citadel, ramparts, blood furnace, shattered halls, mag's lair
const uint32 OutdoorPvPHPBuffZones[OutdoorPvPHPBuffZonesNum] = { 3483, 3563, 3562, 3713, 3714, 3836 };
const uint32 OutdoorPvPHPBuffZones[OutdoorPvPHPBuffZonesNum] =
{
AREA_HELLFIRE_PENINSULA,
AREA_HELLFIRE_CITADEL,
AREA_HELLFIRE_RAMPARTS,
AREA_THE_BLOOD_FURNACE,
AREA_THE_SHATTERED_HALLS,
AREA_MAGTHERIDONS_LAIR
};
enum OutdoorPvPHPSpells
{
@@ -61,16 +69,16 @@ const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66, 63, 69};
const go_type HPCapturePoints[HP_TOWER_NUM] =
{
{182175, 530, -471.462f, 3451.09f, 34.6432f, 0.174533f, 0.0f, 0.0f, 0.087156f, 0.996195f}, // 0 - Broken Hill
{182174, 530, -184.889f, 3476.93f, 38.205f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f}, // 1 - Overlook
{182173, 530, -290.016f, 3702.42f, 56.6729f, 0.034907f, 0.0f, 0.0f, 0.017452f, 0.999848f} // 2 - Stadium
{182175, MAP_OUTLAND, -471.462f, 3451.09f, 34.6432f, 0.174533f, 0.0f, 0.0f, 0.087156f, 0.996195f}, // 0 - Broken Hill
{182174, MAP_OUTLAND, -184.889f, 3476.93f, 38.205f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f}, // 1 - Overlook
{182173, MAP_OUTLAND, -290.016f, 3702.42f, 56.6729f, 0.034907f, 0.0f, 0.0f, 0.017452f, 0.999848f} // 2 - Stadium
};
const go_type HPTowerFlags[HP_TOWER_NUM] =
{
{183514, 530, -467.078f, 3528.17f, 64.7121f, 3.14159f, 0.0f, 0.0f, 1.0f, 0.0f}, // 0 broken hill
{182525, 530, -187.887f, 3459.38f, 60.0403f, -3.12414f, 0.0f, 0.0f, 0.999962f, -0.008727f}, // 1 overlook
{183515, 530, -289.610f, 3696.83f, 75.9447f, 3.12414f, 0.0f, 0.0f, 0.999962f, 0.008727f} // 2 stadium
{183514, MAP_OUTLAND, -467.078f, 3528.17f, 64.7121f, 3.14159f, 0.0f, 0.0f, 1.0f, 0.0f}, // 0 broken hill
{182525, MAP_OUTLAND, -187.887f, 3459.38f, 60.0403f, -3.12414f, 0.0f, 0.0f, 0.999962f, -0.008727f}, // 1 overlook
{183515, MAP_OUTLAND, -289.610f, 3696.83f, 75.9447f, 3.12414f, 0.0f, 0.0f, 0.999962f, 0.008727f} // 2 stadium
};
class OPvPCapturePointHP : public OPvPCapturePoint
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+5 -4
View File
@@ -16,6 +16,7 @@
*/
#include "OutdoorPvPNA.h"
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "GameGraveyard.h"
#include "GridNotifiers.h"
@@ -59,7 +60,7 @@ void OutdoorPvPNA::HandleKill(Player* killer, Unit* killed)
// creature kills must be notified, even if not inside objective / not outdoor pvp active
// player kills only count if active and inside objective
if ((groupGuy->IsOutdoorPvPActive() && groupGuy->GetAreaId() == NA_HALAA_ZONE_ID) || killed->IsCreature())
if ((groupGuy->IsOutdoorPvPActive() && groupGuy->GetAreaId() == AREA_HALAA) || killed->IsCreature())
{
HandleKillImpl(groupGuy, killed);
}
@@ -68,7 +69,7 @@ void OutdoorPvPNA::HandleKill(Player* killer, Unit* killed)
else
{
// creature kills must be notified, even if not inside objective / not outdoor pvp active
if (killer && ((killer->IsOutdoorPvPActive() && killer->ToPlayer()->GetAreaId() == NA_HALAA_ZONE_ID) || killed->IsCreature()))
if (killer && ((killer->IsOutdoorPvPActive() && killer->ToPlayer()->GetAreaId() == AREA_HALAA) || killed->IsCreature()))
{
HandleKillImpl(killer, killed);
}
@@ -264,7 +265,7 @@ OPvPCapturePointNA::OPvPCapturePointNA(OutdoorPvP* pvp) :
m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0),
m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME), m_canRecap(true)
{
SetCapturePointData(182210, 530, -1572.57f, 7945.3f, -22.475f, 2.05949f, 0.0f, 0.0f, 0.857167f, 0.515038f);
SetCapturePointData(182210, MAP_OUTLAND, -1572.57f, 7945.3f, -22.475f, 2.05949f, 0.0f, 0.0f, 0.857167f, 0.515038f);
}
bool OutdoorPvPNA::SetupOutdoorPvP()
@@ -815,7 +816,7 @@ void OPvPCapturePointNA::ChangeState()
break;
}
auto bounds = sMapMgr->FindMap(530, 0)->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId);
auto bounds = sMapMgr->FindMap(MAP_OUTLAND, 0)->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId);
for (auto itr = bounds.first; itr != bounds.second; ++itr)
itr->second->SetGoArtKit(artkit);
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+26 -28
View File
@@ -34,13 +34,11 @@ const uint32 NA_CREDIT_MARKER = 24867;
const uint32 NA_GUARDS_MAX = 15;
const uint32 NA_BUFF_ZONE = 3518;
const uint32 NA_BUFF_ZONE = AREA_NAGRAND;
const uint32 NA_HALAA_GRAVEYARD = 993;
const uint32 NA_HALAA_GRAVEYARD_ZONE = 3518; // need to add zone id, not area id
uint32 const NA_HALAA_ZONE_ID = 3628; // halaa zone id
const uint32 NA_HALAA_GRAVEYARD_ZONE = AREA_NAGRAND; // need to add zone id, not area id
const uint32 NA_RESPAWN_TIME = 3600000; // one hour to capture after defeating all guards
@@ -99,39 +97,39 @@ enum HalaaCreaturesSpawn
// spawned when the alliance is attacking, horde is in control
const go_type HordeControlGOs[NA_CONTROL_GO_NUM] =
{
{182267, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_ROOST_SOUTH
{182280, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_ROOST_WEST
{182281, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_ROOST_NORTH
{182282, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_ROOST_EAST
{182267, MAP_OUTLAND, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_ROOST_SOUTH
{182280, MAP_OUTLAND, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_ROOST_WEST
{182281, MAP_OUTLAND, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_ROOST_NORTH
{182282, MAP_OUTLAND, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_ROOST_EAST
{182222, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_BOMB_WAGON_SOUTH
{182272, 530, -1517.44f, 8140.24f, -20.17f, -2.8099f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_BOMB_WAGON_WEST
{182273, 530, -1389.53f, 7782.50f, -11.62f, -1.5184f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_BOMB_WAGON_NORTH
{182274, 530, -1662.28f, 7735.00f, -15.96f, 1.8845f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_BOMB_WAGON_EAST
{182222, MAP_OUTLAND, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_BOMB_WAGON_SOUTH
{182272, MAP_OUTLAND, -1517.44f, 8140.24f, -20.17f, -2.8099f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_BOMB_WAGON_WEST
{182273, MAP_OUTLAND, -1389.53f, 7782.50f, -11.62f, -1.5184f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_BOMB_WAGON_NORTH
{182274, MAP_OUTLAND, -1662.28f, 7735.00f, -15.96f, 1.8845f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_BOMB_WAGON_EAST
{182266, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH
{182275, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_ALLY_ROOST_WEST
{182276, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_ALLY_ROOST_NORTH
{182277, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_ALLY_ROOST_EAST
{182266, MAP_OUTLAND, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH
{182275, MAP_OUTLAND, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_ALLY_ROOST_WEST
{182276, MAP_OUTLAND, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_ALLY_ROOST_NORTH
{182277, MAP_OUTLAND, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_ALLY_ROOST_EAST
};
// spawned when the horde is attacking, alliance is in control
const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] =
{
{182301, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_ROOST_SOUTH
{182302, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_ROOST_WEST
{182303, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_ROOST_NORTH
{182304, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_ROOST_EAST
{182301, MAP_OUTLAND, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_ROOST_SOUTH
{182302, MAP_OUTLAND, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_ROOST_WEST
{182303, MAP_OUTLAND, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_ROOST_NORTH
{182304, MAP_OUTLAND, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_ROOST_EAST
{182305, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_BOMB_WAGON_SOUTH
{182306, 530, -1517.44f, 8140.24f, -20.17f, -2.8099f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_BOMB_WAGON_WEST
{182307, 530, -1389.53f, 7782.50f, -11.62f, -1.5184f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_BOMB_WAGON_NORTH
{182308, 530, -1662.28f, 7735.00f, -15.96f, 1.8845f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_BOMB_WAGON_EAST
{182305, MAP_OUTLAND, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_BOMB_WAGON_SOUTH
{182306, MAP_OUTLAND, -1517.44f, 8140.24f, -20.17f, -2.8099f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_BOMB_WAGON_WEST
{182307, MAP_OUTLAND, -1389.53f, 7782.50f, -11.62f, -1.5184f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_BOMB_WAGON_NORTH
{182308, MAP_OUTLAND, -1662.28f, 7735.00f, -15.96f, 1.8845f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_BOMB_WAGON_EAST
{182297, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH
{182298, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_HORDE_ROOST_WEST
{182299, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_HORDE_ROOST_NORTH
{182300, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_HORDE_ROOST_EAST
{182297, MAP_OUTLAND, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH
{182298, MAP_OUTLAND, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_HORDE_ROOST_WEST
{182299, MAP_OUTLAND, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_HORDE_ROOST_NORTH
{182300, MAP_OUTLAND, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_HORDE_ROOST_EAST
};
struct HalaaIds
src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
+6 -1
View File
@@ -32,7 +32,12 @@ const uint32 SI_MAX_RESOURCES = 200;
const uint8 OutdoorPvPSIBuffZonesNum = 3;
const uint32 OutdoorPvPSIBuffZones[OutdoorPvPSIBuffZonesNum] = { 1377, 3428, 3429 };
const uint32 OutdoorPvPSIBuffZones[OutdoorPvPSIBuffZonesNum] =
{
AREA_SILITHUS,
AREA_AHN_QIRAJ,
AREA_RUINS_OF_AHN_QIRAJ
};
const uint32 SI_AREATRIGGER_H = 4168;
src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+1 -1
View File
@@ -453,7 +453,7 @@ void OPvPCapturePointTF::ChangeState()
break;
}
auto bounds = sMapMgr->FindMap(530, 0)->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId);
auto bounds = sMapMgr->FindMap(MAP_OUTLAND, 0)->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId);
for (auto itr = bounds.first; itr != bounds.second; ++itr)
itr->second->SetGoArtKit(artkit);
src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
+10 -10
View File
@@ -25,11 +25,11 @@ const uint8 OutdoorPvPTFBuffZonesNum = 5;
const uint32 OutdoorPvPTFBuffZones[OutdoorPvPTFBuffZonesNum] =
{
3519 /*Terokkar Forest*/,
3791 /*Sethekk Halls*/,
3789 /*Shadow Labyrinth*/,
3792 /*Mana-Tombs*/,
3790 /*Auchenai Crypts*/
AREA_TEROKKAR_FOREST,
AREA_SETHEKK_HALLS,
AREA_SHADOW_LABYRINTH,
AREA_MANA_TOMBS,
AREA_AUCHENAI_CRYPTS,
};
// locked for 6 hours after capture
@@ -56,11 +56,11 @@ enum OutdoorPvPTF_TowerType
const go_type TFCapturePoints[TF_TOWER_NUM] =
{
{183104, 530, -3081.65f, 5335.03f, 17.1853f, -2.14675f, 0.0f, 0.0f, 0.878817f, -0.477159f},
{183411, 530, -2939.9f, 4788.73f, 18.987f, 2.77507f, 0.0f, 0.0f, 0.983255f, 0.182236f},
{183412, 530, -3174.94f, 4440.97f, 16.2281f, 1.86750f, 0.0f, 0.0f, 0.803857f, 0.594823f},
{183413, 530, -3603.31f, 4529.15f, 20.9077f, 0.994838f, 0.0f, 0.0f, 0.477159f, 0.878817f},
{183414, 530, -3812.37f, 4899.3f, 17.7249f, 0.087266f, 0.0f, 0.0f, 0.043619f, 0.999048f}
{183104, MAP_OUTLAND, -3081.65f, 5335.03f, 17.1853f, -2.14675f, 0.0f, 0.0f, 0.878817f, -0.477159f},
{183411, MAP_OUTLAND, -2939.9f, 4788.73f, 18.987f, 2.77507f, 0.0f, 0.0f, 0.983255f, 0.182236f},
{183412, MAP_OUTLAND, -3174.94f, 4440.97f, 16.2281f, 1.86750f, 0.0f, 0.0f, 0.803857f, 0.594823f},
{183413, MAP_OUTLAND, -3603.31f, 4529.15f, 20.9077f, 0.994838f, 0.0f, 0.0f, 0.477159f, 0.878817f},
{183414, MAP_OUTLAND, -3812.37f, 4899.3f, 17.7249f, 0.087266f, 0.0f, 0.0f, 0.043619f, 0.999048f}
};
struct tf_tower_world_state
src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+16 -9
View File
@@ -24,10 +24,17 @@
const uint8 OutdoorPvPZMBuffZonesNum = 5;
// the buff is cast in these zones
const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521, 3607, 3717, 3715, 3716};
const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] =
{
AREA_ZANGARMARSH,
AREA_SERPENTSHRINE_CAVERN,
AREA_THE_SLAVE_PENS,
AREA_THE_STEAMVAULT,
AREA_THE_UNDERBOG
};
// linked when the central tower is controlled
const uint32 ZM_GRAVEYARD_ZONE = 3521;
const uint32 ZM_GRAVEYARD_ZONE = AREA_ZANGARMARSH;
// linked when the central tower is controlled
const uint32 ZM_GRAVEYARD_ID = 969;
@@ -47,15 +54,15 @@ enum OutdoorPvPZMSpells
};
// banners 182527, 182528, 182529, gotta check them ingame
const go_type ZM_Banner_A = { 182527, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
const go_type ZM_Banner_H = { 182528, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
const go_type ZM_Banner_N = { 182529, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
const go_type ZM_Banner_A = { 182527, MAP_OUTLAND, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
const go_type ZM_Banner_H = { 182528, MAP_OUTLAND, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
const go_type ZM_Banner_N = { 182529, MAP_OUTLAND, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
// horde field scout spawn data
const creature_type ZM_HordeFieldScout = {18564, 530, 296.625f, 7818.4f, 42.6294f, 5.18363f};
const creature_type ZM_HordeFieldScout = {18564, MAP_OUTLAND, 296.625f, 7818.4f, 42.6294f, 5.18363f};
// alliance field scout spawn data
const creature_type ZM_AllianceFieldScout = {18581, 530, 374.395f, 6230.08f, 22.8351f, 0.593412f};
const creature_type ZM_AllianceFieldScout = {18581, MAP_OUTLAND, 374.395f, 6230.08f, 22.8351f, 0.593412f};
enum ZMCreatureTypes
{
@@ -118,8 +125,8 @@ const uint32 ZMBeaconLoseH[ZM_NUM_BEACONS] =
const go_type ZMCapturePoints[ZM_NUM_BEACONS] =
{
{182523, 530, 303.243f, 6841.36f, 40.1245f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f},
{182522, 530, 336.466f, 7340.26f, 41.4984f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f}
{182523, MAP_OUTLAND, 303.243f, 6841.36f, 40.1245f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f},
{182522, MAP_OUTLAND, 336.466f, 7340.26f, 41.4984f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f}
};
enum ZM_TowerStateMask
src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
class instance_auchenai_crypts : public InstanceMapScript
{
public:
instance_auchenai_crypts() : InstanceMapScript(ACScriptName, 558) { }
instance_auchenai_crypts() : InstanceMapScript(ACScriptName, MAP_AUCHINDOUN_AUCHENAI_CRYPTS) { }
struct instance_auchenai_crypts_InstanceMapScript : public InstanceScript
{
src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
class instance_mana_tombs : public InstanceMapScript
{
public:
instance_mana_tombs() : InstanceMapScript(MTScriptName, 557) { }
instance_mana_tombs() : InstanceMapScript(MTScriptName, MAP_AUCHINDOUN_MANA_TOMBS) { }
struct instance_mana_tombs_InstanceMapScript : public InstanceScript
{
src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ const uint32 anzuSummonEventId = 14797;
class instance_sethekk_halls : public InstanceMapScript
{
public:
instance_sethekk_halls() : InstanceMapScript("instance_sethekk_halls", 556) { }
instance_sethekk_halls() : InstanceMapScript("instance_sethekk_halls", MAP_AUCHINDOUN_SETHEKK_HALLS) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ ObjectData const creatureData[] =
class instance_shadow_labyrinth : public InstanceMapScript
{
public:
instance_shadow_labyrinth() : InstanceMapScript("instance_shadow_labyrinth", 555) { }
instance_shadow_labyrinth() : InstanceMapScript("instance_shadow_labyrinth", MAP_AUCHINDOUN_SHADOW_LABYRINTH) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ BossBoundaryData const boundaries =
class instance_black_temple : public InstanceMapScript
{
public:
instance_black_temple() : InstanceMapScript("instance_black_temple", 564) { }
instance_black_temple() : InstanceMapScript("instance_black_temple", MAP_BLACK_TEMPLE) { }
struct instance_black_temple_InstanceMapScript : public InstanceScript
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+3 -2
View File
@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CreatureScript.h"
#include "InstanceMapScript.h"
#include "InstanceScript.h"
@@ -72,7 +73,7 @@ ObjectData const summonData[] =
class instance_serpent_shrine : public InstanceMapScript
{
public:
instance_serpent_shrine() : InstanceMapScript("instance_serpent_shrine", 548) { }
instance_serpent_shrine() : InstanceMapScript("instance_serpent_shrine", MAP_COILFANG_SERPENTSHRINE_CAVERN) { }
struct instance_serpentshrine_cavern_InstanceMapScript : public InstanceScript
{
@@ -295,7 +296,7 @@ class spell_serpentshrine_cavern_coilfang_water : public AuraScript
{
PreventDefaultAction();
InstanceScript* instance = GetUnitOwner()->GetInstanceScript();
if (!instance || GetUnitOwner()->GetMapId() != 548)
if (!instance || GetUnitOwner()->GetMapId() != MAP_COILFANG_SERPENTSHRINE_CAVERN)
{
SetDuration(0);
return;
src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ ObjectData const creatureData[] =
class instance_the_slave_pens : public InstanceMapScript
{
public:
instance_the_slave_pens() : InstanceMapScript(SPScriptName, 547) { }
instance_the_slave_pens() : InstanceMapScript(SPScriptName, MAP_COILFANG_THE_SLAVE_PENS) { }
struct instance_the_slave_pens_InstanceMapScript : public InstanceScript
{
src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ ObjectData const objectData[] =
class instance_steam_vault : public InstanceMapScript
{
public:
instance_steam_vault() : InstanceMapScript("instance_steam_vault", 545) { }
instance_steam_vault() : InstanceMapScript("instance_steam_vault", MAP_COILFANG_THE_STEAMVAULT) { }
struct instance_steam_vault_InstanceMapScript : public InstanceScript
{
src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ ObjectData const creatureData[] =
class instance_the_underbog : public InstanceMapScript
{
public:
instance_the_underbog() : InstanceMapScript(TheUnderbogScriptName, 546) { }
instance_the_underbog() : InstanceMapScript(TheUnderbogScriptName, MAP_COILFANG_THE_UNDERBOG) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{

Some files were not shown because too many files have changed in this diff Show More