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

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

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
{

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
{

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() {};

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);

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;

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))
{