ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
146 changed files with 866 additions and 656 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/server/scripts/World/go_scripts.cpp
View file

@ -15,6 +15,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AreaDefines.h"
#include "CellImpl.h"
#include "Chat.h"
#include "CreatureScript.h"
@ -529,21 +530,6 @@ enum BrewfestMusicTime
EVENT_BREWFESTGOBLIN03_TIME = 28000
};
enum BrewfestMusicAreas
{
SILVERMOON = 3430, // Horde
UNDERCITY = 1497,
ORGRIMMAR_1 = 1296,
ORGRIMMAR_2 = 14,
THUNDERBLUFF = 1638,
IRONFORGE_1 = 809, // Alliance
IRONFORGE_2 = 1,
STORMWIND = 12,
EXODAR = 3557,
DARNASSUS = 1657,
SHATTRATH = 3703 // General
};
enum BrewfestMusicEvents
{
EVENT_BM_SELECT_MUSIC = 1,
@ -581,7 +567,7 @@ public:
//Restart the current selected music
_currentMusicEvent = 0;
//Check zone to play correct music
if (me->GetAreaId() == SILVERMOON || me->GetAreaId() == UNDERCITY || me->GetAreaId() == ORGRIMMAR_1 || me->GetAreaId() == ORGRIMMAR_2 || me->GetAreaId() == THUNDERBLUFF)
if (me->GetAreaId() == AREA_EVERSONG_WOODS || me->GetAreaId() == AREA_UNDERCITY || me->GetAreaId() == AREA_ROCKTUSK_FARM || me->GetAreaId() == AREA_DUROTAR || me->GetAreaId() == AREA_THUNDER_BLUFF)
{
switch (rnd)
{
@ -601,7 +587,7 @@ public:
break;
}
}
else if (me->GetAreaId() == IRONFORGE_1 || me->GetAreaId() == IRONFORGE_2 || me->GetAreaId() == STORMWIND || me->GetAreaId() == EXODAR || me->GetAreaId() == DARNASSUS)
else if (me->GetAreaId() == AREA_GATES_OF_IRONFORGE || me->GetAreaId() == AREA_DUN_MOROGH || me->GetAreaId() == AREA_ELWYNN_FOREST || me->GetAreaId() == AREA_THE_EXODAR || me->GetAreaId() == AREA_DARNASSUS)
{
switch (rnd)
{
@ -621,7 +607,7 @@ public:
break;
}
}
else if (me->GetAreaId() == SHATTRATH)
else if (me->GetAreaId() == AREA_SHATTRATH_CITY)
{
rnd = urand(0, 5);
switch (rnd)
@ -1734,28 +1720,6 @@ enum BellHourlySoundFX
LIGHTHOUSEFOGHORN = 7197
};
enum BellHourlySoundZones
{
TIRISFAL_ZONE = 85,
UNDERCITY_ZONE = 1497,
DUN_MOROGH_ZONE = 1,
IRONFORGE_ZONE = 1537,
TELDRASSIL_ZONE = 141,
DARNASSUS_ZONE = 1657,
ASHENVALE_ZONE = 331,
HILLSBRAD_FOOTHILLS_ZONE = 267,
DUSKWOOD_ZONE = 10,
WESTFALL_ZONE = 40,
DUSTWALLOW_MARSH_ZONE = 15,
SHATTRATH_ZONE = 3703
};
enum LightHouseAreas
{
AREA_ALCAZ_ISLAND = 2079,
AREA_WESTFALL_LIGHTHOUSE = 115
};
enum BellHourlyObjects
{
GO_HORDE_BELL = 175885,
@ -1787,10 +1751,10 @@ public:
{
switch (zoneId)
{
case TIRISFAL_ZONE:
case UNDERCITY_ZONE:
case HILLSBRAD_FOOTHILLS_ZONE:
case DUSKWOOD_ZONE:
case AREA_TIRISFAL_GLADES:
case AREA_UNDERCITY:
case AREA_HILLSBRAD_FOOTHILLS:
case AREA_DUSKWOOD:
_soundId = BELLTOLLHORDE;
break;
default:
@ -1803,17 +1767,17 @@ public:
{
switch (zoneId)
{
case IRONFORGE_ZONE:
case DUN_MOROGH_ZONE:
case AREA_IRONFORGE:
case AREA_DUN_MOROGH:
_soundId = BELLTOLLDWARFGNOME;
break;
case DARNASSUS_ZONE:
case TELDRASSIL_ZONE:
case ASHENVALE_ZONE:
case SHATTRATH_ZONE:
case AREA_DARNASSUS:
case AREA_TELDRASSIL:
case AREA_ASHENVALE:
case AREA_SHATTRATH_CITY:
_soundId = BELLTOLLNIGHTELF;
break;
case WESTFALL_ZONE:
case AREA_WESTFALL:
if (go->GetAreaId() == AREA_WESTFALL_LIGHTHOUSE)
{
_soundId = LIGHTHOUSEFOGHORN;
@ -1823,7 +1787,7 @@ public:
_soundId = BELLTOLLALLIANCE;
}
break;
case DUSTWALLOW_MARSH_ZONE:
case AREA_DUSTWALLOW_MARSH:
if (go->GetAreaId() == AREA_ALCAZ_ISLAND)
{
_soundId = LIGHTHOUSEFOGHORN;