nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-24 22:26:22 +00:00
Code Issues 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

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
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
{

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
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
{

3
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
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))
{

7
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
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;

2
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
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
{

2
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
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
{

2
src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
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
{

2
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
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
{

2
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
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
{

2
src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
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
{

2
src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
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
{

2
src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
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
{

2
src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
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
{

2
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
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
{

2
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
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
{

2
src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
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
{

8
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
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);

2
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
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
{

2
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
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
{

9
src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
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)
{