diff --git a/LostArkLogger/Packets/OpCodes_steam.cs b/LostArkLogger/Packets/OpCodes_steam.cs index aa8705e6..7faf4ee0 100644 --- a/LostArkLogger/Packets/OpCodes_steam.cs +++ b/LostArkLogger/Packets/OpCodes_steam.cs @@ -3,28 +3,28 @@ namespace LostArkLogger { public enum OpCodes_Steam : UInt16 { - PKTAuthTokenResult = 0x944D, - PKTCounterAttackNotify = 0xA431, - PKTDeathNotify = 0x45F4, - PKTInitEnv = 0x8E87, - PKTInitPC = 0x7B79, - PKTNewNpc = 0xA8C2, - PKTNewNpcSummon = 0x9209, - PKTNewPC = 0xA5E3, - PKTNewProjectile = 0xC922, - PKTPartyStatusEffectAddNotify = 0x2458, - PKTPartyStatusEffectRemoveNotify = 0x528C, - PKTRaidBossKillNotify = 0x4AAF, - PKTRaidResult = 0x4AA3, - PKTRemoveObject = 0x3203, - PKTSkillDamageAbnormalMoveNotify = 0xCE05, - PKTSkillDamageNotify = 0x5D14, - PKTSkillStageNotify = 0x2C23, - PKTSkillStartNotify = 0x5EAE, - PKTStatChangeOriginNotify = 0xE186, - PKTStatusEffectAddNotify = 0xC7DB, - PKTStatusEffectRemoveNotify = 0xE873, - PKTTriggerBossBattleStatus = 0xC3C2, - PKTTriggerStartNotify = 0x8655, + PKTAuthTokenResult = 0x2D5F, + PKTCounterAttackNotify = 0xADD6, + PKTDeathNotify = 0x84C3, + PKTInitEnv = 0xD5FB, + PKTInitPC = 0x3631, + PKTNewNpc = 0xDC24, + PKTNewNpcSummon = 0x26C7, + PKTNewPC = 0x348E, + PKTNewProjectile = 0xC089, + PKTPartyStatusEffectAddNotify = 0x9B50, + PKTPartyStatusEffectRemoveNotify = 0x5FAD, + PKTRaidBossKillNotify = 0xDC79, + PKTRaidResult = 0x2A4, + PKTRemoveObject = 0x5439, + PKTSkillDamageAbnormalMoveNotify = 0xFC8, + PKTSkillDamageNotify = 0x5391, + PKTSkillStageNotify = 0x12A7, + PKTSkillStartNotify = 0xCF9, + PKTStatChangeOriginNotify = 0x2DBA, + PKTStatusEffectAddNotify = 0x1E87, + PKTStatusEffectRemoveNotify = 0xE5C5, + PKTTriggerBossBattleStatus = 0x5647, + PKTTriggerStartNotify = 0x8311, } } diff --git a/LostArkLogger/Packets/Steam/ItemInfo.cs b/LostArkLogger/Packets/Steam/ItemInfo.cs index 04276cac..2e56d383 100644 --- a/LostArkLogger/Packets/Steam/ItemInfo.cs +++ b/LostArkLogger/Packets/Steam/ItemInfo.cs @@ -6,14 +6,14 @@ public partial class ItemInfo { public void SteamDecode(BitReader reader) { + s64_0 = reader.ReadSimpleInt(); Level = reader.ReadUInt16(); u16_0 = reader.ReadUInt16(); - bytearraylist_0 = reader.ReadList(14); - s64_0 = reader.ReadSimpleInt(); - u32_0 = reader.ReadUInt32(); b_0 = reader.ReadByte(); if (b_0 == 1) b_1 = reader.ReadByte(); + u32_0 = reader.ReadUInt32(); + bytearraylist_0 = reader.ReadList(14); } } } diff --git a/LostArkLogger/Packets/Steam/NpcStruct.cs b/LostArkLogger/Packets/Steam/NpcStruct.cs index ed288a1a..81a0ea01 100644 --- a/LostArkLogger/Packets/Steam/NpcStruct.cs +++ b/LostArkLogger/Packets/Steam/NpcStruct.cs @@ -7,74 +7,74 @@ public partial class NpcStruct public void SteamDecode(BitReader reader) { b_0 = reader.ReadByte(); - b_1 = reader.ReadByte(); - if (b_1 == 1) - b_2 = reader.ReadByte(); - b_13 = reader.ReadByte(); - if (b_13 == 1) - u32_3 = reader.ReadUInt32(); - b_21 = reader.ReadByte(); - if (b_21 == 1) - u64_1 = reader.ReadUInt64(); - b_25 = reader.ReadByte(); - if (b_25 == 1) - b_26 = reader.ReadByte(); - b_27 = reader.ReadByte(); - if (b_27 == 1) - u32_5 = reader.ReadUInt32(); + NpcType = reader.ReadUInt32(); + b_10 = reader.ReadByte(); + if (b_10 == 1) + b_11 = reader.ReadByte(); + u64_1 = reader.ReadUInt64(); + b_24 = reader.ReadByte(); + if (b_24 == 1) + b_25 = reader.ReadByte(); + b_26 = reader.ReadByte(); + if (b_26 == 1) + b_27 = reader.ReadByte(); b_28 = reader.ReadByte(); - if (b_28 == 1) - subPKTNewNpc66 = reader.Read(); b_29 = reader.ReadByte(); - statusEffectDatas = reader.ReadList(); b_30 = reader.ReadByte(); if (b_30 == 1) u16_3 = reader.ReadUInt16(); + u32_5 = reader.ReadUInt32(); + u16_0 = reader.ReadUInt16(); + b_1 = reader.ReadByte(); + if (b_1 == 1) + b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); if (b_3 == 1) - u32_0 = reader.ReadUInt32(); - b_4 = reader.ReadByte(); - if (b_4 == 1) - u32_1 = reader.ReadUInt32(); - u32_2 = reader.ReadUInt32(); - NpcType = reader.ReadUInt32(); + b_4 = reader.ReadByte(); b_5 = reader.ReadByte(); if (b_5 == 1) - b_6 = reader.ReadByte(); - b_7 = reader.ReadByte(); + u32_0 = reader.ReadUInt32(); + b_6 = reader.ReadByte(); + if (b_6 == 1) + b_7 = reader.ReadByte(); b_8 = reader.ReadByte(); if (b_8 == 1) - u16_0 = reader.ReadUInt16(); + u32_1 = reader.ReadUInt32(); b_9 = reader.ReadByte(); - b_10 = reader.ReadByte(); - if (b_10 == 1) - b_11 = reader.ReadByte(); - b_12 = reader.ReadByte(); + if (b_9 == 1) + u32_2 = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); subPKTInitPC29s = reader.ReadList(); + NpcId = reader.ReadUInt64(); + b_12 = reader.ReadByte(); + if (b_12 == 1) + b_13 = reader.ReadByte(); b_14 = reader.ReadByte(); if (b_14 == 1) - b_15 = reader.ReadByte(); + u32_3 = reader.ReadUInt32(); + statPair = reader.Read(); + b_15 = reader.ReadByte(); + if (b_15 == 1) + u64_0 = reader.ReadUInt64(); b_16 = reader.ReadByte(); - if (b_16 == 1) - b_17 = reader.ReadByte(); - u16_1 = reader.ReadUInt16(); - u16_2 = reader.ReadUInt16(); + b_17 = reader.ReadByte(); b_18 = reader.ReadByte(); if (b_18 == 1) - bytearraylist_0 = reader.ReadList(12); - NpcId = reader.ReadUInt64(); + u32_4 = reader.ReadUInt32(); b_19 = reader.ReadByte(); if (b_19 == 1) - b_20 = reader.ReadByte(); - u64_0 = reader.ReadUInt64(); - statPair = reader.Read(); + subPKTNewNpc66 = reader.Read(); + b_20 = reader.ReadByte(); + if (b_20 == 1) + bytearraylist_0 = reader.ReadList(12); + b_21 = reader.ReadByte(); b_22 = reader.ReadByte(); if (b_22 == 1) - u32_4 = reader.ReadUInt32(); + u64list_0 = reader.ReadList(); b_23 = reader.ReadByte(); if (b_23 == 1) - u64list_0 = reader.ReadList(); - b_24 = reader.ReadByte(); + u16_1 = reader.ReadUInt16(); + u16_2 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/PCStruct.cs b/LostArkLogger/Packets/Steam/PCStruct.cs index 1d3928f6..02a23b75 100644 --- a/LostArkLogger/Packets/Steam/PCStruct.cs +++ b/LostArkLogger/Packets/Steam/PCStruct.cs @@ -6,52 +6,52 @@ public partial class PCStruct { public void SteamDecode(BitReader reader) { - u32list_0 = reader.ReadList(); - b_0 = reader.ReadByte(); - b_3 = reader.ReadByte(); - b_7 = reader.ReadByte(); - Name = reader.ReadString(); - PlayerId = reader.ReadUInt64(); - bytearray_2 = reader.ReadBytes(5); - u32_8 = reader.ReadUInt32(); + bytearray_0 = reader.ReadBytes(25); u64_0 = reader.ReadUInt64(); + subPKTInitPC29s = reader.ReadList(); + b_7 = reader.ReadByte(); + u32_6 = reader.ReadUInt32(); b_12 = reader.ReadByte(); - str_0 = reader.ReadString(); - Level = reader.ReadUInt16(); - skillRunes = reader.Read(); + u32list_0 = reader.ReadList(); + GearLevel = reader.ReadUInt32(); + u32_8 = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); + statPair = reader.Read(); u32_0 = reader.ReadUInt32(); - u32_1 = reader.ReadUInt32(); - u32_2 = reader.ReadUInt32(); + Level = reader.ReadUInt16(); + u16_0 = reader.ReadUInt16(); + b_0 = reader.ReadByte(); b_1 = reader.ReadByte(); - b_2 = reader.ReadByte(); + u32_1 = reader.ReadUInt32(); EquippedItems = reader.ReadList(); - subPKTInitPC29s = reader.ReadList(); - u32_3 = reader.ReadUInt32(); - ClassId = reader.ReadUInt16(); - PartyId = reader.ReadUInt64(); - u16_0 = reader.ReadUInt16(); + b_2 = reader.ReadByte(); + b_3 = reader.ReadByte(); b_4 = reader.ReadByte(); + bytearray_2 = reader.ReadBytes(5); + u32_2 = reader.ReadUInt32(); b_5 = reader.ReadByte(); - bytearray_0 = reader.ReadBytes(25); + if (b_5 == 1) + bytearray_1 = reader.ReadBytes(12); + u32_3 = reader.ReadUInt32(); + str_0 = reader.ReadString(); + skillRunes = reader.Read(); + PartyId = reader.ReadUInt64(); b_6 = reader.ReadByte(); u32_4 = reader.ReadUInt32(); - u32_5 = reader.ReadUInt32(); - b_8 = reader.ReadByte(); + Name = reader.ReadString(); itemInfos = reader.ReadList(); - b_9 = reader.ReadByte(); - if (b_9 == 1) - bytearray_1 = reader.ReadBytes(12); u16_1 = reader.ReadUInt16(); - statPair = reader.Read(); - statusEffectDatas = reader.ReadList(); - GearLevel = reader.ReadUInt32(); - u32_6 = reader.ReadUInt32(); + b_8 = reader.ReadByte(); + b_9 = reader.ReadByte(); + ClassId = reader.ReadUInt16(); + subPKTNewNpc5 = reader.Read(); + PlayerId = reader.ReadUInt64(); + u32_5 = reader.ReadUInt32(); b_10 = reader.ReadByte(); - b_11 = reader.ReadByte(); u16_2 = reader.ReadUInt16(); u16_3 = reader.ReadUInt16(); u32_7 = reader.ReadUInt32(); - subPKTNewNpc5 = reader.Read(); + b_11 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs b/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs index b383afcc..4e0dad39 100644 --- a/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs @@ -6,11 +6,11 @@ public partial class PKTCounterAttackNotify { public void SteamDecode(BitReader reader) { - bytearray_2 = reader.ReadBytes(0); - SourceId = reader.ReadUInt64(); bytearray_1 = reader.ReadBytes(1); + SourceId = reader.ReadUInt64(); + bytearray_0 = reader.ReadBytes(4); TargetId = reader.ReadUInt64(); - bytearray_0 = reader.ReadBytes(6); + bytearray_2 = reader.ReadBytes(1); } } } diff --git a/LostArkLogger/Packets/Steam/PKTDeathNotify.cs b/LostArkLogger/Packets/Steam/PKTDeathNotify.cs index 0d24e61a..f2bff7e5 100644 --- a/LostArkLogger/Packets/Steam/PKTDeathNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTDeathNotify.cs @@ -6,18 +6,18 @@ public partial class PKTDeathNotify { public void SteamDecode(BitReader reader) { + u32_0 = reader.ReadUInt32(); u16_0 = reader.ReadUInt16(); b_0 = reader.ReadByte(); - if (b_0 == 1) - b_1 = reader.ReadByte(); - b_2 = reader.ReadByte(); - if (b_2 == 1) - b_3 = reader.ReadByte(); u64_0 = reader.ReadUInt64(); SourceId = reader.ReadUInt64(); - b_4 = reader.ReadByte(); - u32_0 = reader.ReadUInt32(); + b_1 = reader.ReadByte(); + if (b_1 == 1) + b_2 = reader.ReadByte(); TargetId = reader.ReadUInt64(); + b_3 = reader.ReadByte(); + if (b_3 == 1) + b_4 = reader.ReadByte(); b_5 = reader.ReadByte(); if (b_5 == 1) b_6 = reader.ReadByte(); diff --git a/LostArkLogger/Packets/Steam/PKTInitEnv.cs b/LostArkLogger/Packets/Steam/PKTInitEnv.cs index da321405..5260c64c 100644 --- a/LostArkLogger/Packets/Steam/PKTInitEnv.cs +++ b/LostArkLogger/Packets/Steam/PKTInitEnv.cs @@ -7,12 +7,12 @@ public partial class PKTInitEnv public void SteamDecode(BitReader reader) { s64_1 = reader.ReadUInt64(); - subPKTInitEnv5 = reader.Read(); + b_0 = reader.ReadByte(); PlayerId = reader.ReadUInt64(); blist_0 = reader.ReadList(); - u32_0 = reader.ReadUInt32(); - b_0 = reader.ReadByte(); + subPKTInitEnv5 = reader.Read(); s64_0 = reader.ReadSimpleInt(); + u32_0 = reader.ReadUInt32(); u32_1 = reader.ReadUInt32(); } } diff --git a/LostArkLogger/Packets/Steam/PKTInitPC.cs b/LostArkLogger/Packets/Steam/PKTInitPC.cs index ae19576d..8774f7ff 100644 --- a/LostArkLogger/Packets/Steam/PKTInitPC.cs +++ b/LostArkLogger/Packets/Steam/PKTInitPC.cs @@ -6,64 +6,64 @@ public partial class PKTInitPC { public void SteamDecode(BitReader reader) { + b_0 = reader.ReadByte(); statusEffectDatas = reader.ReadList(); - u64_0 = reader.ReadUInt64(); - bytearraylist_1 = reader.ReadList(17); - b_10 = reader.ReadByte(); - b_15 = reader.ReadByte(); - b_19 = reader.ReadByte(); - u16_4 = reader.ReadUInt16(); + u32_2 = reader.ReadUInt32(); + u32_4 = reader.ReadUInt32(); + u32_7 = reader.ReadUInt32(); u32_10 = reader.ReadUInt32(); - u16list_0 = reader.ReadList(); + bytearray_1 = reader.ReadBytes(4); + Level = reader.ReadUInt16(); + bytearray_0 = reader.ReadBytes(106); + b_20 = reader.ReadByte(); u32_11 = reader.ReadUInt32(); - GearLevel = reader.ReadUInt32(); bytearray_3 = reader.ReadBytes(25); - b_0 = reader.ReadByte(); - u64_1 = reader.ReadUInt64(); + bytearraylist_0 = reader.ReadList(30); + u16_0 = reader.ReadUInt16(); + u32_0 = reader.ReadUInt32(); b_1 = reader.ReadByte(); b_2 = reader.ReadByte(); - u32_0 = reader.ReadUInt32(); - bytearray_2 = reader.ReadBytes(35); - b_3 = reader.ReadByte(); u32_1 = reader.ReadUInt32(); + b_3 = reader.ReadByte(); + statPair = reader.Read(); b_4 = reader.ReadByte(); + subPKTInitPC29s = reader.ReadList(); + u16_1 = reader.ReadUInt16(); b_5 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); b_6 = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); + u32_3 = reader.ReadUInt32(); b_7 = reader.ReadByte(); - u16_1 = reader.ReadUInt16(); b_8 = reader.ReadByte(); - u32_2 = reader.ReadUInt32(); b_9 = reader.ReadByte(); - if (b_9 == 1) - u32_3 = reader.ReadUInt32(); - subPKTInitPC29s = reader.ReadList(); + bytearraylist_1 = reader.ReadList(17); + b_10 = reader.ReadByte(); + u64_1 = reader.ReadUInt64(); b_11 = reader.ReadByte(); - bytearray_1 = reader.ReadBytes(11); - Level = reader.ReadUInt16(); - bytearray_0 = reader.ReadBytes(99); - ClassId = reader.ReadUInt16(); + Name = reader.ReadString(); b_12 = reader.ReadByte(); - u32_4 = reader.ReadUInt32(); + bytearray_2 = reader.ReadBytes(35); + u32_5 = reader.ReadUInt32(); b_13 = reader.ReadByte(); + u32_6 = reader.ReadUInt32(); u16_2 = reader.ReadUInt16(); - b_14 = reader.ReadByte(); - u32_5 = reader.ReadUInt32(); - Name = reader.ReadString(); u64_2 = reader.ReadUInt64(); - statPair = reader.Read(); - u32_6 = reader.ReadUInt32(); - u16_3 = reader.ReadUInt16(); + u16list_0 = reader.ReadList(); + b_14 = reader.ReadByte(); + ClassId = reader.ReadUInt16(); + b_15 = reader.ReadByte(); b_16 = reader.ReadByte(); - u32_7 = reader.ReadUInt32(); - blist_0 = reader.ReadList(); + if (b_16 == 1) + u32_8 = reader.ReadUInt32(); u64_3 = reader.ReadUInt64(); + u32_9 = reader.ReadUInt32(); + blist_0 = reader.ReadList(); + GearLevel = reader.ReadUInt32(); b_17 = reader.ReadByte(); + u16_3 = reader.ReadUInt16(); + u16_4 = reader.ReadUInt16(); b_18 = reader.ReadByte(); - bytearraylist_0 = reader.ReadList(30); - u32_8 = reader.ReadUInt32(); - u32_9 = reader.ReadUInt32(); - b_20 = reader.ReadByte(); + b_19 = reader.ReadByte(); PlayerId = reader.ReadUInt64(); } } diff --git a/LostArkLogger/Packets/Steam/PKTNewNpc.cs b/LostArkLogger/Packets/Steam/PKTNewNpc.cs index 6c6792d0..9e2094e6 100644 --- a/LostArkLogger/Packets/Steam/PKTNewNpc.cs +++ b/LostArkLogger/Packets/Steam/PKTNewNpc.cs @@ -7,13 +7,13 @@ public partial class PKTNewNpc public void SteamDecode(BitReader reader) { b_0 = reader.ReadByte(); + npcStruct = reader.Read(); b_1 = reader.ReadByte(); if (b_1 == 1) + b_2 = reader.ReadByte(); + b_3 = reader.ReadByte(); + if (b_3 == 1) u64_0 = reader.ReadUInt64(); - b_2 = reader.ReadByte(); - if (b_2 == 1) - b_3 = reader.ReadByte(); - npcStruct = reader.Read(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs b/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs index 93be22fe..544c3544 100644 --- a/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs +++ b/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs @@ -6,10 +6,10 @@ public partial class PKTNewNpcSummon { public void SteamDecode(BitReader reader) { - npcStruct = reader.Read(); - bytearray_1 = reader.ReadBytes(9); + bytearray_0 = reader.ReadBytes(49); OwnerId = reader.ReadUInt64(); - bytearray_0 = reader.ReadBytes(22); + bytearray_1 = reader.ReadBytes(4078); + npcStruct = reader.Read(); b_0 = reader.ReadByte(); } } diff --git a/LostArkLogger/Packets/Steam/PKTNewPC.cs b/LostArkLogger/Packets/Steam/PKTNewPC.cs index c79ae6aa..a033d030 100644 --- a/LostArkLogger/Packets/Steam/PKTNewPC.cs +++ b/LostArkLogger/Packets/Steam/PKTNewPC.cs @@ -8,19 +8,19 @@ public void SteamDecode(BitReader reader) { b_0 = reader.ReadByte(); if (b_0 == 1) - u32_0 = reader.ReadUInt32(); + subPKTNewPC33 = reader.Read(); b_1 = reader.ReadByte(); - if (b_1 == 1) - bytearray_0 = reader.ReadBytes(20); + pCStruct = reader.Read(); b_2 = reader.ReadByte(); + if (b_2 == 1) + u32_0 = reader.ReadUInt32(); b_3 = reader.ReadByte(); if (b_3 == 1) bytearray_1 = reader.ReadBytes(12); - pCStruct = reader.Read(); b_4 = reader.ReadByte(); - if (b_4 == 1) - subPKTNewPC33 = reader.Read(); b_5 = reader.ReadByte(); + if (b_5 == 1) + bytearray_0 = reader.ReadBytes(20); } } } diff --git a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs index 41c646e5..2981278e 100644 --- a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs @@ -6,10 +6,10 @@ public partial class PKTPartyStatusEffectAddNotify { public void SteamDecode(BitReader reader) { - b_0 = reader.ReadByte(); PartyId = reader.ReadUInt64(); - PlayerIdOnRefresh = reader.ReadUInt64(); + b_0 = reader.ReadByte(); statusEffectDatas = reader.ReadList(); + PlayerIdOnRefresh = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs index 3bfb75d9..eb102fff 100644 --- a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs @@ -6,9 +6,9 @@ public partial class PKTPartyStatusEffectRemoveNotify { public void SteamDecode(BitReader reader) { + StatusEffectIds = reader.ReadList(); PartyId = reader.ReadUInt64(); b_0 = reader.ReadByte(); - StatusEffectIds = reader.ReadList(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs index 1e446822..6d656c58 100644 --- a/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs @@ -6,12 +6,12 @@ public partial class PKTSkillDamageAbnormalMoveNotify { public void SteamDecode(BitReader reader) { + SourceId = reader.ReadUInt64(); + b_0 = reader.ReadByte(); SkillEffectId = reader.ReadUInt32(); + u32_0 = reader.ReadUInt32(); skillDamageMoveEvents = reader.ReadList(); SkillId = reader.ReadUInt32(); - SourceId = reader.ReadUInt64(); - u32_0 = reader.ReadUInt32(); - b_0 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs index 325eaaf8..a097754a 100644 --- a/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs @@ -7,10 +7,10 @@ public partial class PKTSkillDamageNotify public void SteamDecode(BitReader reader) { SourceId = reader.ReadUInt64(); - SkillId = reader.ReadUInt32(); SkillEffectId = reader.ReadUInt32(); - skillDamageEvents = reader.ReadList(); + SkillId = reader.ReadUInt32(); b_0 = reader.ReadByte(); + skillDamageEvents = reader.ReadList(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs index 747bb120..98a93a15 100644 --- a/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs @@ -6,11 +6,11 @@ public partial class PKTSkillStageNotify { public void SteamDecode(BitReader reader) { - bytearray_1 = reader.ReadBytes(4); - SourceId = reader.ReadUInt64(); - bytearray_2 = reader.ReadBytes(4); + bytearray_0 = reader.ReadBytes(21); Stage = reader.ReadByte(); - bytearray_0 = reader.ReadBytes(32); + bytearray_1 = reader.ReadBytes(17); + SourceId = reader.ReadUInt64(); + bytearray_2 = reader.ReadBytes(2); SkillId = reader.ReadUInt32(); bytearray_3 = reader.ReadBytes(0); } diff --git a/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs index 6450b02a..d7464338 100644 --- a/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs @@ -6,24 +6,24 @@ public partial class PKTSkillStartNotify { public void SteamDecode(BitReader reader) { - packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); b_0 = reader.ReadByte(); - b_1 = reader.ReadByte(); - if (b_1 == 1) - u32_0 = reader.ReadUInt32(); + u16_0 = reader.ReadUInt16(); + u64_1 = reader.ReadUInt64(); SourceId = reader.ReadUInt64(); b_2 = reader.ReadByte(); if (b_2 == 1) - u16_2 = reader.ReadUInt16(); + u16_1 = reader.ReadUInt16(); + packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); + SkillId = reader.ReadUInt32(); b_3 = reader.ReadByte(); if (b_3 == 1) u32_1 = reader.ReadUInt32(); - u64_0 = reader.ReadUInt64(); - u64_1 = reader.ReadUInt64(); - SkillId = reader.ReadUInt32(); u64_2 = reader.ReadUInt64(); - u16_0 = reader.ReadUInt16(); - u16_1 = reader.ReadUInt16(); + u16_2 = reader.ReadUInt16(); + b_1 = reader.ReadByte(); + if (b_1 == 1) + u32_0 = reader.ReadUInt32(); + u64_0 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs b/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs index a590bc74..7b2cf13f 100644 --- a/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs @@ -7,12 +7,12 @@ public partial class PKTStatChangeOriginNotify public void SteamDecode(BitReader reader) { ObjectId = reader.ReadUInt64(); - StatPairChangedList = reader.Read(); - StatPairList = reader.Read(); b_0 = reader.ReadByte(); - b_1 = reader.ReadByte(); - if (b_1 == 1) + if (b_0 == 1) u32_0 = reader.ReadUInt32(); + b_1 = reader.ReadByte(); + StatPairChangedList = reader.Read(); + StatPairList = reader.Read(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs b/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs index 3330ac68..1fcc90ab 100644 --- a/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs @@ -6,10 +6,10 @@ public partial class PKTStatusEffectAddNotify { public void SteamDecode(BitReader reader) { + statusEffectData = reader.Read(); u64_0 = reader.ReadUInt64(); - New = reader.ReadByte(); ObjectId = reader.ReadUInt64(); - statusEffectData = reader.Read(); + New = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs b/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs index 0084ff5f..565c3801 100644 --- a/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs @@ -6,9 +6,9 @@ public partial class PKTStatusEffectRemoveNotify { public void SteamDecode(BitReader reader) { - ObjectId = reader.ReadUInt64(); InstanceIds = reader.ReadList(); Reason = reader.ReadByte(); + ObjectId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs b/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs index 685dbd9a..60a92e6a 100644 --- a/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs @@ -6,10 +6,10 @@ public partial class PKTTriggerStartNotify { public void SteamDecode(BitReader reader) { - TriggerUnitIndex = reader.ReadUInt64(); - Signal = reader.ReadUInt32(); u64list_0 = reader.ReadList(); + Signal = reader.ReadUInt32(); ActorId = reader.ReadUInt32(); + TriggerUnitIndex = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/ProjectileInfo.cs b/LostArkLogger/Packets/Steam/ProjectileInfo.cs index cbe1ef6c..a6b9c49a 100644 --- a/LostArkLogger/Packets/Steam/ProjectileInfo.cs +++ b/LostArkLogger/Packets/Steam/ProjectileInfo.cs @@ -6,30 +6,30 @@ public partial class ProjectileInfo { public void SteamDecode(BitReader reader) { - u64_0 = reader.ReadUInt64(); - u32_0 = reader.ReadUInt32(); + SkillEffect = reader.ReadUInt32(); + b_0 = reader.ReadByte(); + u64_1 = reader.ReadUInt64(); + u32_3 = reader.ReadUInt32(); + OwnerId = reader.ReadUInt64(); u32_4 = reader.ReadUInt32(); + SkillLevel = reader.ReadByte(); + u64_2 = reader.ReadUInt64(); b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); if (b_3 == 1) u64list_0 = reader.ReadList(); + u16_0 = reader.ReadUInt16(); + u32_0 = reader.ReadUInt32(); + SkillId = reader.ReadUInt32(); Tripods = reader.ReadBytes(3); - u64_1 = reader.ReadUInt64(); - u16_1 = reader.ReadUInt16(); - OwnerId = reader.ReadUInt64(); - u64_2 = reader.ReadUInt64(); - SkillLevel = reader.ReadByte(); - ProjectileId = reader.ReadUInt64(); - bytearray_0 = reader.ReadBytes(6); u32_1 = reader.ReadUInt32(); - b_0 = reader.ReadByte(); - if (b_0 == 1) - u32_2 = reader.ReadUInt32(); b_1 = reader.ReadByte(); - SkillEffect = reader.ReadUInt32(); - SkillId = reader.ReadUInt32(); - u32_3 = reader.ReadUInt32(); - u16_0 = reader.ReadUInt16(); + if (b_1 == 1) + u32_2 = reader.ReadUInt32(); + bytearray_0 = reader.ReadBytes(6); + ProjectileId = reader.ReadUInt64(); + u64_0 = reader.ReadUInt64(); + u16_1 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillDamageEvent.cs b/LostArkLogger/Packets/Steam/SkillDamageEvent.cs index 03c9efb4..05ae941d 100644 --- a/LostArkLogger/Packets/Steam/SkillDamageEvent.cs +++ b/LostArkLogger/Packets/Steam/SkillDamageEvent.cs @@ -6,16 +6,16 @@ public partial class SkillDamageEvent { public void SteamDecode(BitReader reader) { - CurHp = reader.ReadPackedInt(); MaxHp = reader.ReadPackedInt(); - Damage = reader.ReadPackedInt(); b_0 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); - Modifier = reader.ReadByte(); + if (b_0 == 1) + b_1 = reader.ReadByte(); + CurHp = reader.ReadPackedInt(); + b_2 = reader.ReadByte(); TargetId = reader.ReadUInt64(); - b_1 = reader.ReadByte(); - if (b_1 == 1) - b_2 = reader.ReadByte(); + Modifier = reader.ReadByte(); + Damage = reader.ReadPackedInt(); + u16_0 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs b/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs index ca98014e..a66db4eb 100644 --- a/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs +++ b/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs @@ -6,15 +6,15 @@ public partial class SkillDamageMoveEvent { public void SteamDecode(BitReader reader) { - flag_1 = reader.ReadUInt64(); - flag_2 = reader.ReadUInt64(); b_0 = reader.ReadByte(); - skillDamageEvent = reader.Read(); u16_0 = reader.ReadUInt16(); - u16_1 = reader.ReadUInt16(); + flag_1 = reader.ReadUInt64(); flag_0 = reader.ReadFlag(); - flag_3 = reader.ReadUInt64(); + u16_1 = reader.ReadUInt16(); u16_2 = reader.ReadUInt16(); + flag_2 = reader.ReadUInt64(); + skillDamageEvent = reader.Read(); + flag_3 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/StatusEffectData.cs b/LostArkLogger/Packets/Steam/StatusEffectData.cs index 60c94059..d2d0f578 100644 --- a/LostArkLogger/Packets/Steam/StatusEffectData.cs +++ b/LostArkLogger/Packets/Steam/StatusEffectData.cs @@ -6,21 +6,21 @@ public partial class StatusEffectData { public void SteamDecode(BitReader reader) { - bytearraylist_0 = reader.ReadList(7); - SkillLevel = reader.ReadByte(); EffectInstanceId = reader.ReadUInt32(); - u32_0 = reader.ReadUInt32(); - b_0 = reader.ReadByte(); - if (b_0 == 1) - s64_1 = reader.ReadUInt64(); - StatusEffectId = reader.ReadUInt32(); - SourceId = reader.ReadUInt64(); - b_1 = reader.ReadByte(); hasValue = reader.ReadByte(); if (hasValue == 1) Value = reader.ReadBytes(16); - InstanceId = reader.ReadUInt64(); s64_0 = reader.ReadSimpleInt(); + StatusEffectId = reader.ReadUInt32(); + u32_0 = reader.ReadUInt32(); + InstanceId = reader.ReadUInt64(); + bytearraylist_0 = reader.ReadList(7); + SourceId = reader.ReadUInt64(); + SkillLevel = reader.ReadByte(); + if (SkillLevel == 1) + s64_1 = reader.ReadUInt64(); + b_1 = reader.ReadByte(); + b_0 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTInitEnv5.cs b/LostArkLogger/Packets/Steam/subPKTInitEnv5.cs index 26393489..af1ad28b 100644 --- a/LostArkLogger/Packets/Steam/subPKTInitEnv5.cs +++ b/LostArkLogger/Packets/Steam/subPKTInitEnv5.cs @@ -10,8 +10,8 @@ public void SteamDecode(BitReader reader) for(var i = 0; i < num; i++) { blist_1.Add(reader.ReadList()); - blist_0.Add(reader.ReadList()); blist_2.Add(reader.ReadList()); + blist_0.Add(reader.ReadList()); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTInitPC29.cs b/LostArkLogger/Packets/Steam/subPKTInitPC29.cs index e5b571d0..bb85ee5f 100644 --- a/LostArkLogger/Packets/Steam/subPKTInitPC29.cs +++ b/LostArkLogger/Packets/Steam/subPKTInitPC29.cs @@ -6,12 +6,12 @@ public partial class subPKTInitPC29 { public void SteamDecode(BitReader reader) { - u16_0 = reader.ReadUInt16(); - p64_0 = reader.ReadPackedInt(); - p64_1 = reader.ReadPackedInt(); - u64_0 = reader.ReadUInt64(); b_0 = reader.ReadByte(); + p64_0 = reader.ReadPackedInt(); b_1 = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); + u16_0 = reader.ReadUInt16(); + p64_1 = reader.ReadPackedInt(); b_2 = reader.ReadByte(); } } diff --git a/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs b/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs index 4c7ace18..c9873973 100644 --- a/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs +++ b/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs @@ -6,14 +6,14 @@ public partial class subPKTNewNpc66 { public void SteamDecode(BitReader reader) { - u16_0 = reader.ReadUInt16(); b_0 = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); + itemInfos = reader.ReadList(); b_1 = reader.ReadByte(); b_2 = reader.ReadByte(); subPKTNewNpc5 = reader.Read(); - u64_0 = reader.ReadUInt64(); - itemInfos = reader.ReadList(); str_0 = reader.ReadString(); + u16_0 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTNewPC33.cs b/LostArkLogger/Packets/Steam/subPKTNewPC33.cs index 82b4f59c..bbcacba3 100644 --- a/LostArkLogger/Packets/Steam/subPKTNewPC33.cs +++ b/LostArkLogger/Packets/Steam/subPKTNewPC33.cs @@ -6,11 +6,11 @@ public partial class subPKTNewPC33 { public void SteamDecode(BitReader reader) { - u32_0 = reader.ReadUInt32(); - bytearray_0 = reader.ReadBytes(12); b_0 = reader.ReadByte(); if (b_0 == 1) - bytearray_1 = reader.ReadBytes(12); + bytearray_0 = reader.ReadBytes(12); + bytearray_1 = reader.ReadBytes(12); + u32_0 = reader.ReadUInt32(); u32_1 = reader.ReadUInt32(); } } diff --git a/LostArkLogger/Resources/xor_Steam.bin b/LostArkLogger/Resources/xor_Steam.bin index ce8fef99..c27f372f 100644 Binary files a/LostArkLogger/Resources/xor_Steam.bin and b/LostArkLogger/Resources/xor_Steam.bin differ