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

2026-01-21 20:56:23 +00:00 · 2025-05-09 09:48:02 -04:00
parent db62fe8310
commit 52799d76f6
146 changed files with 866 additions and 656 deletions
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -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());
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -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)
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -16,6 +16,7 @@
 */

 #include "AchievementCriteriaScript.h"
+#include "AreaDefines.h"
 #include "Config.h"
 #include "CreatureScript.h"
 #include "CreatureTextMgr.h"
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -16,6 +16,7 @@
 */

 #include "AchievementCriteriaScript.h"
+#include "AreaDefines.h"
 #include "Cell.h"
 #include "CellImpl.h"
 #include "CreatureScript.h"
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -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);
    }
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
@@ -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
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -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());
            }
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -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);
--- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h
+++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
@@ -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;
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -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() {};

--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
@@ -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);
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -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;
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -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))
                {
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -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
    {
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -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);

--- a/src/server/scripts/Northrend/zone_dalaran.cpp
+++ b/src/server/scripts/Northrend/zone_dalaran.cpp
@@ -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);
            });

--- a/src/server/scripts/Northrend/zone_dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
@@ -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
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -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,
 };

--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -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,