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

@@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "Battlefield.h"
#include "BattlefieldMgr.h"
#include "Battleground.h"
@@ -539,9 +540,9 @@ class spell_gen_rallying_cry_of_the_dragonslayer : public SpellScript
{
targets.clear();
uint32 zoneId = 1519;
if (GetCaster()->GetMapId() == 1) // Kalimdor
zoneId = 1637;
uint32 zoneId = AREA_STORMWIND_CITY;
if (GetCaster()->GetMapId() == MAP_KALIMDOR)
zoneId = AREA_ORGRIMMAR;
Map::PlayerList const& pList = GetCaster()->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
@@ -1901,8 +1902,6 @@ class spell_gen_feign_death_no_prevent_emotes : public AuraScript
enum Teleporting
{
AREA_VIOLET_CITADEL_SPIRE = 4637,
SPELL_TELEPORT_SPIRE_DOWN = 59316,
SPELL_TELEPORT_SPIRE_UP = 59314
};
@@ -1923,7 +1922,7 @@ class spell_gen_teleporting : public SpellScript
return;
// return from top
if (target->ToPlayer()->GetAreaId() == AREA_VIOLET_CITADEL_SPIRE)
if (target->ToPlayer()->GetAreaId() == AREA_VARGOTHS_RETREAT)
target->CastSpell(target, SPELL_TELEPORT_SPIRE_DOWN, true);
// teleport atop
else
@@ -4051,7 +4050,7 @@ public:
// Triggered spell id dependent on riding skill and zone
bool canFly = false;
uint32 map = GetVirtualMapForMapAndZone(target->GetMapId(), target->GetZoneId());
if (map == 530 || (map == 571 && target->HasSpell(SPELL_COLD_WEATHER_FLYING)))
if (map == MAP_OUTLAND || (map == MAP_NORTHREND && target->HasSpell(SPELL_COLD_WEATHER_FLYING)))
canFly = true;
AreaTableEntry const* area = sAreaTableStore.LookupEntry(target->GetAreaId());