[12655m] Added some MOP enums etc. Thanks R2/TC

This commit is contained in:
Antz 2020-02-17 19:22:54 +00:00
parent 6cf7616857
commit c8194124df
No known key found for this signature in database
GPG key ID: 0DF907270598C85F
11 changed files with 3451 additions and 3258 deletions

View file

@ -1054,6 +1054,7 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
case CLASS_PALADIN: pPlayer->PlayerTalkClass->SendGossipMenu(1635, GetObjectGuid()); break;
case CLASS_PRIEST: pPlayer->PlayerTalkClass->SendGossipMenu(4436, GetObjectGuid()); break;
case CLASS_ROGUE: pPlayer->PlayerTalkClass->SendGossipMenu(4797, GetObjectGuid()); break;
case CLASS_MONK: pPlayer->PlayerTalkClass->SendGossipMenu(4797, GetObjectGuid()); break;
case CLASS_SHAMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5003, GetObjectGuid()); break;
case CLASS_WARLOCK: pPlayer->PlayerTalkClass->SendGossipMenu(5836, GetObjectGuid()); break;
case CLASS_WARRIOR: pPlayer->PlayerTalkClass->SendGossipMenu(4985, GetObjectGuid()); break;

View file

@ -144,6 +144,7 @@ namespace MaNGOS
case CONTENT_61_70: nBaseExp = 235; break;
case CONTENT_71_80: nBaseExp = 580; break;
case CONTENT_81_85: nBaseExp = 1878; break;
case CONTENT_86_90: nBaseExp = 7194; break;
default:
sLog.outError("BaseGain: Unsupported content level %u", content);
nBaseExp = 45; break;

View file

@ -1497,6 +1497,20 @@ void GameObject::Use(Unit* user)
case 37639: spellId = 36326; break;
case 45367: spellId = 45371; break;
case 45370: spellId = 45368; break;
// custom taxi flights
case 32059: // south
((Player*)user)->ActivateTaxiPathTo(520,0);
break;
case 32068: // west
((Player*)user)->ActivateTaxiPathTo(523,0);
break;
case 32075: // north
((Player*)user)->ActivateTaxiPathTo(522,0);
break;
case 32081: // east
((Player*)user)->ActivateTaxiPathTo(524,0);
break;
}
break;
@ -1773,6 +1787,12 @@ void GameObject::Use(Unit* user)
spellId = info->spellcaster.spellId;
// dismount players
if (user && user->IsMounted())
{
user->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
}
AddUse();
break;
}

View file

@ -253,10 +253,11 @@ enum ItemClass
ITEM_CLASS_KEY = 13,
ITEM_CLASS_PERMANENT = 14,
ITEM_CLASS_MISC = 15,
ITEM_CLASS_GLYPH = 16
ITEM_CLASS_GLYPH = 16,
ITEM_CLASS_BATTLE_PET = 17
};
#define MAX_ITEM_CLASS 17
#define MAX_ITEM_CLASS 18
enum ItemSubclassConsumable
{
@ -481,11 +482,28 @@ enum ItemSubclassGlyph
ITEM_SUBCLASS_GLYPH_SHAMAN = 7,
ITEM_SUBCLASS_GLYPH_MAGE = 8,
ITEM_SUBCLASS_GLYPH_WARLOCK = 9,
ITEM_SUBCLASS_GLYPH_MONK = 10,
ITEM_SUBCLASS_GLYPH_DRUID = 11
};
#define MAX_ITEM_SUBCLASS_GLYPH 12
enum ItemSubclassBattlePet
{
ITEM_SUBCLASS_BATTLE_PET_AQUATIC = 1,
ITEM_SUBCLASS_BATTLE_PET_BEAST = 2,
ITEM_SUBCLASS_BATTLE_PET_CRITTER = 3,
ITEM_SUBCLASS_BATTLE_PET_DRAGONKIN = 4,
ITEM_SUBCLASS_BATTLE_PET_ELEMENTAL = 5,
ITEM_SUBCLASS_BATTLE_PET_FLYING = 6,
ITEM_SUBCLASS_BATTLE_PET_HUMANOID = 7,
ITEM_SUBCLASS_BATTLE_PET_MAGICAL = 8,
ITEM_SUBCLASS_BATTLE_PET_MECHANICAL = 9,
ITEM_SUBCLASS_BATTLE_PET_UNDEAD = 10
};
#define MAX_ITEM_SUBCLASS_BATTLE_PET 11
const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] =
{
MAX_ITEM_SUBCLASS_CONSUMABLE,
@ -504,7 +522,8 @@ const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] =
MAX_ITEM_SUBCLASS_KEY,
MAX_ITEM_SUBCLASS_PERMANENT,
MAX_ITEM_SUBCLASS_JUNK,
MAX_ITEM_SUBCLASS_GLYPH
MAX_ITEM_SUBCLASS_GLYPH,
MAX_ITEM_SUBCLASS_BATTLE_PET
};
inline uint8 ItemSubClassToDurabilityMultiplierId(uint32 ItemClass, uint32 ItemSubClass)

