mirror of
https://github.com/mangosfour/server.git
synced 2025-12-18 01:37:01 +00:00
Merge branch 'master' into 310
Conflicts: src/game/Level2.cpp src/game/PetHandler.cpp src/game/Player.cpp src/game/Player.h src/game/SkillHandler.cpp
This commit is contained in:
commit
31b3ee95ad
163 changed files with 5278 additions and 3233 deletions
|
|
@ -1594,6 +1594,31 @@ enum CreatureEliteType
|
|||
CREATURE_UNKNOWN = 5 // found in 2.2.3 for 2 mobs
|
||||
};
|
||||
|
||||
// values based at Holidays.dbc
|
||||
enum HolidayIds
|
||||
{
|
||||
HOLIDAY_FIREWORKS_SPECTACULAR = 62,
|
||||
HOLIDAY_FEAST_OF_WINTER_VEIL = 141,
|
||||
HOLIDAY_NOBLEGARDEN = 181,
|
||||
HOLIDAY_CHILDRENS_WEEK = 201,
|
||||
HOLIDAY_CALL_TO_ARMS_AV = 283,
|
||||
HOLIDAY_CALL_TO_ARMS_WG = 284,
|
||||
HOLIDAY_CALL_TO_ARMS_AB = 285,
|
||||
HOLIDAY_FISHING_EXTRAVAGANZA = 301,
|
||||
HOLIDAY_HARVEST_FESTIVAL = 321,
|
||||
HOLIDAY_HALLOWS_END = 324,
|
||||
HOLIDAY_LUNAR_FESTIVAL = 327,
|
||||
HOLIDAY_LOVE_IS_IN_THE_AIR = 335,
|
||||
HOLIDAY_FIRE_FESTIVAL = 341,
|
||||
HOLIDAY_CALL_TO_ARMS_ES = 353,
|
||||
HOLIDAY_BREWFEST = 372,
|
||||
HOLIDAY_DARKMOON_FAIRE_ELWYNN = 374,
|
||||
HOLIDAY_DARKMOON_FAIRE_THUNDER = 375,
|
||||
HOLIDAY_DARKMOON_FAIRE_SHATTRATH = 376,
|
||||
HOLIDAY_CALL_TO_ARMS_SA = 400,
|
||||
HOLIDAY_WOTLK_LAUNCH = 406
|
||||
};
|
||||
|
||||
// values based at QuestInfo.dbc
|
||||
enum QuestTypes
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue