Skip to content

Commit

Permalink
Add rudimentary parsing of 1.15.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@killerwife
killerwife committed Nov 3, 2024
1 parent 22cd338 commit 5dc2c5c
Show file tree
Hide file tree
Showing 55 changed files with 7,890 additions and 12 deletions.
14 changes: 9 additions & 5 deletions WowPacketParser/Enums/Version/Opcodes.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
using WowPacketParser.Enums.Version.V11_0_2_55959;
using WowPacketParser.Enums.Version.V11_0_5_57171;
using WowPacketParser.Misc;
using WowPacketParser.Enums.Version.V1_15_4_56738;

namespace WowPacketParser.Enums.Version
{
Expand Down Expand Up @@ -955,11 +956,6 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
case ClientVersionBuild.V1_15_3_55917:
case ClientVersionBuild.V1_15_3_55488:
case ClientVersionBuild.V1_15_3_55626:
case ClientVersionBuild.V1_15_4_56738:
case ClientVersionBuild.V1_15_4_56760:
case ClientVersionBuild.V1_15_4_56817:
case ClientVersionBuild.V1_15_4_56857:
case ClientVersionBuild.V1_15_4_57134:
return ClientVersionBuild.V1_15_0_52302;
case ClientVersionBuild.V4_4_0_54481:
case ClientVersionBuild.V4_4_0_54500:
Expand All @@ -983,6 +979,12 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
case ClientVersionBuild.V4_4_0_56713:
case ClientVersionBuild.V4_4_0_57244:
return ClientVersionBuild.V4_4_0_54481;
case ClientVersionBuild.V1_15_4_56738: // inherits from above
case ClientVersionBuild.V1_15_4_56760:
case ClientVersionBuild.V1_15_4_56817:
case ClientVersionBuild.V1_15_4_56857:
case ClientVersionBuild.V1_15_4_57134:
return ClientVersionBuild.V1_15_4_56738;
case ClientVersionBuild.V4_4_1_57294:
return ClientVersionBuild.V4_4_1_57294;
default:
Expand Down Expand Up @@ -1144,6 +1146,8 @@ public static BiDictionary<Opcode, int> GetOpcodeDictionary(ClientVersionBuild b
return Opcodes_1_14_4.Opcodes(direction);
case ClientVersionBuild.V1_15_0_52302:
return Opcodes_1_15_0.Opcodes(direction);
case ClientVersionBuild.V1_15_4_56738:
return Opcodes_1_15_4.Opcodes(direction);
case ClientVersionBuild.V2_5_1_38835:
return Opcodes_2_5_1.Opcodes(direction);
case ClientVersionBuild.V2_5_2_39570:
Expand Down
5 changes: 4 additions & 1 deletion WowPacketParser/Enums/Version/UpdateFields.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1049,13 +1049,16 @@ private static string GetUpdateFieldDictionaryBuildName(ClientVersionBuild build
case ClientVersionBuild.V1_15_3_55917:
case ClientVersionBuild.V1_15_3_55488:
case ClientVersionBuild.V1_15_3_55626:
{
return "V1_15_0_52302";
}
case ClientVersionBuild.V1_15_4_56738:
case ClientVersionBuild.V1_15_4_56760:
case ClientVersionBuild.V1_15_4_56817:
case ClientVersionBuild.V1_15_4_56857:
case ClientVersionBuild.V1_15_4_57134:
{
return "V1_15_0_52302";
return "V1_15_4_56738";
}
case ClientVersionBuild.V2_5_1_38598:
case ClientVersionBuild.V2_5_1_38644:
Expand Down
1,684 changes: 1,684 additions & 0 deletions WowPacketParser/Enums/Version/V1_15_4_56738/Opcodes.cs
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions WowPacketParser/Misc/ClientVersion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1362,11 +1362,6 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
case ClientVersionBuild.V1_15_3_55917:
case ClientVersionBuild.V1_15_3_55488:
case ClientVersionBuild.V1_15_3_55626:
case ClientVersionBuild.V1_15_4_56738:
case ClientVersionBuild.V1_15_4_56760:
case ClientVersionBuild.V1_15_4_56817:
case ClientVersionBuild.V1_15_4_56857:
case ClientVersionBuild.V1_15_4_57134:
return ClientVersionBuild.V3_4_0_45166;
case ClientVersionBuild.V4_4_0_54481:
case ClientVersionBuild.V4_4_0_54500:
Expand All @@ -1389,6 +1384,11 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
case ClientVersionBuild.V4_4_0_56489:
case ClientVersionBuild.V4_4_0_56713:
case ClientVersionBuild.V4_4_0_57244:
case ClientVersionBuild.V1_15_4_56738:
case ClientVersionBuild.V1_15_4_56760:
case ClientVersionBuild.V1_15_4_56817:
case ClientVersionBuild.V1_15_4_56857:
case ClientVersionBuild.V1_15_4_57134:
case ClientVersionBuild.V4_4_1_57294:
return ClientVersionBuild.V4_4_0_54481;
case ClientVersionBuild.BattleNetV37165:
Expand Down
6 changes: 5 additions & 1 deletion WowPacketParserModule.V4_4_0_54481/Parsers/ChatHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ public static void HandleServerChatMessage(Packet packet)
packet.ReadUInt32("TargetVirtualAddress");
packet.ReadUInt32("SenderVirtualAddress");
packet.ReadInt32("AchievementID");
var chatFlags = 0u;
if (ClientVersion.AddedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_4_56738))
chatFlags = packet.ReadUInt16("ChatFlags");
packet.ReadSingle("DisplayTime");
packet.ReadInt32<SpellId>("SpellID");

Expand All @@ -46,7 +49,8 @@ public static void HandleServerChatMessage(Packet packet)
var prefixLen = packet.ReadBits(5);
var channelLen = packet.ReadBits(7);
var textLen = packet.ReadBits(12);
var chatFlags = packet.ReadBits("ChatFlags", 15);
if (ClientVersion.RemovedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_4_56738))
chatFlags = packet.ReadBits("ChatFlags", 15);

packet.ReadBit("HideChatLog");
packet.ReadBit("FakeSenderName");
Expand Down
Loading

0 comments on commit 5dc2c5c

Please sign in to comment.