View file

@ -2245,6 +2245,9 @@ void Player::RegenerateAll(uint32 diff)
if (getClass() == CLASS_DEATH_KNIGHT)
Regenerate(POWER_RUNE, diff);
if (getClass() == CLASS_MONK)
Regenerate(POWER_CHI, diff);
if (getClass() == CLASS_HUNTER)
Regenerate(POWER_FOCUS, diff);

View file

@ -393,6 +393,7 @@ enum UnitMods
UNIT_MOD_ECLIPSE,
UNIT_MOD_HOLY_POWER,
UNIT_MOD_ALTERNATIVE,
UNIT_MOD_CHI,
UNIT_MOD_ARMOR, // UNIT_MOD_ARMOR..UNIT_MOD_RESISTANCE_ARCANE must be in existing order, it's accessed by index values of SpellSchools enum.
UNIT_MOD_RESISTANCE_HOLY,
UNIT_MOD_RESISTANCE_FIRE,
@ -412,7 +413,7 @@ enum UnitMods
UNIT_MOD_RESISTANCE_START = UNIT_MOD_ARMOR,
UNIT_MOD_RESISTANCE_END = UNIT_MOD_RESISTANCE_ARCANE + 1,
UNIT_MOD_POWER_START = UNIT_MOD_MANA,
UNIT_MOD_POWER_END = UNIT_MOD_ALTERNATIVE + 1
UNIT_MOD_POWER_END = UNIT_MOD_CHI + 1
};
enum BaseModGroup

View file

@ -570,10 +570,11 @@ enum SpellFamily
SPELLFAMILY_SHAMAN = 11,
SPELLFAMILY_UNK2 = 12, // 2 spells (silence resistance)
SPELLFAMILY_POTION = 13,
// 14 - unused
SPELLFAMILY_MONK = 14,
SPELLFAMILY_DEATHKNIGHT = 15,
// 16 - unused
SPELLFAMILY_PET = 17
SPELLFAMILY_PET = 17,
SPELLFAMILY_MINIGAME = 50,
};
enum VehicleFlags

View file

@ -1414,16 +1414,19 @@ struct MapEntry
MapID == 509 || MapID == 534 || MapID == 560 || // AhnQiraj, HyjalPast, HillsbradPast
MapID == 568 || MapID == 580 || MapID == 595 || // ZulAman, Sunwell Plateau, Culling of Stratholme
MapID == 603 || MapID == 615 || MapID == 616 || // Ulduar, The Obsidian Sanctum, The Eye Of Eternity
MapID == 631 || MapID == 658 || MapID == 724 || // Icecrown Citadel, Pit of Saron, Ruby Sanctum
MapID == 644 || MapID == 720 || MapID == 721 || // Halls of Origination, Firelands
MapID == 734 || MapID == 755 || MapID == 859 || // Ahn'Qiraj Terrace, Lost City of Tol'Vir, Zul'Gurub
MapID == 938 || MapID == 939 || MapID == 940 || // End Time, Well of Eternity, Hour of Twilight
MapID == 967; // Dragon Soul
MapID == 631 || // Icecrown Citadel,
MapID == 654 || MapID == 655 || MapID == 656 || // Gilneas, Gilneas Phase 1, Gilneas Phase 2
MapID == 658 || MapID == 720 || MapID == 724 || // Pit of Saron, Firelands, Ruby Sanctum
MapID == 644 || MapID == 721 || MapID == 734 || // Halls of Origination, Firelands, ?????????
MapID == 754 || MapID == 755 || MapID == 859 || // Throne of Four Winds, Lost City of Tol'Vir, Zul'Gurub
MapID == 861 || MapID == 938 || MapID == 939 || // Firelands Dailies, End Time, Well of Eternity
MapID == 940 || MapID == 962 || MapID == 967 || // Hour of Twilight, Gate of Setting Sun, Dragon Soul
MapID == 996 || MapID == 1007 || MapID == 1011; // Endless Spring, New Scholomance, Niuzao Temple
}
bool IsContinent() const
{
return MapID == 0 || MapID == 1 || MapID == 530 || MapID == 571;
return MapID == 0 || MapID == 1 || MapID == 530 || MapID == 571 || MapID == 870;
}
};

View file

@ -174,14 +174,20 @@ enum Powers
POWER_RAGE = 1,
POWER_FOCUS = 2,
POWER_ENERGY = 3,
//POWER_HAPPINESS = 4, unused 4.x.x
POWER_LIGHT_FORCE = 4,
POWER_RUNE = 5,
POWER_RUNIC_POWER = 6,
POWER_SOUL_SHARDS = 7,
POWER_ECLIPSE = 8,
POWER_HOLY_POWER = 9,
POWER_ALTERNATIVE = 10,
MAX_POWERS = 11,
POWER_DARK_FORCE = 11,
POWER_CHI = 12,
POWER_SHADOW_ORBS = 13,
POWER_BURNING_EMBERS = 14,
POWER_DEMONIC_FURY = 15,
POWER_ARCANE_CHARGES = 16,
MAX_POWERS = 17,
POWER_HEALTH = 0xFFFFFFFE // (-2 as signed value)
};
@ -679,7 +685,7 @@ enum SpellAttributesEx10
};
#define MAX_TALENT_SPEC_COUNT 2
#define MAX_GLYPH_SLOT_INDEX 9
#define MAX_GLYPH_SLOT_INDEX 6
#define REQ_PRIMARY_TREE_TALENTS 31
enum SheathTypes
@ -751,7 +757,7 @@ enum Language
#define LANGUAGES_COUNT 25
// In fact !=0 values is alliance/horde root faction ids
// In fact ! =0 values is alliance/horde root faction ids
enum Team
{
TEAM_NONE = 0, // used when team value unknown or not set, 0 is also meaning that can be used !team check
@ -937,7 +943,7 @@ enum SpellEffects
SPELL_EFFECT_TALENT_SPEC_SELECT = 162,
SPELL_EFFECT_163 = 163,
SPELL_EFFECT_CANCEL_AURA = 164,
SPELL_EFFECT_DAMAGE_FROM_MAX_HEALTH_PCT= 165,
SPELL_EFFECT_DAMAGE_FROM_MAX_HEALTH_PCT = 165,
SPELL_EFFECT_REWARD_CURRENCY = 166,
SPELL_EFFECT_167 = 167,
SPELL_EFFECT_168 = 168,
@ -1298,10 +1304,10 @@ enum AuraState
AURA_STATE_DEADLY_POISON = 16, // T |
AURA_STATE_ENRAGE = 17, // C |
AURA_STATE_BLEEDING = 18, // C t|
// AURA_STATE_UNKNOWN19 = 19, // | not used
// AURA_STATE_UNKNOWN20 = 20, // c | only (45317 Suicide)
// AURA_STATE_UNKNOWN21 = 21, // | not used
// AURA_STATE_UNKNOWN22 = 22, // C | not implemented yet (Requires Evasive Charges to use)
AURA_STATE_DARK_TARGET = 19, // | targeting for light/Gas spells
//AURA_STATE_UNKNOWN20 = 20, // c | only (45317 Suicide)
AURA_STATE_SPELLFIRE = 21, // | Spellfire (targeting, NYI)
AURA_STATE_LIGHT_TARGET = 22, // C | targeting for dark/Ooze spells
AURA_STATE_HEALTH_ABOVE_75_PERCENT = 23, // C |
};
@ -1864,7 +1870,77 @@ enum TextEmotes
TEXTEMOTE_ENCOURAGE = 375,
TEXTEMOTE_ENEMY = 376,
TEXTEMOTE_EYEBROW = 377,
TEXTEMOTE_TOAST = 378
TEXTEMOTE_TOAST = 378,
TEXTEMOTE_FAIL = 379,
TEXTEMOTE_HIGHFIVE = 380,
TEXTEMOTE_ABSENT = 381,
TEXTEMOTE_ARM = 382,
TEXTEMOTE_AWE = 383,
TEXTEMOTE_BACKPACK = 384,
TEXTEMOTE_BADFEELING = 385,
TEXTEMOTE_CHALLENGE = 386,
TEXTEMOTE_CHUG = 387,
TEXTEMOTE_DING = 389,
TEXTEMOTE_FACEPALM = 390,
TEXTEMOTE_FAINT = 391,
TEXTEMOTE_GO = 392,
TEXTEMOTE_GOING = 393,
TEXTEMOTE_GLOWER = 394,
TEXTEMOTE_HEADACHE = 395,
TEXTEMOTE_HICCUP = 396,
TEXTEMOTE_HISS = 398,
TEXTEMOTE_HOLDHAND = 399,
TEXTEMOTE_HURRY = 401,
TEXTEMOTE_IDEA = 402,
TEXTEMOTE_JEALOUS = 403,
TEXTEMOTE_LUCK = 404,
TEXTEMOTE_MAP = 405,
TEXTEMOTE_MERCY = 406,
TEXTEMOTE_MUTTER = 407,
TEXTEMOTE_NERVOUS = 408,
TEXTEMOTE_OFFER = 409,
TEXTEMOTE_PET = 410,
TEXTEMOTE_PINCH = 411,
TEXTEMOTE_PROUD = 413,
TEXTEMOTE_PROMISE = 414,
TEXTEMOTE_PULSE = 415,
TEXTEMOTE_PUNCH = 416,
TEXTEMOTE_POUT = 417,
TEXTEMOTE_REGRET = 418,
TEXTEMOTE_REVENGE = 420,
TEXTEMOTE_ROLLEYES = 421,
TEXTEMOTE_RUFFLE = 422,
TEXTEMOTE_SAD = 423,
TEXTEMOTE_SCOFF = 424,
TEXTEMOTE_SCOLD = 425,
TEXTEMOTE_SCOWL = 426,
TEXTEMOTE_SEARCH = 427,
TEXTEMOTE_SHAKEFIST = 428,
TEXTEMOTE_SHIFTY = 429,
TEXTEMOTE_SHUDDER = 430,
TEXTEMOTE_SIGNAL = 431,
TEXTEMOTE_SILENCE = 432,
TEXTEMOTE_SING = 433,
TEXTEMOTE_SMACK = 434,
TEXTEMOTE_SNEAK = 435,
TEXTEMOTE_SNEEZE = 436,
TEXTEMOTE_SNORT = 437,
TEXTEMOTE_SQUEAL = 438,
TEXTEMOTE_STOPATTACK = 439,
TEXTEMOTE_SUSPICIOUS = 440,
TEXTEMOTE_THINK = 441,
TEXTEMOTE_TRUCE = 442,
TEXTEMOTE_TWIDDLE = 443,
TEXTEMOTE_WARN = 444,
TEXTEMOTE_SNAP = 445,
TEXTEMOTE_CHARM = 446,
TEXTEMOTE_COVEREARS = 447,
TEXTEMOTE_CROSSARMS = 448,
TEXTEMOTE_LOOK = 449,
TEXTEMOTE_OBJECT = 450,
TEXTEMOTE_SWEAT = 451,
TEXTEMOTE_YW = 453,
TEXTEMOTE_READ = 456
};
enum Emote
@ -2044,7 +2120,7 @@ enum Emote
EMOTE_STATE_READYSPELLOMNI = 474,
EMOTE_STATE_HOLD_JOUST = 475,
EMOTE_ONESHOT_CRY_JAINA = 476,
EMOTE_ONESHOT_SPECIAL_UNARMED = 477,
EMOTE_ONESHOT_SPECIALUNARMED = 477,
EMOTE_STATE_DANCE_NOSHEATHE = 478,
EMOTE_ONESHOT_SNIFF = 479,
EMOTE_ONESHOT_DRAGONSTOMP = 480,
@ -2052,10 +2128,33 @@ enum Emote
EMOTE_STATE_READ = 483,
EMOTE_ONESHOT_FLYEMOTETALK = 485,
EMOTE_STATE_READ_ALLOWMOVEMENT = 492,
EMOTE_STATE_CUSTOM_SPELL_06 = 498,
EMOTE_STATE_CUSTOM_SPELL_07 = 499,
EMOTE_STATE_CUSTOM_SPELL_08 = 500,
EMOTE_STATE_CUSTOM_SPELL_09 = 501,
EMOTE_STATE_CUSTOM_SPELL_10 = 502,
EMOTE_STATE_READY1H_ALLOW_MOVEMENT = 505,
EMOTE_STATE_READY2H_ALLOW_MOVEMENT = 506,
EMOTE_ONESHOT_MONKOFFENSE_ATTACKUNARMED = 507,
EMOTE_ONESHOT_MONKOFFENSE_SPECIALUNARMED = 508,
EMOTE_ONESHOT_MONKOFFENSE_PARRYUNARMED = 509,
EMOTE_STATE_MONKOFFENSE_READYUNARMED = 510,
EMOTE_ONESHOT_PALMSTRIKE = 511,
EMOTE_STATE_CRANE = 512,
EMOTE_ONESHOT_OPEN = 517,
EMOTE_STATE_READ_CHRISTMAS = 518
EMOTE_STATE_READ_CHRISTMAS = 518,
EMOTE_ONESHOT_FLYATTACK2HL = 526,
EMOTE_ONESHOT_FLYATTACKTHROWN = 527,
EMOTE_STATE_FLYREADYSPELLDIRECTED = 528,
EMOTE_STATE_FLY_READY_1H = 531,
EMOTE_STATE_MEDITATE = 533,
EMOTE_STATE_FLY_READY_2HL = 534,
EMOTE_ONESHOT_TOGROUND = 535,
EMOTE_ONESHOT_TOFLY = 536,
EMOTE_STATE_ATTACKTHROWN = 537,
EMOTE_STATE_SPELL_CHANNEL_DIRECTED_NOSOUND = 538,
EMOTE_ONESHOT_WORK = 539,
EMOTE_STATE_READYUNARMED_NOSOUND = 540
};
// AnimationData.dbc
@ -2898,7 +2997,9 @@ enum CreatureType
CREATURE_TYPE_NOT_SPECIFIED = 10,
CREATURE_TYPE_TOTEM = 11,
CREATURE_TYPE_NON_COMBAT_PET = 12,
CREATURE_TYPE_GAS_CLOUD = 13
CREATURE_TYPE_GAS_CLOUD = 13,
CREATURE_TYPE_WILD_PET = 14,
CREATURE_TYPE_ABERRATION = 15,
};
uint32 const CREATURE_TYPEMASK_DEMON_OR_UNDEAD = (1 << (CREATURE_TYPE_DEMON - 1)) | (1 << (CREATURE_TYPE_UNDEAD - 1));
@ -2949,20 +3050,32 @@ enum CreatureFamily
CREATURE_FAMILY_WASP = 44,
CREATURE_FAMILY_CORE_HOUND = 45,
CREATURE_FAMILY_SPIRIT_BEAST = 46,
CREATURE_FAMILY_FEL_IMP = 47,
CREATURE_FAMILY_VOIDLORD = 48,
CREATURE_FAMILY_SHIVARRA = 49,
CREATURE_FAMILY_OBSERVER = 50,
CREATURE_FAMILY_WRATHGUARD = 51,
CREATURE_FAMILY_INFERNAL = 52,
CREATURE_FAMILY_FIRE_ELEMENTAL = 53,
CREATURE_FAMILY_EARTH_ELEMENTAL = 54,
CREATURE_FAMILY_CRANE = 55,
CREATURE_FAMILY_WATER_STRIDER = 56,
CREATURE_FAMILY_PORCUPINE = 57,
CREATURE_FAMILY_QUILEN = 58,
CREATURE_FAMILY_GOAT = 59,
CREATURE_FAMILY_BASILISK = 60,
CREATURE_FAMILY_WATER_ELEMENTAL = 49,
CREATURE_FAMILY_FOX = 50,
CREATURE_FAMILY_MONKEY = 51,
CREATURE_FAMILY_DOG = 52,
CREATURE_FAMILY_BEETLE = 53,
CREATURE_FAMILY_SHALE_SPIDER = 55,
CREATURE_FAMILY_ZOMBIE = 56,
CREATURE_FAMILY_QA_TEST = 57,
CREATURE_FAMILY_SILITHID2 = 59,
CREATURE_FAMILY_WASP2 = 66,
CREATURE_FAMILY_HYDRA = 68,
CREATURE_FAMILY_FEL_IMP = 100,
CREATURE_FAMILY_VOIDLORD = 101,
CREATURE_FAMILY_SHIVARRA = 102,
CREATURE_FAMILY_OBSERVER = 103,
CREATURE_FAMILY_WRATHGUARD = 104,
CREATURE_FAMILY_INFERNAL = 108,
CREATURE_FAMILY_FIRE_ELEMENTAL = 116,
CREATURE_FAMILY_EARTH_ELEMENTAL = 117,
CREATURE_FAMILY_CRANE = 125,
CREATURE_FAMILY_WATER_STRIDER = 126,
CREATURE_FAMILY_PORCUPINE = 127,
CREATURE_FAMILY_QUILEN = 128,
CREATURE_FAMILY_GOAT = 129,
CREATURE_FAMILY_BASILISK = 130,
CREATURE_FAMILY_DIREHORN = 138,
};
enum CreatureTypeFlags
@ -2981,7 +3094,7 @@ enum CreatureTypeFlags
CREATURE_TYPEFLAGS_UNK12 = 0x00000800, // related to possibility to cast spells while mounted
CREATURE_TYPEFLAGS_CAN_ASSIST = 0x00001000, // Can aid any player (and group) in combat. Typically seen for escorting NPC's
CREATURE_TYPEFLAGS_UNK14 = 0x00002000, // checked from calls in Lua_PetHasActionBar
CREATURE_TYPEFLAGS_UNK15 = 0x00004000, // Lua_UnitGUID, client does guid_low &= 0xFF000000 if this flag is set
CREATURE_TYPEFLAGS_UNK15 = 0x00004000, // Lua_UnitGUID, client does guid_low & = 0xFF000000 if this flag is set
CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x00008000, // Can be looted by engineer
CREATURE_TYPEFLAGS_EXOTIC = 0x00010000, // Can be tamed by hunter as exotic pet
CREATURE_TYPEFLAGS_UNK18 = 0x00020000, // related to CreatureDisplayInfo and scaling in some way
@ -3040,11 +3153,13 @@ enum HolidayIds
HOLIDAY_WOTLK_LAUNCH = 406,
HOLIDAY_DAY_OF_DEAD = 409,
HOLIDAY_CALL_TO_ARMS_IC = 420,
HOLIDAY_KALUAK_FISHING_DERBY = 424,
HOLIDAY_CALL_TO_ARMS_BG = 435,
HOLIDAY_CALL_TO_ARMS_TP = 436,
HOLIDAY_CALL_TO_ARMS_RBG_15v15 = 442,
HOLIDAY_CALL_TO_ARMS_RBG_25v25 = 443,
HOLIDAY_WOW_7TH_ANNIVERSARY = 467,
HOLIDAY_DARKMOON_FAIRE = 479,
HOLIDAY_WOW_8TH_ANNIVERSARY = 484,
HOLIDAY_UNK1 = 488,
HOLIDAY_UNK2 = 489,
@ -3064,12 +3179,12 @@ enum HolidayIds
enum QuestSort
{
QUEST_SORT_EPIC = 1,
QUEST_SORT_WAILING_CAVERNS_OLD = 21,
QUEST_SORT_HALLOWS_END = 21,
QUEST_SORT_SEASONAL = 22,
QUEST_SORT_UNDERCITY_OLD = 23,
QUEST_SORT_CATACLYSM = 23,
QUEST_SORT_HERBALISM = 24,
QUEST_SORT_BATTLEGROUNDS = 25,
QUEST_SORT_ULDAMN_OLD = 41,
QUEST_SORT_DAY_OF_THE_DEAD = 41,
QUEST_SORT_WARLOCK = 61,
QUEST_SORT_WARRIOR = 81,
QUEST_SORT_SHAMAN = 82,
@ -3082,7 +3197,7 @@ enum QuestSort
QUEST_SORT_LEATHERWORKING = 182,
QUEST_SORT_ENGINEERING = 201,
QUEST_SORT_TREASURE_MAP = 221,
QUEST_SORT_SUNKEN_TEMPLE_OLD = 241,
QUEST_SORT_TOURNAMENT = 241,
QUEST_SORT_HUNTER = 261,
QUEST_SORT_PRIEST = 262,
QUEST_SORT_DRUID = 263,
@ -3109,10 +3224,15 @@ enum QuestSort
QUEST_SORT_FIRELANDS_INVASION = 379,
QUEST_SORT_ZANDALARI = 380,
QUEST_SORT_ELEMENTAL_BONDS = 381,
QUEST_SORT_PANDAREN_BREWMASTERS= 391,
QUEST_SORT_PANDAREN_BREWMASTERS = 391,
QUEST_SORT_SCENARIO = 392,
QUEST_SORT_BATTLE_PETS = 394,
QUEST_SORT_MONK = 395
QUEST_SORT_MONK = 395,
QUEST_SORT_LANDFALL = 396,
QUEST_SORT_PANDAREN_CAMPAIGN = 397,
QUEST_SORT_RIDING = 398,
QUEST_SORT_BRAWLERS_GUILD = 399,
QUEST_SORT_PROVING_GROUNDS = 400,
};
inline uint8 ClassByQuestSort(int32 QuestSort)
@ -3292,7 +3412,7 @@ enum SkillType
SKILL_ALL_SPECIALIZATIONS = 934,
SKILL_RUNEFORGING = 960,
SKILL_PET_PRIMALFIRE_ELEMENTAL = 962,
SKILL_PET_PRIMALEARTH_ELEMENTAL= 963,
SKILL_PET_PRIMALEARTH_ELEMENTAL = 963,
SKILL_WAYOFTHE_GRILL = 975,
SKILL_WAYOFTHE_WOK = 976,
SKILL_WAYOFTHE_POT = 977,
@ -3477,15 +3597,20 @@ enum ChatMsg
CHAT_MSG_UNK52 = 0x34, // 4.0.1
CHAT_MSG_BN_WISPER = 0x35, // 4.0.1
CHAT_MSG_BN_WISPER_INFORM = 0x36, // 4.0.1
CHAT_MSG_BN_CONVERSATION = 0x37 // 4.0.1
CHAT_MSG_BN_CONVERSATION = 0x37, // 4.0.1
CHAT_MSG_QUEST_BOSS_EMOTE = 0x3F, // 5.x
CHAT_MSG_PET_BATTLE_COMBAT_LOG = 0x40, // 5.x
CHAT_MSG_PET_BATTLE_INFO = 0x41, // 5.x
CHAT_MSG_INSTANCE_CHAT = 0x42, // 5.x
CHAT_MSG_INSTANCE_CHAT_LEADER = 0x43, // 5.x
};
#define MAX_CHAT_MSG_TYPE 0x38
#define MAX_CHAT_MSG_TYPE 0x44
enum ChatLinkColors
{
CHAT_LINK_COLOR_CURRENCY = 0xff00aa00, // green
CHAT_LINK_COLOR_INSTANCELOCK= 0xffff8000, // orange
CHAT_LINK_COLOR_INSTANCELOCK = 0xffff8000, // orange
CHAT_LINK_COLOR_TRADE = 0xffffd000, // orange
CHAT_LINK_COLOR_TALENT = 0xff4e96f7, // blue
CHAT_LINK_COLOR_SPELL = 0xff71d5ff, // bright blue
@ -3595,9 +3720,11 @@ enum ShapeshiftForm
FORM_BATTLESTANCE = 0x11,
FORM_DEFENSIVESTANCE = 0x12,
FORM_BERSERKERSTANCE = 0x13,
FORM_TEST = 0x14,
FORM_SERPENTSTANCE = 0x14,
FORM_ZOMBIE = 0x15,
FORM_METAMORPHOSIS = 0x16,
FORM_OXSTANCE = 0x17,
FORM_TIGERSTANCE = 0x18,
FORM_UNDEAD = 0x19,
FORM_FRENZY = 0x1A,
FORM_FLIGHT_EPIC = 0x1B,
@ -3766,9 +3893,13 @@ enum BattleGroundTypeId
//BATTLEGROUND_UNK1 = 441, // icecrown citadel
//BATTLEGROUND_UNK2 = 443, // ruby sanctum
//BATTLEGROUND_UNK3 = 656, // rated eye of the storm
BATTLEGROUND_TK = 699, // 5.x Temple of Kotmogu
BATTLEGROUND_CTF = 706, // 5.x CTF3
BATTLEGROUND_SM = 708, // 5.x Silvershard Mines
BATTLEGROUND_TA = 719, // 5.x Tol'Vir Arena
};
#define MAX_BATTLEGROUND_TYPE_ID 121
#define MAX_BATTLEGROUND_TYPE_ID 720
enum ArenaType
{
@ -3966,7 +4097,7 @@ enum MaxLevel
static const MaxLevel maxLevelForExpansion[MAX_EXPANSION + 1] = { MAX_LEVEL_CLASSIC, MAX_LEVEL_TBC, MAX_LEVEL_WOTLK, MAX_LEVEL_CATACLYSM , MAX_LEVEL_MOP };
// Max creature level (included some bosses and elite)
#define DEFAULT_MAX_CREATURE_LEVEL 90
#define DEFAULT_MAX_CREATURE_LEVEL 95
// This spell is used for general boarding serverside
#define SPELL_RIDE_VEHICLE_HARDCODED 46598

View file

@ -7250,6 +7250,15 @@ void Aura::HandleShapeshiftBoosts(bool apply)
HotWSpellId = 24899;
MasterShaperSpellId = 48418;
break;
case FORM_SERPENTSTANCE:
spellId1 = 115070;
break;
case FORM_OXSTANCE:
spellId1 = 115069;
break;
case FORM_TIGERSTANCE:
spellId1 = 103985;
break;
case FORM_BATTLESTANCE:
spellId1 = 21156;
break;
@ -7299,11 +7308,11 @@ void Aura::HandleShapeshiftBoosts(bool apply)
case FORM_TEST_OF_STRENGTH:
case FORM_BLB_PLAYER:
case FORM_SHADOW_DANCE:
case FORM_TEST:
case FORM_ZOMBIE:
case FORM_UNDEAD:
case FORM_FRENZY:
case FORM_NONE:
default:
break;
}
@ -7311,10 +7320,14 @@ void Aura::HandleShapeshiftBoosts(bool apply)
{
if (spellId1)
{
target->CastSpell(target, spellId1, true, NULL, this);
if(target->GetTypeId() == TYPEID_PLAYER)
((Player*)target)->RemoveSpellCooldown(spellId1);
target->CastSpell(target, spellId1, true, NULL, this );
}
if (spellId2)
{
if(target->GetTypeId() == TYPEID_PLAYER)
((Player*)target)->RemoveSpellCooldown(spellId2);
target->CastSpell(target, spellId2, true, NULL, this);
}

View file

@ -26,7 +26,7 @@
#define MANGOS_SYSTEMCONFIG_H
#ifndef MANGOS_PACKAGENAME
#define MANGOS_PACKAGENAME "MaNGOS Three"
#define MANGOS_PACKAGENAME "MaNGOS Four"
#endif
#include "Platform/Define.h"