Skip to content

Implement parsing of 2.5.6 #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
killerwife wants to merge 1 commit into
base: master
Choose a base branch
from
+6,842 −5
Open

Implement parsing of 2.5.6 #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions WowPacketParser/Enums/ClientVersionBuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,13 @@ public enum ClientVersionBuild
V2_5_5_67852 = 67852, // live
V2_5_5_68101 = 68101, // live

V2_5_6_68502 = 68502, // live
V2_5_6_68575 = 68575, // live
V2_5_6_68749 = 68749, // live
V2_5_6_68775 = 68775, // live
V2_5_6_68941 = 68941, // live
V2_5_6_69110 = 69110, // live and ptr

V3_4_0_44832 = 44832, // ptr / beta
V3_4_0_45166 = 45166, // ptr / beta
V3_4_0_45189 = 45189, // ptr / beta
Expand Down
10 changes: 10 additions & 0 deletions WowPacketParser/Enums/Version/Opcodes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
using WowPacketParser.Enums.Version.V12_0_7_67808;
using WowPacketParser.Enums.Version.V12_1_0_69214;
using WowPacketParser.Misc;
using WowPacketParser.Enums.Version.V2_5_6_68502;

namespace WowPacketParser.Enums.Version
{
Expand Down Expand Up @@ -1311,6 +1312,13 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
case ClientVersionBuild.V2_5_5_67852:
case ClientVersionBuild.V2_5_5_68101:
return ClientVersionBuild.V2_5_5_64796;
case ClientVersionBuild.V2_5_6_68502:
case ClientVersionBuild.V2_5_6_68575:
case ClientVersionBuild.V2_5_6_68749:
case ClientVersionBuild.V2_5_6_68775:
case ClientVersionBuild.V2_5_6_68941:
case ClientVersionBuild.V2_5_6_69110:
return ClientVersionBuild.V2_5_6_68502;
default:
return ClientVersionBuild.V3_3_5a_12340;
}
Expand Down Expand Up @@ -1518,6 +1526,8 @@ public static BiDictionary<Opcode, int> GetOpcodeDictionary(ClientVersionBuild b
return Opcodes_2_5_4.Opcodes(direction);
case ClientVersionBuild.V2_5_5_64796:
return Opcodes_2_5_5.Opcodes(direction);
case ClientVersionBuild.V2_5_6_68502:
return Opcodes_2_5_6.Opcodes(direction);
case ClientVersionBuild.V3_4_0_45166:
return Opcodes_3_4_0.Opcodes(direction);
case ClientVersionBuild.V3_4_1_47014:
Expand Down
9 changes: 9 additions & 0 deletions WowPacketParser/Enums/Version/UpdateFields.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,6 +1357,15 @@ private static ClientVersionBuild GetUpdateFieldDictionaryBuild(ClientVersionBui
{
return ClientVersionBuild.V2_5_5_64796;
}
case ClientVersionBuild.V2_5_6_68502:
case ClientVersionBuild.V2_5_6_68575:
case ClientVersionBuild.V2_5_6_68749:
case ClientVersionBuild.V2_5_6_68775:
case ClientVersionBuild.V2_5_6_68941:
case ClientVersionBuild.V2_5_6_69110:
{
return ClientVersionBuild.V2_5_6_68502;
}
case ClientVersionBuild.V3_4_0_45166:
case ClientVersionBuild.V3_4_0_44832:
case ClientVersionBuild.V3_4_0_45189:
Expand Down
69 changes: 69 additions & 0 deletions WowPacketParser/Enums/Version/V2_5_6_68502/Opcodes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
using WowPacketParser.Misc;

namespace WowPacketParser.Enums.Version.V2_5_6_68502
{
public static class Opcodes_2_5_6
{
public static BiDictionary<Opcode, int> Opcodes(Direction direction)
{
switch (direction)
{
case Direction.ClientToServer:
return ClientOpcodes;
case Direction.ServerToClient:
return ServerOpcodes;
default:
return MiscOpcodes;
}
}

private static readonly BiDictionary<Opcode, int> ClientOpcodes = new()
{
{ Opcode.CMSG_CAST_SPELL, 0x3E0160 },
{ Opcode.CMSG_CHAT_MESSAGE_SAY, 0x2F0023 },
{ Opcode.CMSG_CHAT_MESSAGE_EMOTE, 0x2F0024 },
{ Opcode.CMSG_AREA_TRIGGER, 0x3E0088 },
{ Opcode.CMSG_SEND_TEXT_EMOTE, 0x3F0014 },
{ Opcode.CMSG_USE_ITEM, 0x3E015C },
};

private static readonly BiDictionary<Opcode, int> ServerOpcodes = new()
{
{ Opcode.SMSG_QUERY_QUEST_INFO_RESPONSE, 0x640016 },
{ Opcode.SMSG_QUERY_CREATURE_RESPONSE, 0x4A0006 },
{ Opcode.SMSG_QUERY_GAME_OBJECT_RESPONSE, 0x4A0007 },

{ Opcode.SMSG_GOSSIP_COMPLETE, 0x640017 },
{ Opcode.SMSG_GOSSIP_MESSAGE, 0x640018 },
{ Opcode.SMSG_GOSSIP_QUEST_UPDATE, 0x640019 },
{ Opcode.SMSG_GOSSIP_REFRESH_OPTIONS, 0x640027 },
{ Opcode.SMSG_GOSSIP_OPTION_NPC_INTERACTION, 0x640028 },

{ Opcode.SMSG_SET_TIME_ZONE_INFORMATION, 0x460124 },
{ Opcode.SMSG_HIGHEST_THREAT_UPDATE, 0x460187 },
{ Opcode.SMSG_THREAT_CLEAR, 0x46018A },
{ Opcode.SMSG_THREAT_REMOVE, 0x460189 },
{ Opcode.SMSG_THREAT_UPDATE, 0x460188 },
{ Opcode.SMSG_ATTACKER_STATE_UPDATE, 0x4C0030 },
{ Opcode.SMSG_ATTACK_START, 0x4C001B },
{ Opcode.SMSG_ATTACK_STOP, 0x4C001C },
{ Opcode.SMSG_AI_REACTION, 0x460163 },
{ Opcode.SMSG_TEXT_EMOTE, 0x460127 },
{ Opcode.SMSG_EMOTE, 0x46027D },
{ Opcode.SMSG_CHAT, 0x4B0001 },
{ Opcode.SMSG_ON_MONSTER_MOVE, 0x5E0002 },
{ Opcode.SMSG_UPDATE_OBJECT, 0x5C0000 },
{ Opcode.SMSG_AURA_UPDATE, 0x660011 },
{ Opcode.SMSG_CAST_FAILED, 0x660048 },
{ Opcode.SMSG_SPELL_GO, 0x66002A },
{ Opcode.SMSG_SPELL_START, 0x66002B },
{ Opcode.SMSG_SPELL_COOLDOWN, 0x660005 },
{ Opcode.SMSG_SPELL_CATEGORY_COOLDOWN, 0x660006 },
{ Opcode.SMSG_PET_SPELLS_MESSAGE, 0x660014 },
{ Opcode.SMSG_SPELL_NON_MELEE_DAMAGE_LOG, 0x660021 },
{ Opcode.SMSG_SPELL_INSTAKILL_LOG, 0x660022 },
};

private static readonly BiDictionary<Opcode, int> MiscOpcodes = new();
}
}
12 changes: 12 additions & 0 deletions WowPacketParser/Misc/ClientVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,6 +1799,12 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
case ClientVersionBuild.V2_5_5_67511:
case ClientVersionBuild.V2_5_5_67852:
case ClientVersionBuild.V2_5_5_68101:
case ClientVersionBuild.V2_5_6_68502:
case ClientVersionBuild.V2_5_6_68575:
case ClientVersionBuild.V2_5_6_68749:
case ClientVersionBuild.V2_5_6_68775:
case ClientVersionBuild.V2_5_6_68941:
case ClientVersionBuild.V2_5_6_69110:
return ClientVersionBuild.V5_5_0_61735;
case ClientVersionBuild.BattleNetV37165:
return ClientVersionBuild.BattleNetV37165;
Expand Down Expand Up @@ -2312,6 +2318,12 @@ public static bool IsBurningCrusadeClassicClientVersionBuild(ClientVersionBuild
case ClientVersionBuild.V2_5_5_67511:
case ClientVersionBuild.V2_5_5_67852:
case ClientVersionBuild.V2_5_5_68101:
case ClientVersionBuild.V2_5_6_68502:
case ClientVersionBuild.V2_5_6_68575:
case ClientVersionBuild.V2_5_6_68749:
case ClientVersionBuild.V2_5_6_68775:
case ClientVersionBuild.V2_5_6_68941:
case ClientVersionBuild.V2_5_6_69110:
return true;
default:
return false;
Expand Down
6 changes: 5 additions & 1 deletion WowPacketParserModule.V5_5_0_61735/Parsers/CombatLogHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using WowPacketParser.Enums;
using System;
using WowPacketParser.Enums;
using WowPacketParser.Misc;
using WowPacketParser.Parsing;

Expand Down Expand Up @@ -394,6 +395,9 @@ public static void HandleSpellNonMeleeDmgLog255(Packet packet)

packet.ReadInt32<SpellId>("SpellID");
packet.ReadInt32("SpellXSpellVisual");
if (ClientVersion.AddedInVersion(ClientVersionBuild.V2_5_6_68502))
packet.ReadInt32("ScriptVisualID");

packet.ReadInt32("Damage");
packet.ReadInt32("OriginalDamage");
packet.ReadInt32("OverKill");
Expand Down
3 changes: 3 additions & 0 deletions WowPacketParserModule.V5_5_0_61735/Parsers/MovementHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Google.Protobuf.WellKnownTypes;
using System;
using System.Linq;
using WowPacketParser.DBC;
using WowPacketParser.Enums;
Expand Down Expand Up @@ -421,6 +422,8 @@ public static MovementInfo ReadMovementStats(Packet packet, params object[] idx)

var int152 = packet.ReadInt32("RemoveForcesCount", idx);
packet.ReadInt32("MoveIndex", idx);
if (ClientVersion.AddedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_6_68502))
packet.ReadSingle("GravityModifier", idx);

for (var i = 0; i < int152; i++)
packet.ReadPackedGuid128("RemoveForcesIDs", idx, i);
Expand Down
18 changes: 14 additions & 4 deletions WowPacketParserModule.V5_5_0_61735/Parsers/SpellHandler1158.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public static void ReadSpellTargetData(Packet packet, PacketSpellData packetSpel
var hasSrcLoc = packet.ReadBit("HasSrcLocation", idx);
var hasDstLoc = packet.ReadBit("HasDstLocation", idx);
var hasOrient = packet.ReadBit("HasOrientation", idx);
var hasMapID = packet.ReadBit("hasMapID ", idx);
var hasMapID = packet.ReadBit("HasMapID", idx);
var nameLength = packet.ReadBits(7);

if (hasSrcLoc)
Expand Down Expand Up @@ -443,39 +443,49 @@ public static uint ReadSpellCastRequest(Packet packet, params object[] idx)
if (ClientVersion.AddedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_5_64796))
packet.ReadByte("SendCastFlags", idx);

for (var i = 0; i < 2; i++)
uint miscCount = ClientVersion.AddedInVersion(ClientVersionBuild.V2_5_6_68502) ? 3u : 2u;
for (var i = 0; i < miscCount; i++)
packet.ReadInt32("Misc", idx, i);

var spellId = packet.ReadUInt32<SpellId>("SpellID", idx);
packet.ReadInt32("SpellXSpellVisual", idx);
//if (ClientVersion.AddedInVersion(ClientVersionBuild.V2_5_6_68502))
// packet.ReadInt32("ScriptVisualID", idx);

ReadMissileTrajectoryRequest(packet, idx, "MissileTrajectory");

packet.ReadPackedGuid128("CraftingNPC", idx);

var optionalCurrenciesCount = packet.ReadUInt32("OptionalCurrenciesCount", idx);
var optionalReagentsCount = packet.ReadUInt32("OptionalReagentsCount", idx);

var removedModificationsCount = packet.ReadUInt32("RemovedModificationsCount", idx);

packet.ReadByte("CraftingFlags", idx);

for (var j = 0; j < optionalCurrenciesCount; ++j)
ReadOptionalCurrency(packet, idx, "OptionalCurrency", j);

if (ClientVersion.AddedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_5_64796))
if (ClientVersion.AddedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_5_64796) && ClientVersion.RemovedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_6_68502))
ReadSpellTargetData(packet, null, spellId, idx, "Target");

packet.ResetBitReader();
if (ClientVersion.RemovedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_5_64796))
packet.ReadBits("SendCastFlags", 6, idx);

var hasReceiveTime = false;
if (ClientVersion.AddedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_6_68502))
packet.ReadBit("HasReceiveTime", idx);
var hasMoveUpdate = packet.ReadBit("HasMoveUpdate", idx);
var weightCount = packet.ReadBits("WeightCount", 2, idx);
var hasCraftingOrderID = packet.ReadBit("HasCrafingOrderID", idx);

if (ClientVersion.RemovedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_5_64796))
if (ClientVersion.RemovedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_5_64796) || ClientVersion.AddedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_6_68502))
ReadSpellTargetData(packet, null, spellId, idx, "Target");

if (hasReceiveTime)
packet.ReadUInt32("ReceiveTime", idx);

if (hasCraftingOrderID && ClientVersion.RemovedInVersion(ClientBranch.TBC, ClientVersionBuild.V2_5_5_64796))
packet.ReadUInt64("CraftingOrderID", idx);

Expand Down
Loading