diff --git a/LostArkLogger/Packets/OpCodes_steam.cs b/LostArkLogger/Packets/OpCodes_steam.cs index 22482c58..b2d2047d 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 = 0x6E5A, - PKTCounterAttackNotify = 0x2904, - PKTDeathNotify = 0xD1E1, - PKTInitEnv = 0x7761, - PKTInitPC = 0x9657, - PKTNewNpc = 0xE461, - PKTNewNpcSummon = 0x9E4B, - PKTNewPC = 0x5C50, - PKTNewProjectile = 0xAB18, - PKTPartyStatusEffectAddNotify = 0x8220, - PKTPartyStatusEffectRemoveNotify = 0x376F, - PKTRaidBossKillNotify = 0x9AD7, - PKTRaidResult = 0x963B, - PKTRemoveObject = 0x7007, - PKTSkillDamageAbnormalMoveNotify = 0x5D3F, - PKTSkillDamageNotify = 0x39FE, - PKTSkillStageNotify = 0x7558, - PKTSkillStartNotify = 0x3383, - PKTStatChangeOriginNotify = 0x1026, - PKTStatusEffectAddNotify = 0x87D8, - PKTStatusEffectRemoveNotify = 0x6890, - PKTTriggerBossBattleStatus = 0x40D3, - PKTTriggerStartNotify = 0x54F9, + PKTAuthTokenResult = 0x7500, + PKTCounterAttackNotify = 0x5436, + PKTDeathNotify = 0x482, + PKTInitEnv = 0xAB18, + PKTInitPC = 0x480F, + PKTNewNpc = 0xEA6, + PKTNewNpcSummon = 0xBAAE, + PKTNewPC = 0x716A, + PKTNewProjectile = 0x349, + PKTPartyStatusEffectAddNotify = 0x6FD8, + PKTPartyStatusEffectRemoveNotify = 0x5765, + PKTRaidBossKillNotify = 0x499E, + PKTRaidResult = 0x70E9, + PKTRemoveObject = 0x8A8, + PKTSkillDamageAbnormalMoveNotify = 0x2B51, + PKTSkillDamageNotify = 0x5DBA, + PKTSkillStageNotify = 0x946F, + PKTSkillStartNotify = 0x3829, + PKTStatChangeOriginNotify = 0x5004, + PKTStatusEffectAddNotify = 0x496E, + PKTStatusEffectRemoveNotify = 0xA483, + PKTTriggerBossBattleStatus = 0x1C34, + PKTTriggerStartNotify = 0x2706, } } diff --git a/LostArkLogger/Packets/Steam/ItemInfo.cs b/LostArkLogger/Packets/Steam/ItemInfo.cs index dbd596d5..84d0867a 100644 --- a/LostArkLogger/Packets/Steam/ItemInfo.cs +++ b/LostArkLogger/Packets/Steam/ItemInfo.cs @@ -10,10 +10,10 @@ public void SteamDecode(BitReader reader) if (b_0 == 1) b_1 = reader.ReadByte(); Level = reader.ReadUInt16(); - s64_0 = reader.ReadSimpleInt(); + u16_0 = reader.ReadUInt16(); bytearraylist_0 = reader.ReadList(14); + s64_0 = reader.ReadSimpleInt(); u32_0 = reader.ReadUInt32(); - u16_0 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/NpcStruct.cs b/LostArkLogger/Packets/Steam/NpcStruct.cs index c1a98075..01bc89bf 100644 --- a/LostArkLogger/Packets/Steam/NpcStruct.cs +++ b/LostArkLogger/Packets/Steam/NpcStruct.cs @@ -6,75 +6,75 @@ public partial class NpcStruct { public void SteamDecode(BitReader reader) { + u64_0 = reader.ReadUInt64(); b_0 = reader.ReadByte(); if (b_0 == 1) - b_1 = reader.ReadByte(); - b_2 = reader.ReadByte(); - if (b_2 == 1) - u32_0 = reader.ReadUInt32(); - b_15 = reader.ReadByte(); - if (b_15 == 1) - u32_2 = reader.ReadUInt32(); - b_26 = reader.ReadByte(); - u32_4 = reader.ReadUInt32(); + NpcType = reader.ReadUInt32(); + b_11 = reader.ReadByte(); + if (b_11 == 1) + b_12 = reader.ReadByte(); + b_21 = reader.ReadByte(); + if (b_21 == 1) + b_22 = reader.ReadByte(); + b_25 = reader.ReadByte(); + if (b_25 == 1) + b_26 = reader.ReadByte(); + b_27 = reader.ReadByte(); + if (b_27 == 1) + u16_3 = reader.ReadUInt16(); b_28 = reader.ReadByte(); + if (b_28 == 1) + u32_4 = reader.ReadUInt32(); b_29 = reader.ReadByte(); - if (b_29 == 1) - u32_5 = reader.ReadUInt32(); - subPKTInitPC29s = reader.ReadList(); b_30 = reader.ReadByte(); if (b_30 == 1) - u64list_0 = reader.ReadList(); - NpcType = reader.ReadUInt32(); + bytearraylist_0 = reader.ReadList(12); + u32_5 = reader.ReadUInt32(); + b_1 = reader.ReadByte(); + if (b_1 == 1) + b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); - if (b_3 == 1) - u16_0 = reader.ReadUInt16(); b_4 = reader.ReadByte(); if (b_4 == 1) b_5 = reader.ReadByte(); b_6 = reader.ReadByte(); if (b_6 == 1) - subPKTNewNpc66 = reader.Read(); + u32_0 = reader.ReadUInt32(); + NpcId = reader.ReadUInt64(); b_7 = reader.ReadByte(); + if (b_7 == 1) + u16_0 = reader.ReadUInt16(); b_8 = reader.ReadByte(); - if (b_8 == 1) - b_9 = reader.ReadByte(); + b_9 = reader.ReadByte(); + subPKTInitPC29s = reader.ReadList(); b_10 = reader.ReadByte(); if (b_10 == 1) - u16_1 = reader.ReadUInt16(); - statusEffectDatas = reader.ReadList(); - b_11 = reader.ReadByte(); - if (b_11 == 1) - b_12 = reader.ReadByte(); + u64_1 = reader.ReadUInt64(); b_13 = reader.ReadByte(); if (b_13 == 1) - u64_0 = reader.ReadUInt64(); + u64list_0 = reader.ReadList(); + u16_1 = reader.ReadUInt16(); b_14 = reader.ReadByte(); if (b_14 == 1) - u32_1 = reader.ReadUInt32(); + b_15 = reader.ReadByte(); b_16 = reader.ReadByte(); if (b_16 == 1) - b_17 = reader.ReadByte(); + subPKTNewNpc66 = reader.Read(); + b_17 = reader.ReadByte(); + if (b_17 == 1) + u32_1 = reader.ReadUInt32(); + u32_2 = reader.ReadUInt32(); b_18 = reader.ReadByte(); - if (b_18 == 1) - b_19 = reader.ReadByte(); - b_20 = reader.ReadByte(); u16_2 = reader.ReadUInt16(); - NpcId = reader.ReadUInt64(); - b_21 = reader.ReadByte(); - if (b_21 == 1) - u32_3 = reader.ReadUInt32(); - u16_3 = reader.ReadUInt16(); - b_22 = reader.ReadByte(); + statPair = reader.Read(); + b_19 = reader.ReadByte(); + if (b_19 == 1) + b_20 = reader.ReadByte(); b_23 = reader.ReadByte(); - if (b_23 == 1) - bytearraylist_0 = reader.ReadList(12); b_24 = reader.ReadByte(); if (b_24 == 1) - b_25 = reader.ReadByte(); - u64_1 = reader.ReadUInt64(); - b_27 = reader.ReadByte(); - statPair = reader.Read(); + u32_3 = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); } } } diff --git a/LostArkLogger/Packets/Steam/PCStruct.cs b/LostArkLogger/Packets/Steam/PCStruct.cs index 26a1ee59..c9c4133f 100644 --- a/LostArkLogger/Packets/Steam/PCStruct.cs +++ b/LostArkLogger/Packets/Steam/PCStruct.cs @@ -7,51 +7,51 @@ public partial class PCStruct public void SteamDecode(BitReader reader) { PlayerId = reader.ReadUInt64(); - statusEffectDatas = reader.ReadList(); + subPKTInitPC29s = reader.ReadList(); + b_1 = reader.ReadByte(); u16_1 = reader.ReadUInt16(); - Name = reader.ReadString(); - b_7 = reader.ReadByte(); - u32_7 = reader.ReadUInt32(); + u32_6 = reader.ReadUInt32(); + GearLevel = reader.ReadUInt32(); + b_10 = reader.ReadByte(); b_11 = reader.ReadByte(); b_12 = reader.ReadByte(); - u16_3 = reader.ReadUInt16(); u32_8 = reader.ReadUInt32(); - b_0 = reader.ReadByte(); - PartyId = reader.ReadUInt64(); - ClassId = reader.ReadUInt16(); u32_0 = reader.ReadUInt32(); + EquippedItems = reader.ReadList(); + bytearray_2 = reader.ReadBytes(5); + statPair = reader.Read(); + bytearray_0 = reader.ReadBytes(25); + b_0 = reader.ReadByte(); u16_0 = reader.ReadUInt16(); - GearLevel = reader.ReadUInt32(); skillRunes = reader.Read(); - Level = reader.ReadUInt16(); - bytearray_2 = reader.ReadBytes(5); - b_1 = reader.ReadByte(); + PartyId = reader.ReadUInt64(); u32_1 = reader.ReadUInt32(); - b_2 = reader.ReadByte(); - u16_2 = reader.ReadUInt16(); u32_2 = reader.ReadUInt32(); u32_3 = reader.ReadUInt32(); - u64_0 = reader.ReadUInt64(); - u32_4 = reader.ReadUInt32(); + ClassId = reader.ReadUInt16(); + b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); - statPair = reader.Read(); - itemInfos = reader.ReadList(); b_4 = reader.ReadByte(); - u32_5 = reader.ReadUInt32(); - u32list_0 = reader.ReadList(); - str_0 = reader.ReadString(); b_5 = reader.ReadByte(); - bytearray_0 = reader.ReadBytes(25); - EquippedItems = reader.ReadList(); - subPKTInitPC29s = reader.ReadList(); + u32_4 = reader.ReadUInt32(); + u32_5 = reader.ReadUInt32(); + itemInfos = reader.ReadList(); + Level = reader.ReadUInt16(); + u16_2 = reader.ReadUInt16(); b_6 = reader.ReadByte(); - u32_6 = reader.ReadUInt32(); - b_8 = reader.ReadByte(); + u16_3 = reader.ReadUInt16(); + statusEffectDatas = reader.ReadList(); + u32list_0 = reader.ReadList(); + b_7 = reader.ReadByte(); + if (b_7 == 1) + bytearray_1 = reader.ReadBytes(12); subPKTNewNpc5 = reader.Read(); + u64_0 = reader.ReadUInt64(); + b_8 = reader.ReadByte(); + Name = reader.ReadString(); + str_0 = reader.ReadString(); + u32_7 = reader.ReadUInt32(); b_9 = reader.ReadByte(); - if (b_9 == 1) - bytearray_1 = reader.ReadBytes(12); - b_10 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs b/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs index f1212545..0135427b 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_0 = reader.ReadBytes(4); + bytearray_1 = reader.ReadBytes(0); TargetId = reader.ReadUInt64(); - bytearray_1 = reader.ReadBytes(1); - SourceId = reader.ReadUInt64(); bytearray_2 = reader.ReadBytes(0); + SourceId = reader.ReadUInt64(); + bytearray_0 = reader.ReadBytes(7); } } } diff --git a/LostArkLogger/Packets/Steam/PKTDeathNotify.cs b/LostArkLogger/Packets/Steam/PKTDeathNotify.cs index 6ff69826..8ea89f99 100644 --- a/LostArkLogger/Packets/Steam/PKTDeathNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTDeathNotify.cs @@ -6,21 +6,21 @@ public partial class PKTDeathNotify { public void SteamDecode(BitReader reader) { + u32_0 = reader.ReadUInt32(); + SourceId = reader.ReadUInt64(); b_0 = reader.ReadByte(); b_1 = reader.ReadByte(); if (b_1 == 1) b_2 = reader.ReadByte(); + u16_0 = reader.ReadUInt16(); + u64_0 = reader.ReadUInt64(); b_3 = reader.ReadByte(); if (b_3 == 1) b_4 = reader.ReadByte(); - u64_0 = reader.ReadUInt64(); b_5 = reader.ReadByte(); if (b_5 == 1) b_6 = reader.ReadByte(); - SourceId = reader.ReadUInt64(); - u32_0 = reader.ReadUInt32(); TargetId = reader.ReadUInt64(); - u16_0 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTInitEnv.cs b/LostArkLogger/Packets/Steam/PKTInitEnv.cs index 8749e277..98002644 100644 --- a/LostArkLogger/Packets/Steam/PKTInitEnv.cs +++ b/LostArkLogger/Packets/Steam/PKTInitEnv.cs @@ -6,14 +6,14 @@ public partial class PKTInitEnv { public void SteamDecode(BitReader reader) { - subPKTInitEnv8 = reader.Read(); + u16list_0 = reader.ReadList(); u32_0 = reader.ReadUInt32(); + u32_1 = reader.ReadUInt32(); + subPKTInitEnv8 = reader.Read(); s64_0 = reader.ReadSimpleInt(); - s64_1 = reader.ReadUInt64(); - u16list_0 = reader.ReadList(); b_0 = reader.ReadByte(); + s64_1 = reader.ReadUInt64(); PlayerId = reader.ReadUInt64(); - u32_1 = reader.ReadUInt32(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTInitPC.cs b/LostArkLogger/Packets/Steam/PKTInitPC.cs index ca5ce882..42e61873 100644 --- a/LostArkLogger/Packets/Steam/PKTInitPC.cs +++ b/LostArkLogger/Packets/Steam/PKTInitPC.cs @@ -6,65 +6,65 @@ public partial class PKTInitPC { public void SteamDecode(BitReader reader) { + GearLevel = reader.ReadUInt32(); b_0 = reader.ReadByte(); - b_1 = reader.ReadByte(); - bytearraylist_1 = reader.ReadList(17); - u64_0 = reader.ReadUInt64(); - b_15 = reader.ReadByte(); - subPKTInitPC29s = reader.ReadList(); + b_6 = reader.ReadByte(); + u32_2 = reader.ReadUInt32(); + b_16 = reader.ReadByte(); + u32_9 = reader.ReadUInt32(); + b_19 = reader.ReadByte(); b_20 = reader.ReadByte(); - PlayerId = reader.ReadUInt64(); + u32_11 = reader.ReadUInt32(); u64_3 = reader.ReadUInt64(); - Name = reader.ReadString(); - b_2 = reader.ReadByte(); - u16list_0 = reader.ReadList(); + bytearraylist_0 = reader.ReadList(30); + b_1 = reader.ReadByte(); u32_0 = reader.ReadUInt32(); + b_2 = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); b_3 = reader.ReadByte(); - ClassId = reader.ReadUInt16(); - bytearray_3 = reader.ReadBytes(25); - u16_0 = reader.ReadUInt16(); + u64_1 = reader.ReadUInt64(); b_4 = reader.ReadByte(); u32_1 = reader.ReadUInt32(); b_5 = reader.ReadByte(); - b_6 = reader.ReadByte(); - if (b_6 == 1) - u32_2 = reader.ReadUInt32(); - u16_1 = reader.ReadUInt16(); b_7 = reader.ReadByte(); - statusEffectDatas = reader.ReadList(); - u32_3 = reader.ReadUInt32(); - u32_4 = reader.ReadUInt32(); b_8 = reader.ReadByte(); - bytearray_1 = reader.ReadBytes(9); - Level = reader.ReadUInt16(); - bytearray_0 = reader.ReadBytes(101); - u16_2 = reader.ReadUInt16(); + u64_2 = reader.ReadUInt64(); b_9 = reader.ReadByte(); + bytearraylist_1 = reader.ReadList(17); + ClassId = reader.ReadUInt16(); + Name = reader.ReadString(); + u16list_0 = reader.ReadList(); b_10 = reader.ReadByte(); b_11 = reader.ReadByte(); - GearLevel = reader.ReadUInt32(); + PlayerId = reader.ReadUInt64(); b_12 = reader.ReadByte(); - u32_5 = reader.ReadUInt32(); + statPair = reader.Read(); + u32_3 = reader.ReadUInt32(); b_13 = reader.ReadByte(); - bytearray_2 = reader.ReadBytes(35); b_14 = reader.ReadByte(); - u16_3 = reader.ReadUInt16(); - u32_6 = reader.ReadUInt32(); - b_16 = reader.ReadByte(); + u32_4 = reader.ReadUInt32(); + u32_5 = reader.ReadUInt32(); + b_15 = reader.ReadByte(); + u16_0 = reader.ReadUInt16(); + bytearray_1 = reader.ReadBytes(5); + Level = reader.ReadUInt16(); + bytearray_0 = reader.ReadBytes(105); + blist_0 = reader.ReadList(); + u16_1 = reader.ReadUInt16(); + statusEffectDatas = reader.ReadList(); b_17 = reader.ReadByte(); - u16_4 = reader.ReadUInt16(); + u32_6 = reader.ReadUInt32(); u32_7 = reader.ReadUInt32(); - blist_0 = reader.ReadList(); - u64_1 = reader.ReadUInt64(); - bytearraylist_0 = reader.ReadList(30); - u32_8 = reader.ReadUInt32(); b_18 = reader.ReadByte(); - u32_9 = reader.ReadUInt32(); + if (b_18 == 1) + u32_8 = reader.ReadUInt32(); + bytearray_2 = reader.ReadBytes(35); + subPKTInitPC29s = reader.ReadList(); u32_10 = reader.ReadUInt32(); - statPair = reader.Read(); - u64_2 = reader.ReadUInt64(); - u32_11 = reader.ReadUInt32(); - b_19 = reader.ReadByte(); + u16_2 = reader.ReadUInt16(); + bytearray_3 = reader.ReadBytes(25); + u16_3 = reader.ReadUInt16(); + u16_4 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTNewNpc.cs b/LostArkLogger/Packets/Steam/PKTNewNpc.cs index bf02b64a..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(); - if (b_0 == 1) - u64_0 = reader.ReadUInt64(); + npcStruct = reader.Read(); b_1 = reader.ReadByte(); if (b_1 == 1) b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); - npcStruct = reader.Read(); + if (b_3 == 1) + u64_0 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs b/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs index 27cda834..40826a42 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(7); + bytearray_0 = reader.ReadBytes(31); OwnerId = reader.ReadUInt64(); - bytearray_0 = reader.ReadBytes(24); + bytearray_1 = reader.ReadBytes(0); + npcStruct = reader.Read(); b_0 = reader.ReadByte(); } } diff --git a/LostArkLogger/Packets/Steam/PKTNewPC.cs b/LostArkLogger/Packets/Steam/PKTNewPC.cs index 2464e2ab..424eca5e 100644 --- a/LostArkLogger/Packets/Steam/PKTNewPC.cs +++ b/LostArkLogger/Packets/Steam/PKTNewPC.cs @@ -6,14 +6,14 @@ public partial class PKTNewPC { public void SteamDecode(BitReader reader) { - pCStruct = reader.Read(); b_0 = reader.ReadByte(); if (b_0 == 1) u32_0 = reader.ReadUInt32(); b_1 = reader.ReadByte(); - if (b_1 == 1) - bytearray_1 = reader.ReadBytes(12); b_2 = reader.ReadByte(); + if (b_2 == 1) + bytearray_1 = reader.ReadBytes(12); + pCStruct = reader.Read(); b_3 = reader.ReadByte(); b_4 = reader.ReadByte(); if (b_4 == 1) diff --git a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs index 0905a659..596fdd27 100644 --- a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectAddNotify.cs @@ -6,9 +6,9 @@ public partial class PKTPartyStatusEffectAddNotify { public void SteamDecode(BitReader reader) { - statusEffectDatas = reader.ReadList(); b_0 = reader.ReadByte(); PartyId = reader.ReadUInt64(); + statusEffectDatas = reader.ReadList(); PlayerIdOnRefresh = reader.ReadUInt64(); } } diff --git a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs index 7bb5e270..73eb5bc2 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) { - PartyId = reader.ReadUInt64(); StatusEffectIds = reader.ReadList(); b_0 = reader.ReadByte(); + PartyId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs index 879f13f2..da4e83be 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(); + skillDamageMoveEvents = reader.ReadList(); SkillId = reader.ReadUInt32(); u32_0 = reader.ReadUInt32(); - skillDamageMoveEvents = reader.ReadList(); + SkillEffectId = reader.ReadUInt32(); + b_0 = reader.ReadByte(); + SourceId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs index 3c66efbe..c8b07ab3 100644 --- a/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs @@ -6,11 +6,11 @@ public partial class PKTSkillDamageNotify { public void SteamDecode(BitReader reader) { - b_0 = reader.ReadByte(); - SourceId = reader.ReadUInt64(); - SkillEffectId = reader.ReadUInt32(); SkillId = reader.ReadUInt32(); skillDamageEvents = reader.ReadList(); + b_0 = reader.ReadByte(); + SkillEffectId = reader.ReadUInt32(); + SourceId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs index 45fa984e..3da6d507 100644 --- a/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTSkillStageNotify.cs @@ -6,13 +6,13 @@ public partial class PKTSkillStageNotify { public void SteamDecode(BitReader reader) { - bytearray_1 = reader.ReadBytes(13); - SourceId = reader.ReadUInt64(); bytearray_2 = reader.ReadBytes(0); - Stage = reader.ReadByte(); - bytearray_0 = reader.ReadBytes(27); SkillId = reader.ReadUInt32(); + bytearray_0 = reader.ReadBytes(30); + Stage = reader.ReadByte(); bytearray_3 = reader.ReadBytes(0); + SourceId = reader.ReadUInt64(); + bytearray_1 = reader.ReadBytes(10); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs index 38cc7c7d..2c10e74f 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) { - u64_0 = reader.ReadUInt64(); + u16_0 = reader.ReadUInt16(); SourceId = reader.ReadUInt64(); b_0 = reader.ReadByte(); if (b_0 == 1) - u16_1 = reader.ReadUInt16(); + u32_0 = reader.ReadUInt32(); + u64_0 = reader.ReadUInt64(); + u64_1 = reader.ReadUInt64(); b_1 = reader.ReadByte(); if (b_1 == 1) - u32_0 = reader.ReadUInt32(); + u32_1 = reader.ReadUInt32(); b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); if (b_3 == 1) - u32_1 = reader.ReadUInt32(); - SkillId = reader.ReadUInt32(); - packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); + u16_1 = reader.ReadUInt16(); u16_2 = reader.ReadUInt16(); u64_2 = reader.ReadUInt64(); - u16_0 = reader.ReadUInt16(); - u64_1 = reader.ReadUInt64(); + packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); + SkillId = reader.ReadUInt32(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs b/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs index b14b372b..a73485f7 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) { StatPairChangedList = reader.Read(); - StatPairList = reader.Read(); b_0 = reader.ReadByte(); - if (b_0 == 1) - u32_0 = reader.ReadUInt32(); + StatPairList = reader.Read(); ObjectId = reader.ReadUInt64(); b_1 = reader.ReadByte(); + if (b_1 == 1) + u32_0 = reader.ReadUInt32(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs b/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs index 85564ff9..f19e19ee 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) { - u64_0 = reader.ReadUInt64(); - ObjectId = reader.ReadUInt64(); - statusEffectData = reader.Read(); New = reader.ReadByte(); + statusEffectData = reader.Read(); + ObjectId = reader.ReadUInt64(); + u64_0 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs b/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs index 0fd95dcd..0084ff5f 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) { - Reason = reader.ReadByte(); ObjectId = reader.ReadUInt64(); InstanceIds = reader.ReadList(); + Reason = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs b/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs index f0ab5899..fec9ceb8 100644 --- a/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs @@ -6,9 +6,9 @@ public partial class PKTTriggerStartNotify { public void SteamDecode(BitReader reader) { - u64list_0 = reader.ReadList(); Signal = reader.ReadUInt32(); TriggerUnitIndex = reader.ReadUInt64(); + u64list_0 = reader.ReadList(); ActorId = reader.ReadUInt32(); } } diff --git a/LostArkLogger/Packets/Steam/ProjectileInfo.cs b/LostArkLogger/Packets/Steam/ProjectileInfo.cs index 599d22ca..dee202b0 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(); - b_0 = reader.ReadByte(); - if (b_0 == 1) - u32_0 = reader.ReadUInt32(); - SkillLevel = reader.ReadByte(); ProjectileId = reader.ReadUInt64(); + SkillEffect = reader.ReadUInt32(); + bytearray_0 = reader.ReadBytes(6); + u32_2 = reader.ReadUInt32(); + SkillId = reader.ReadUInt32(); u64_2 = reader.ReadUInt64(); - OwnerId = reader.ReadUInt64(); + u32_3 = reader.ReadUInt32(); + Tripods = reader.ReadBytes(3); + b_2 = reader.ReadByte(); + if (b_2 == 1) + u32_4 = reader.ReadUInt32(); b_3 = reader.ReadByte(); if (b_3 == 1) u64list_0 = reader.ReadList(); - u32_4 = reader.ReadUInt32(); - bytearray_0 = reader.ReadBytes(6); - Tripods = reader.ReadBytes(3); - b_1 = reader.ReadByte(); u16_0 = reader.ReadUInt16(); - u32_1 = reader.ReadUInt32(); + u64_0 = reader.ReadUInt64(); u16_1 = reader.ReadUInt16(); - SkillId = reader.ReadUInt32(); - SkillEffect = reader.ReadUInt32(); - b_2 = reader.ReadByte(); - u32_2 = reader.ReadUInt32(); + u32_0 = reader.ReadUInt32(); + u32_1 = reader.ReadUInt32(); + OwnerId = reader.ReadUInt64(); + b_0 = reader.ReadByte(); + SkillLevel = reader.ReadByte(); u64_1 = reader.ReadUInt64(); - u32_3 = reader.ReadUInt32(); + b_1 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillDamageEvent.cs b/LostArkLogger/Packets/Steam/SkillDamageEvent.cs index 90bada5b..5a3a5b00 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) { - Modifier = reader.ReadByte(); - b_0 = reader.ReadByte(); - if (b_0 == 1) - b_1 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); - MaxHp = reader.ReadPackedInt(); CurHp = reader.ReadPackedInt(); TargetId = reader.ReadUInt64(); - b_2 = reader.ReadByte(); Damage = reader.ReadPackedInt(); + MaxHp = reader.ReadPackedInt(); + u16_0 = reader.ReadUInt16(); + b_0 = reader.ReadByte(); + Modifier = reader.ReadByte(); + b_1 = reader.ReadByte(); + if (b_1 == 1) + b_2 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs b/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs index eb9bd835..48f0d4e7 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) { - u16_0 = reader.ReadUInt16(); flag_1 = reader.ReadUInt64(); - u16_1 = reader.ReadUInt16(); - u16_2 = reader.ReadUInt16(); + flag_2 = reader.ReadUInt64(); + skillDamageEvent = reader.Read(); flag_0 = reader.ReadFlag(); + u16_0 = reader.ReadUInt16(); + u16_1 = reader.ReadUInt16(); b_0 = reader.ReadByte(); - flag_2 = reader.ReadUInt64(); + u16_2 = reader.ReadUInt16(); flag_3 = reader.ReadUInt64(); - skillDamageEvent = reader.Read(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillRunes.cs b/LostArkLogger/Packets/Steam/SkillRunes.cs index ea155f7c..389ee173 100644 --- a/LostArkLogger/Packets/Steam/SkillRunes.cs +++ b/LostArkLogger/Packets/Steam/SkillRunes.cs @@ -9,8 +9,8 @@ public void SteamDecode(BitReader reader) num = reader.ReadUInt16(); for(var i = 0; i < num; i++) { - u32list_0.Add(reader.ReadList()); u32_0.Add(reader.ReadUInt32()); + u32list_0.Add(reader.ReadList()); } } } diff --git a/LostArkLogger/Packets/Steam/StatPair.cs b/LostArkLogger/Packets/Steam/StatPair.cs index 306202f9..cf7f3049 100644 --- a/LostArkLogger/Packets/Steam/StatPair.cs +++ b/LostArkLogger/Packets/Steam/StatPair.cs @@ -9,8 +9,8 @@ public void SteamDecode(BitReader reader) num = reader.ReadUInt16(); for(var i = 0; i < num; i++) { - StatType.Add(reader.ReadByte()); Value.Add(reader.ReadPackedInt()); + StatType.Add(reader.ReadByte()); } } } diff --git a/LostArkLogger/Packets/Steam/StatusEffectData.cs b/LostArkLogger/Packets/Steam/StatusEffectData.cs index 118057df..0a23cbbf 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) { - SourceId = reader.ReadUInt64(); + SourceId = reader.ReadSimpleInt(); bytearraylist_0 = reader.ReadList(7); + hasValue = reader.ReadByte(); + if (hasValue == 1) + Value = reader.ReadBytes(16); + EffectInstanceId = reader.ReadUInt32(); b_0 = reader.ReadByte(); - if (b_0 == 1) - s64_1 = reader.ReadUInt64(); b_1 = reader.ReadByte(); - EffectInstanceId = reader.ReadUInt32(); + if (b_1 == 1) + u64_0 = reader.ReadUInt64(); u32_0 = reader.ReadUInt32(); + StatusEffectId = reader.ReadUInt32(); + u64_1 = reader.ReadUInt64(); InstanceId = reader.ReadUInt64(); SkillLevel = reader.ReadByte(); - hasValue = reader.ReadByte(); - if (hasValue == 1) - Value = reader.ReadBytes(16); - s64_0 = reader.ReadSimpleInt(); - StatusEffectId = reader.ReadUInt32(); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs b/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs index 1b693744..a2448d2c 100644 --- a/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs +++ b/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs @@ -9,8 +9,8 @@ public void SteamDecode(BitReader reader) num = reader.ReadUInt16(); for(var i = 0; i < num; i++) { - u16list_1.Add(reader.ReadList()); u16list_2.Add(reader.ReadList()); + u16list_1.Add(reader.ReadList()); u16list_0.Add(reader.ReadList()); } } diff --git a/LostArkLogger/Packets/Steam/subPKTInitPC29.cs b/LostArkLogger/Packets/Steam/subPKTInitPC29.cs index 42c3b10b..4c89531d 100644 --- a/LostArkLogger/Packets/Steam/subPKTInitPC29.cs +++ b/LostArkLogger/Packets/Steam/subPKTInitPC29.cs @@ -6,13 +6,13 @@ public partial class subPKTInitPC29 { public void SteamDecode(BitReader reader) { - u64_0 = reader.ReadUInt64(); b_0 = reader.ReadByte(); b_1 = reader.ReadByte(); - p64_0 = reader.ReadPackedInt(); b_2 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); + p64_0 = reader.ReadPackedInt(); p64_1 = reader.ReadPackedInt(); + u16_0 = reader.ReadUInt16(); + u64_0 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs b/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs index 4f7a5679..c69d72b1 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) { - itemInfos = reader.ReadList(); b_0 = reader.ReadByte(); u16_0 = reader.ReadUInt16(); + itemInfos = reader.ReadList(); + str_0 = reader.ReadString(); b_1 = reader.ReadByte(); b_2 = reader.ReadByte(); - str_0 = reader.ReadString(); - subPKTNewNpc5 = reader.Read(); u64_0 = reader.ReadUInt64(); + subPKTNewNpc5 = reader.Read(); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTNewPC33.cs b/LostArkLogger/Packets/Steam/subPKTNewPC33.cs index 65120c64..1e6bd404 100644 --- a/LostArkLogger/Packets/Steam/subPKTNewPC33.cs +++ b/LostArkLogger/Packets/Steam/subPKTNewPC33.cs @@ -6,10 +6,10 @@ public partial class subPKTNewPC33 { public void SteamDecode(BitReader reader) { + u32_0 = reader.ReadUInt32(); b_0 = reader.ReadByte(); if (b_0 == 1) bytearray_0 = reader.ReadBytes(12); - u32_0 = reader.ReadUInt32(); u32_1 = reader.ReadUInt32(); bytearray_1 = reader.ReadBytes(12); } diff --git a/LostArkLogger/Resources/xor_Steam.bin b/LostArkLogger/Resources/xor_Steam.bin index 2c8c43b2..37ca5a99 100644 Binary files a/LostArkLogger/Resources/xor_Steam.bin and b/LostArkLogger/Resources/xor_Steam.bin differ diff --git a/LostArkLogger/Utilities/VersionCheck.cs b/LostArkLogger/Utilities/VersionCheck.cs index 3908f206..b5ae184d 100644 --- a/LostArkLogger/Utilities/VersionCheck.cs +++ b/LostArkLogger/Utilities/VersionCheck.cs @@ -13,7 +13,7 @@ public static class VersionCheck { [DllImport("kernel32")] public static extern bool QueryFullProcessImageName([In] IntPtr hProcess, [In] int dwFlags, [Out] StringBuilder lpExeName, ref int lpdwSize); - public static Version SupportedSteamVersion = new Version("1.33.57.1807790"); + public static Version SupportedSteamVersion = new Version("1.34.58.1816579"); public static Version SupportedKoreaVersion = new Version("1.250.475.1812734"); public static (Region, Version) GetLostArkVersion() {