diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index 5356a995c..bad244e6c 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -568,11 +568,11 @@ struct BattlemasterListEntry int32 mapid[8]; // 1-8 mapid uint32 type; // 9 (3 - BG, 4 - arena) uint32 maxplayersperteam; // 10 - //uint32 unk1; // 11 (0 or 1) + //uint32 canJoinAsGroup; // 11 (0 or 1) char* name[16]; // 12-27 // 28 string flag, unused - // 29 unused - //uint32 unk2; // 30 new 3.1 + //uint32 maxGroupSize // 29 maxGroupSize? + //uint32 HolidayWorldStateId; // 30 new 3.1 }; #define MAX_OUTFIT_ITEMS 24 @@ -1077,8 +1077,8 @@ struct MapEntry uint32 MapID; // 0 //char* internalname; // 1 unused uint32 map_type; // 2 - //uint32 unk_330; // 3 some kind of flags (0x100 - CAN_CHANGE_PLAYER_DIFFICULTY) - // 4 0 or 1 for battlegrounds (not arenas) + //uint32 mapFlags; // 3 some kind of flags (0x100 - CAN_CHANGE_PLAYER_DIFFICULTY) + //uint32 isPvP; // 4 0 or 1 for battlegrounds (not arenas) char* name[16]; // 5-20 // 21 name flags, unused uint32 linked_zone; // 22 common zone for instance and continent map @@ -1087,11 +1087,11 @@ struct MapEntry //char* allianceIntro[16]; // 40-55 text for PvP Zones // 56 intro text flags uint32 multimap_id; // 57 index in LoadingScreens.dbc - // 58 BattlefieldMapIconScale + //float BattlefieldMapIconScale; // 58 BattlefieldMapIconScale int32 entrance_map; // 59 map_id of entrance map float entrance_x; // 60 entrance x coordinate (if exist single entry) float entrance_y; // 61 entrance y coordinate (if exist single entry) - // 62 time of day override + //uint32 timeOfDayOverride; // 62 time of day override uint32 addon; // 63 expansion // 64 some kind of time? //uint32 maxPlayers; // 65 max players diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index f9ec92ced..2320ac851 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -402,7 +402,7 @@ enum Opcodes CMSG_DUEL_CANCELLED = 0x16D, SMSG_MOUNTRESULT = 0x16E, SMSG_DISMOUNTRESULT = 0x16F, - SMSG_PUREMOUNT_CANCELLED_OBSOLETE = 0x170, + SMSG_PUREMOUNT_CANCELLED_OBSOLETE = 0x170, // ERR_REMOVE_FROM_PVP_QUEUE_* events CMSG_MOUNTSPECIAL_ANIM = 0x171, SMSG_MOUNTSPECIAL_ANIM = 0x172, SMSG_PET_TAME_FAILURE = 0x173, @@ -1236,16 +1236,16 @@ enum Opcodes UMSG_UNKNOWN_1199 = 0x4AF, // not found UMSG_UNKNOWN_1200 = 0x4B0, // not found UMSG_UNKNOWN_1201 = 0x4B1, // not found - SMSG_UNKNOWN_1202 = 0x4B2, // refund something + SMSG_UNKNOWN_1202 = 0x4B2, // refund item info CMSG_ITEM_REFUND_INFO_REQUEST = 0x4B3, // refund request? CMSG_UNKNOWN_1204 = 0x4B4, // lua: ContainerRefundItemPurchase - SMSG_UNKNOWN_1205 = 0x4B5, // refund something + SMSG_UNKNOWN_1205 = 0x4B5, // refund item result CMSG_CORPSE_MAP_POSITION_QUERY = 0x4B6, // CMSG, uint32 CMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE = 0x4B7, // SMSG, 3*float+float CMSG_LFG_SET_ROLES_2 = 0x4B8, // CMSG, empty, lua: SetLFGRoles UMSG_UNKNOWN_1209 = 0x4B9, // not found CMSG_UNKNOWN_1210 = 0x4BA, // CMSG, uint64, lua: CalendarContextEventSignUp - SMSG_UNKNOWN_1211 = 0x4BB, // SMSG, calendar related + SMSG_UNKNOWN_1211 = 0x4BB, // SMSG, calendar related EVENT_CALENDAR_ACTION_PENDING SMSG_EQUIPMENT_SET_LIST = 0x4BC, // SMSG, equipment manager list? CMSG_EQUIPMENT_SET_SAVE = 0x4BD, // CMSG, lua: SaveEquipmentSet CMSG_UNKNOWN_1214 = 0x4BE, // CMSG, missle? @@ -1257,7 +1257,7 @@ enum Opcodes UMSG_UNKNOWN_1220 = 0x4C4, // not found 3.2 UMSG_UNKNOWN_1221 = 0x4C5, // not found 3.2 UMSG_UNKNOWN_1222 = 0x4C6, // not found 3.2 - SMSG_UNKNOWN_1223 = 0x4C7, // uint64, arena pet? 3.2 + SMSG_UNKNOWN_1223 = 0x4C7, // uint64, EVENT_ARENA_OPPONENT_UPDATE SMSG_UNKNOWN_1224 = 0x4C8, // uint32 "Can't modify arena team while queued or in a match." 3.2 UMSG_UNKNOWN_1225 = 0x4C9, // not found 3.2 UMSG_UNKNOWN_1226 = 0x4CA, // not found 3.2 @@ -1274,23 +1274,23 @@ enum Opcodes CMSG_EQUIPMENT_SET_USE = 0x4D5, // CMSG, lua: UseEquipmentSet SMSG_EQUIPMENT_SET_USE_RESULT = 0x4D6, // SMSG, UseEquipmentSetResult? UMSG_UNKNOWN_1239 = 0x4D7, // not found 3.2 - SMSG_UNKNOWN_1240 = 0x4D8, // SMSG, uint64, string + SMSG_UNKNOWN_1240 = 0x4D8, // SMSG, uint64, string, doing nothing CMSG_CHAR_FACTION_CHANGE = 0x4D9, // lua: CreateCharacter (PFC client response) SMSG_CHAR_FACTION_CHANGE = 0x4DA, // response to 1241 (PFC server response) UMSG_UNKNOWN_1243 = 0x4DB, // not found 3.2 UMSG_UNKNOWN_1244 = 0x4DC, // not found 3.2 UMSG_UNKNOWN_1245 = 0x4DD, // not found 3.2 - SMSG_UNKNOWN_1246 = 0x4DE, // uint32, BattlefieldMgrEntryInvite + SMSG_UNKNOWN_1246 = 0x4DE, // uint32, EVENT_BATTLEFIELD_MGR_ENTRY_INVITE CMSG_UNKNOWN_1247 = 0x4DF, // lua: BattlefieldMgrEntryInviteResponse - SMSG_UNKNOWN_1248 = 0x4E0, // uint32, uint8, uint8 - SMSG_UNKNOWN_1249 = 0x4E1, // uint32 BattlefieldMgrQueueInvite + SMSG_UNKNOWN_1248 = 0x4E0, // uint32, uint8, uint8 EVENT_BATTLEFIELD_MGR_ENTERED + SMSG_UNKNOWN_1249 = 0x4E1, // uint32 EVENT_BATTLEFIELD_MGR_QUEUE_INVITE CMSG_UNKNOWN_1250 = 0x4E2, // lua: BattlefieldMgrQueueInviteResponse CMSG_UNKNOWN_1251 = 0x4E3, // lua: BattlefieldMgrQueueRequest - SMSG_UNKNOWN_1252 = 0x4E4, // uint32, uint8 queue full/can't join - SMSG_UNKNOWN_1253 = 0x4E5, // uint32 wintergrasp is full, you'll be ejected soon - SMSG_UNKNOWN_1254 = 0x4E6, // uint32, uint32, uint8 + SMSG_UNKNOWN_1252 = 0x4E4, // uint32, uint8 EVENT_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE + SMSG_UNKNOWN_1253 = 0x4E5, // uint32 EVENT_BATTLEFIELD_MGR_EJECT_PENDING + SMSG_UNKNOWN_1254 = 0x4E6, // uint32, uint32, uint8 EVENT_BATTLEFIELD_MGR_EJECTED CMSG_UNKNOWN_1255 = 0x4E7, // lua: BattlefieldMgrExitRequest - SMSG_UNKNOWN_1256 = 0x4E8, // uint32, uint32 + SMSG_UNKNOWN_1256 = 0x4E8, // uint32, uint32 EVENT_BATTLEFIELD_MGR_STATE_CHANGE UMSG_UNKNOWN_1257 = 0x4E9, // not found 3.2 UMSG_UNKNOWN_1258 = 0x4EA, // not found 3.2 MSG_SET_RAID_DIFFICULTY = 0x4EB, // lua: SetRaidDifficulty @@ -1308,7 +1308,7 @@ enum Opcodes SMSG_WORLD_STATE_UI_TIMER_UPDATE = 0x4F7, CMSG_UNKNOWN_1272 = 0x4F8, // called from lua: CreateCharacter, paid race change UMSG_UNKNOWN_1273 = 0x4F9, // not found 10554 - SMSG_UNKNOWN_1274 = 0x4FA, // uint8 + SMSG_UNKNOWN_1274 = 0x4FA, // uint8 EVENT_TALENTS_INVOLUNTARILY_RESET UMSG_UNKNOWN_1275 = 0x4FB, // not found 10554 SMSG_UNKNOWN_1276 = 0x4FC, // does nothing in 10554 SMSG_UNKNOWN_1277 = 0x4FD, // loot related? diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h index 3407999e6..0f5bb6437 100644 --- a/src/game/SpellAuraDefines.h +++ b/src/game/SpellAuraDefines.h @@ -349,7 +349,17 @@ enum AuraType SPELL_AURA_304 = 304, SPELL_AURA_MOD_MINIMUM_SPEED = 305, SPELL_AURA_306 = 306, - TOTAL_AURAS = 307 + SPELL_AURA_307 = 307, + SPELL_AURA_308 = 308, + SPELL_AURA_309 = 309, + SPELL_AURA_310 = 310, + SPELL_AURA_311 = 311, + SPELL_AURA_312 = 312, + SPELL_AURA_313 = 313, + SPELL_AURA_314 = 314, + SPELL_AURA_315 = 315, + SPELL_AURA_316 = 316, + TOTAL_AURAS = 317 }; enum AreaAuraType diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 337340650..e31a28020 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -356,7 +356,17 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &Aura::HandleNULL, //303 17 spells &Aura::HandleNULL, //304 2 spells (alcohol effect?) &Aura::HandleAuraModIncreaseSpeed, //305 SPELL_AURA_MOD_MINIMUM_SPEED - &Aura::HandleNULL //306 1 spell + &Aura::HandleNULL, //306 1 spell + &Aura::HandleNULL, //307 absorb healing? + &Aura::HandleNULL, //308 new aura for hunter traps + &Aura::HandleNULL, //309 absorb healing? + &Aura::HandleNULL, //310 pet avoidance passive? + &Aura::HandleNULL, //311 0 spells in 3.3 + &Aura::HandleNULL, //312 0 spells in 3.3 + &Aura::HandleNULL, //313 0 spells in 3.3 + &Aura::HandleNULL, //314 1 test spell (reduce duration of silince/magic) + &Aura::HandleNULL, //315 underwater walking + &Aura::HandleNULL //316 makes haste affect HOT/DOT ticks }; static AuraType const frozenAuraTypes[] = { SPELL_AURA_MOD_ROOT, SPELL_AURA_MOD_STUN, SPELL_AURA_NONE };