Skip to content

Commit 2a233ce

Browse files
Alica228Alica228
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # WowPacketParser/Misc/ClientVersion.cs
2 parents 3282a4c + d036b28 commit 2a233ce

Some content is hidden

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

69 files changed

+8148
-5
lines changed

‎WowPacketParser/Enums/ClientVersionBuild.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,10 @@ public enum ClientVersionBuild
811811
V1_15_7_63306 = 63306, // live
812812
V1_15_7_63696 = 63696, // live
813813

814+
V1_15_8_63829 = 63829, // ptr and live
815+
V1_15_8_64057 = 64057, // ptr and live
816+
V1_15_8_64130 = 64130, // live
817+
814818
// TBC Classic
815819
V2_5_1_38598 = 38598, // ptr
816820
V2_5_1_38644 = 38644,

‎WowPacketParser/Enums/Version/Opcodes.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using WowPacketParser.Enums.Version.V1_15_5_57638;
1313
using WowPacketParser.Enums.Version.V1_15_6_58797;
1414
using WowPacketParser.Enums.Version.V1_15_7_60000;
15+
using WowPacketParser.Enums.Version.V1_15_8_63829;
1516
using WowPacketParser.Enums.Version.V2_4_3_8606;
1617
using WowPacketParser.Enums.Version.V2_5_1_38835;
1718
using WowPacketParser.Enums.Version.V2_5_2_39570;
@@ -1111,6 +1112,10 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
11111112
case ClientVersionBuild.V1_15_7_63306:
11121113
case ClientVersionBuild.V1_15_7_63696:
11131114
return ClientVersionBuild.V1_15_7_60000;
1115+
case ClientVersionBuild.V1_15_8_63829:
1116+
case ClientVersionBuild.V1_15_8_64057:
1117+
case ClientVersionBuild.V1_15_8_64130:
1118+
return ClientVersionBuild.V1_15_8_63829;
11141119
case ClientVersionBuild.V3_4_4_59817:
11151120
case ClientVersionBuild.V3_4_4_59853:
11161121
case ClientVersionBuild.V3_4_4_59887:
@@ -1354,6 +1359,8 @@ public static BiDictionary<Opcode, int> GetOpcodeDictionary(ClientVersionBuild b
13541359
return Opcodes_1_15_6.Opcodes(direction);
13551360
case ClientVersionBuild.V1_15_7_60000:
13561361
return Opcodes_1_15_7.Opcodes(direction);
1362+
case ClientVersionBuild.V1_15_8_63829:
1363+
return Opcodes_1_15_8.Opcodes(direction);
13571364
case ClientVersionBuild.V2_5_1_38835:
13581365
return Opcodes_2_5_1.Opcodes(direction);
13591366
case ClientVersionBuild.V2_5_2_39570:

‎WowPacketParser/Enums/Version/UpdateFields.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,6 +1183,12 @@ private static string GetUpdateFieldDictionaryBuildName(ClientVersionBuild build
11831183
{
11841184
return "V1_15_7_60000";
11851185
}
1186+
case ClientVersionBuild.V1_15_8_63829:
1187+
case ClientVersionBuild.V1_15_8_64057:
1188+
case ClientVersionBuild.V1_15_8_64130:
1189+
{
1190+
return "V1_15_8_63829";
1191+
}
11861192
case ClientVersionBuild.V2_5_1_38598:
11871193
case ClientVersionBuild.V2_5_1_38644:
11881194
case ClientVersionBuild.V2_5_1_38707:

‎WowPacketParser/Enums/Version/V1_15_8_63829/Opcodes.cs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
using WowPacketParser.Misc;
2+
3+
namespace WowPacketParser.Enums.Version.V1_15_8_63829
4+
{
5+
public static class Opcodes_1_15_8
6+
{
7+
public static BiDictionary<Opcode, int> Opcodes(Direction direction)
8+
{
9+
switch (direction)
10+
{
11+
case Direction.ClientToServer:
12+
return ClientOpcodes;
13+
case Direction.ServerToClient:
14+
return ServerOpcodes;
15+
default:
16+
return MiscOpcodes;
17+
}
18+
}
19+
20+
private static readonly BiDictionary<Opcode, int> ClientOpcodes = new()
21+
{
22+
{ Opcode.CMSG_CHAT_MESSAGE_SAY, 0x2F0023 },
23+
{ Opcode.CMSG_SEND_TEXT_EMOTE, 0x2F0024 },
24+
{ Opcode.CMSG_USE_ITEM, 0x30016B },
25+
};
26+
27+
private static readonly BiDictionary<Opcode, int> ServerOpcodes = new()
28+
{
29+
{ Opcode.SMSG_TEXT_EMOTE, 0x3B0116 },
30+
{ Opcode.SMSG_EMOTE, 0x3A026B },
31+
{ Opcode.SMSG_CHAT, 0x3F0001 },
32+
{ Opcode.SMSG_ON_MONSTER_MOVE, 0x4C0002 },
33+
{ Opcode.SMSG_UPDATE_OBJECT, 0x4A0000 },
34+
{ Opcode.SMSG_AURA_UPDATE, 0x510011 },
35+
{ Opcode.SMSG_SPELL_GO, 0x510028 },
36+
{ Opcode.SMSG_SPELL_START, 0x510029 },
37+
{ Opcode.SMSG_PET_SPELLS_MESSAGE, 0x510014 },
38+
};
39+
40+
private static readonly BiDictionary<Opcode, int> MiscOpcodes = new();
41+
}
42+
}

‎WowPacketParser/Enums/WowCSEntityFragments.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public static bool IsIndirect(WowCSEntityFragments fragment)
5858
return true;
5959
case WowCSEntityFragments.FVendor_C:
6060
return ClientVersion.AddedInVersion(ClientBranch.Retail, ClientVersionBuild.V11_0_7_58630) ||
61+
ClientVersion.AddedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_8_63829) ||
6162
ClientVersion.AddedInVersion(ClientBranch.MoP, ClientVersionBuild.V5_5_0_61735) ||
6263
ClientVersion.AddedInVersion(ClientBranch.Cata, ClientVersionBuild.V4_4_2_59185) ||
6364
ClientVersion.AddedInVersion(ClientBranch.WotLK, ClientVersionBuild.V3_4_4_59817);

‎WowPacketParser/Misc/ClientVersion.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,10 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
16081608
case ClientVersionBuild.V5_5_1_63421:
16091609
case ClientVersionBuild.V5_5_1_63449:
16101610
case ClientVersionBuild.V5_5_1_63538:
1611+
case ClientVersionBuild.V1_15_8_63829:
1612+
case ClientVersionBuild.V1_15_8_64057:
16111613
case ClientVersionBuild.V5_5_2_64068:
1614+
case ClientVersionBuild.V1_15_8_64130:
16121615
case ClientVersionBuild.V5_5_2_64133:
16131616
return ClientVersionBuild.V5_5_0_61735;
16141617
case ClientVersionBuild.BattleNetV37165:
@@ -2048,6 +2051,9 @@ public static bool IsSeasonOfDiscoveryClientVersionBuild(ClientVersionBuild buil
20482051
case ClientVersionBuild.V1_15_7_62915:
20492052
case ClientVersionBuild.V1_15_7_63306:
20502053
case ClientVersionBuild.V1_15_7_63696:
2054+
case ClientVersionBuild.V1_15_8_63829:
2055+
case ClientVersionBuild.V1_15_8_64057:
2056+
case ClientVersionBuild.V1_15_8_64130:
20512057
return true;
20522058
default:
20532059
return false;

‎WowPacketParserModule.Substructures/MythicPlusHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static void ReadDungeonScoreSummary550(Packet packet, params object[] ind
4747

4848
public static void ReadDungeonScoreSummary(Packet packet, params object[] indexes)
4949
{
50-
if (ClientVersion.IsMoPClassicClientVersionBuild(ClientVersion.Build))
50+
if (ClientVersion.IsMoPClassicClientVersionBuild(ClientVersion.Build) || ClientVersion.IsSeasonOfDiscoveryClientVersionBuild(ClientVersion.Build))
5151
ReadDungeonScoreSummary550(packet, indexes);
5252
else
5353
{

‎WowPacketParserModule.V4_4_0_54481/Parsers/UpdateFieldsHandler1157.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5473,7 +5473,6 @@ public override IGameObjectData ReadCreateGameObjectData(Packet packet, UpdateFi
54735473
data.SpawnTrackingStateAnimID = packet.ReadUInt32("SpawnTrackingStateAnimID", indexes);
54745474
data.SpawnTrackingStateAnimKitID = packet.ReadUInt32("SpawnTrackingStateAnimKitID", indexes);
54755475
data.StateWorldEffectIDs = new System.Nullable<uint>[packet.ReadUInt32()];
5476-
// data.StateWorldEffectsQuestObjectiveID = packet.ReadUInt32("StateWorldEffectsQuestObjectiveID", indexes);
54775476
for (var i = 0; i < data.StateWorldEffectIDs.Length; ++i)
54785477
{
54795478
data.StateWorldEffectIDs[i] = packet.ReadUInt32("StateWorldEffectIDs", indexes, i);

‎WowPacketParserModule.V5_5_0_61735/Parser/MovementHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ public static void HandleTimeSyncReq(Packet packet)
569569
packet.ReadInt32("Count");
570570
}
571571

572-
[Parser(Opcode.SMSG_ON_MONSTER_MOVE)]
572+
[Parser(Opcode.SMSG_ON_MONSTER_MOVE, ClientBranch.MoP)]
573573
public static void HandleOnMonsterMove(Packet packet)
574574
{
575575
PacketMonsterMove monsterMove = packet.Holder.MonsterMove = new();

0 commit comments

Comments
 (0)