Skip to content

Commit 1188afd

Browse files
authored
Merge branch 'TrinityCore:master' into master
2 parents 5732315 + 58bdc06 commit 1188afd

170 files changed

Lines changed: 15332 additions & 275 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

WowPacketParser/DBC/Structures/Midnight/FactionEntry.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ public sealed class FactionEntry
77
{
88
[Index(true)]
99
public uint ID;
10-
[Cardinality(4)]
11-
public long[] ReputationRaceMask = new long[4];
1210
public string Name;
1311
public string Description;
1412
public short ReputationIndex;
@@ -31,5 +29,13 @@ public sealed class FactionEntry
3129
public float[] ParentFactionMod = new float[2];
3230
[Cardinality(2)]
3331
public byte[] ParentFactionCap = new byte[2];
32+
[Cardinality(2)]
33+
public int[] ReputationRaceMask1 = new int[2];
34+
[Cardinality(2)]
35+
public int[] ReputationRaceMask2 = new int[2];
36+
[Cardinality(2)]
37+
public int[] ReputationRaceMask3 = new int[2];
38+
[Cardinality(2)]
39+
public int[] ReputationRaceMask4 = new int[2];
3440
}
3541
}

WowPacketParser/DBC/Structures/Midnight/ItemSparseEntry.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public sealed class ItemSparseEntry
77
{
88
[Index(true)]
99
public uint ID;
10-
public long AllowableRace;
1110
public string Description;
1211
public string Display3;
1312
public string Display2;
@@ -32,6 +31,8 @@ public sealed class ItemSparseEntry
3231
public int MaxCount;
3332
public int MinReputation;
3433
public uint RequiredAbility;
34+
[Cardinality(2)]
35+
public int[] AllowableRace = new int[2];
3536
public uint SellPrice;
3637
public uint BuyPrice;
3738
public uint VendorStackCount;

WowPacketParser/Enums/ClientVersionBuild.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ public enum ClientVersionBuild
701701
V12_0_7_68182 = 68182,
702702
V12_0_7_68232 = 68232,
703703
V12_0_7_68235 = 68235,
704+
V12_0_7_68256 = 68256,
704705

705706
// Classic
706707
V1_13_2_31446 = 31446,

WowPacketParser/Enums/Opcode.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ public enum Opcode
162162
CMSG_BLACK_MARKET_BID_ON_ITEM,
163163
CMSG_BLACK_MARKET_OPEN,
164164
CMSG_BLACK_MARKET_REQUEST_ITEMS,
165+
CMSG_BLEEP_PONG,
165166
CMSG_BONUS_ROLL,
166167
CMSG_BOOTME,
167168
CMSG_BOT_DETECTED,
@@ -479,8 +480,10 @@ public enum Opcode
479480
CMSG_ENUM_CHARACTERS_DELETED_BY_CLIENT,
480481
CMSG_EQUIPMENT_SET_DELETE,
481482
CMSG_EQUIPMENT_SET_USE,
483+
CMSG_EXPIRE_BLEEP_TOKENS,
482484
CMSG_EXPIRE_RAID_INSTANCE,
483485
CMSG_FAR_SIGHT,
486+
CMSG_FETCH_BLEEP_PROXIES,
484487
CMSG_FLAG_QUEST,
485488
CMSG_FLAG_QUEST_FINISH,
486489
CMSG_FLOOD_GRACE_CHEAT,
@@ -1181,6 +1184,7 @@ public enum Opcode
11811184
CMSG_RECRUIT_A_FRIEND,
11821185
CMSG_REFER_A_FRIEND,
11831186
CMSG_REFORGE_ITEM,
1187+
CMSG_REFRESH_BLEEP_TOKENS,
11841188
CMSG_REFRESH_ENTITLEMENTS_ON_ORDER_COMPLETE,
11851189
CMSG_REGISTER_FAST_LOGIN,
11861190
CMSG_REMOVE_GLYPH,
@@ -1936,6 +1940,7 @@ public enum Opcode
19361940
SMSG_BLACK_MARKET_OUTBID,
19371941
SMSG_BLACK_MARKET_REQUEST_ITEMS_RESULT,
19381942
SMSG_BLACK_MARKET_WON,
1943+
SMSG_BLEEP_PING,
19391944
SMSG_BONUS_ROLL_EMPTY,
19401945
SMSG_BOSS_KILL,
19411946
SMSG_BREAK_TARGET,
@@ -2255,6 +2260,7 @@ public enum Opcode
22552260
SMSG_FEATURE_SYSTEM_STATUS2,
22562261
SMSG_FEATURE_SYSTEM_STATUS_GLUE_SCREEN,
22572262
SMSG_FEIGN_DEATH_RESISTED,
2263+
SMSG_FETCH_BLEEP_PROXIES_RESPONSE,
22582264
SMSG_FINAL_CHUNK,
22592265
SMSG_FISH_ESCAPED,
22602266
SMSG_FISH_NOT_HOOKED,
@@ -2538,6 +2544,7 @@ public enum Opcode
25382544
SMSG_HOUSE_EXTERIOR_SET_HOUSE_POSITION_RESPONSE,
25392545
SMSG_HOUSING_DECOR_ADD_TO_HOUSE_CHEST_RESPONSE,
25402546
SMSG_HOUSING_DECOR_DELETE_FROM_STORAGE_RESPONSE,
2547+
SMSG_HOUSING_DECOR_DRAW_SERVER_LIGHTING_DEBUG_SPHERES_RESPONSE,
25412548
SMSG_HOUSING_DECOR_LOCK_RESPONSE,
25422549
SMSG_HOUSING_DECOR_MOVE_RESPONSE,
25432550
SMSG_HOUSING_DECOR_PLACE_RESPONSE,
@@ -3243,6 +3250,7 @@ public enum Opcode
32433250
SMSG_REFER_A_FRIEND_FAILURE,
32443251
SMSG_REFETCH_TACT_KEYS,
32453252
SMSG_REFORGE_RESULT,
3253+
SMSG_REFRESH_BLEEP_TOKENS_RESPONSE,
32463254
SMSG_REFRESH_COMPONENT,
32473255
SMSG_REFRESH_SPELL_HISTORY,
32483256
SMSG_REGIONWIDE_CHARACTER_MAIL_DATA,

WowPacketParser/Enums/Version/Opcodes.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,7 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
890890
case ClientVersionBuild.V12_0_7_68182:
891891
case ClientVersionBuild.V12_0_7_68232:
892892
case ClientVersionBuild.V12_0_7_68235:
893+
case ClientVersionBuild.V12_0_7_68256:
893894
return ClientVersionBuild.V12_0_7_67808;
894895
case ClientVersionBuild.V1_13_2_31446:
895896
case ClientVersionBuild.V1_13_2_31650:

WowPacketParser/Enums/Version/UpdateFields.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,6 +1062,7 @@ private static ClientVersionBuild GetUpdateFieldDictionaryBuild(ClientVersionBui
10621062
case ClientVersionBuild.V12_0_7_68182:
10631063
case ClientVersionBuild.V12_0_7_68232:
10641064
case ClientVersionBuild.V12_0_7_68235:
1065+
case ClientVersionBuild.V12_0_7_68256:
10651066
{
10661067
return ClientVersionBuild.V12_0_7_67808;
10671068
}

0 commit comments

Comments
 (0)