diff --git a/LostArkLogger/Packets/OpCodes_steam.cs b/LostArkLogger/Packets/OpCodes_steam.cs index b2d2047d..bf92327d 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 = 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, + PKTAuthTokenResult = 0x67F6, + PKTCounterAttackNotify = 0x5149, + PKTDeathNotify = 0xB4BF, + PKTInitEnv = 0x7F6A, + PKTInitPC = 0xDC91, + PKTNewNpc = 0x6155, + PKTNewNpcSummon = 0xB3BA, + PKTNewPC = 0xB1FA, + PKTNewProjectile = 0xBF3F, + PKTPartyStatusEffectAddNotify = 0xD7A0, + PKTPartyStatusEffectRemoveNotify = 0x9E74, + PKTRaidBossKillNotify = 0xC24A, + PKTRaidResult = 0x6741, + PKTRemoveObject = 0x57E4, + PKTSkillDamageAbnormalMoveNotify = 0x7BD1, + PKTSkillDamageNotify = 0xC45, + PKTSkillStageNotify = 0x58F5, + PKTSkillStartNotify = 0x9C88, + PKTStatChangeOriginNotify = 0x5B82, + PKTStatusEffectAddNotify = 0x6154, + PKTStatusEffectRemoveNotify = 0xB6A9, + PKTTriggerBossBattleStatus = 0x1395, + PKTTriggerStartNotify = 0x5601, } } diff --git a/LostArkLogger/Packets/Steam/ItemInfo.cs b/LostArkLogger/Packets/Steam/ItemInfo.cs index 84d0867a..04276cac 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) { - b_0 = reader.ReadByte(); - if (b_0 == 1) - b_1 = reader.ReadByte(); 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(); } } } diff --git a/LostArkLogger/Packets/Steam/NpcStruct.cs b/LostArkLogger/Packets/Steam/NpcStruct.cs index c6bb9ec6..7cdcd4a9 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) { - NpcId = reader.ReadUInt64(); + u32_0 = reader.ReadUInt32(); b_0 = reader.ReadByte(); - if (b_0 == 1) - u32_2 = 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_12 = reader.ReadByte(); + statusEffectDatas = reader.ReadList(); b_25 = reader.ReadByte(); if (b_25 == 1) b_26 = reader.ReadByte(); b_27 = reader.ReadByte(); if (b_27 == 1) - u16_3 = reader.ReadUInt16(); + u32_4 = reader.ReadUInt32(); b_28 = reader.ReadByte(); if (b_28 == 1) - u32_4 = reader.ReadUInt32(); + u32_5 = reader.ReadUInt32(); + NpcType = reader.ReadUInt32(); b_29 = reader.ReadByte(); + if (b_29 == 1) + u64list_0 = reader.ReadList(); b_30 = reader.ReadByte(); if (b_30 == 1) - bytearraylist_0 = reader.ReadList(12); - u32_5 = reader.ReadUInt32(); + u16_3 = reader.ReadUInt16(); b_1 = reader.ReadByte(); if (b_1 == 1) - b_2 = reader.ReadByte(); - b_3 = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); + b_2 = reader.ReadByte(); + if (b_2 == 1) + b_3 = reader.ReadByte(); + NpcId = reader.ReadUInt64(); b_4 = reader.ReadByte(); - if (b_4 == 1) - b_5 = reader.ReadByte(); + b_5 = reader.ReadByte(); b_6 = reader.ReadByte(); if (b_6 == 1) - u32_0 = reader.ReadUInt32(); - u64_0 = reader.ReadUInt64(); + subPKTNewNpc66 = reader.Read(); + u16_0 = reader.ReadUInt16(); b_7 = reader.ReadByte(); if (b_7 == 1) - u16_0 = reader.ReadUInt16(); - b_8 = reader.ReadByte(); + b_8 = reader.ReadByte(); b_9 = reader.ReadByte(); - subPKTInitPC29s = reader.ReadList(); + if (b_9 == 1) + u16_1 = reader.ReadUInt16(); b_10 = reader.ReadByte(); if (b_10 == 1) - u64_1 = reader.ReadUInt64(); + b_11 = reader.ReadByte(); b_13 = reader.ReadByte(); if (b_13 == 1) - u64list_0 = reader.ReadList(); - u16_1 = reader.ReadUInt16(); + u32_1 = reader.ReadUInt32(); b_14 = reader.ReadByte(); if (b_14 == 1) - b_15 = reader.ReadByte(); + u32_2 = reader.ReadUInt32(); + subPKTInitPC29s = reader.ReadList(); + b_15 = reader.ReadByte(); b_16 = reader.ReadByte(); - if (b_16 == 1) - subPKTNewNpc66 = reader.Read(); b_17 = reader.ReadByte(); if (b_17 == 1) - u32_1 = reader.ReadUInt32(); - NpcType = reader.ReadUInt32(); - b_18 = reader.ReadByte(); - u16_2 = reader.ReadUInt16(); - statPair = reader.Read(); + b_18 = reader.ReadByte(); b_19 = reader.ReadByte(); if (b_19 == 1) b_20 = reader.ReadByte(); - b_23 = reader.ReadByte(); - b_24 = reader.ReadByte(); - if (b_24 == 1) + b_21 = reader.ReadByte(); + if (b_21 == 1) u32_3 = reader.ReadUInt32(); - statusEffectDatas = reader.ReadList(); + b_22 = reader.ReadByte(); + if (b_22 == 1) + bytearraylist_0 = reader.ReadList(12); + u64_1 = reader.ReadUInt64(); + u16_2 = reader.ReadUInt16(); + b_23 = reader.ReadByte(); + if (b_23 == 1) + b_24 = reader.ReadByte(); + statPair = reader.Read(); } } } diff --git a/LostArkLogger/Packets/Steam/PCStruct.cs b/LostArkLogger/Packets/Steam/PCStruct.cs index c9c4133f..0c64f8b6 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) { - PlayerId = reader.ReadUInt64(); - subPKTInitPC29s = reader.ReadList(); - b_1 = reader.ReadByte(); - u16_1 = reader.ReadUInt16(); - u32_6 = reader.ReadUInt32(); - GearLevel = reader.ReadUInt32(); - b_10 = reader.ReadByte(); + EquippedItems = reader.ReadList(); + u32_0 = reader.ReadUInt32(); + b_3 = reader.ReadByte(); + b_7 = reader.ReadByte(); b_11 = reader.ReadByte(); - b_12 = reader.ReadByte(); + if (b_11 == 1) + bytearray_1 = reader.ReadBytes(12); + u16_3 = reader.ReadUInt16(); u32_8 = reader.ReadUInt32(); - u32_0 = reader.ReadUInt32(); - EquippedItems = reader.ReadList(); + ClassId = reader.ReadUInt16(); + u64_0 = reader.ReadUInt64(); bytearray_2 = reader.ReadBytes(5); - statPair = reader.Read(); - bytearray_0 = reader.ReadBytes(25); + str_0 = reader.ReadString(); b_0 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); - skillRunes = reader.Read(); PartyId = reader.ReadUInt64(); u32_1 = reader.ReadUInt32(); u32_2 = reader.ReadUInt32(); - u32_3 = reader.ReadUInt32(); - ClassId = reader.ReadUInt16(); + subPKTInitPC29s = reader.ReadList(); + b_1 = reader.ReadByte(); b_2 = reader.ReadByte(); - b_3 = reader.ReadByte(); + u32_3 = reader.ReadUInt32(); + u32_4 = reader.ReadUInt32(); + GearLevel = reader.ReadUInt32(); + u16_0 = reader.ReadUInt16(); b_4 = reader.ReadByte(); + subPKTNewNpc5 = reader.Read(); + u16_1 = reader.ReadUInt16(); b_5 = reader.ReadByte(); - u32_4 = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); + Name = reader.ReadString(); + statPair = reader.Read(); + b_6 = reader.ReadByte(); + b_8 = reader.ReadByte(); + u32list_0 = reader.ReadList(); + skillRunes = reader.Read(); u32_5 = reader.ReadUInt32(); + b_9 = reader.ReadByte(); itemInfos = reader.ReadList(); + b_10 = reader.ReadByte(); + PlayerId = reader.ReadUInt64(); + u32_6 = reader.ReadUInt32(); Level = reader.ReadUInt16(); - u16_2 = reader.ReadUInt16(); - b_6 = 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(); + b_12 = reader.ReadByte(); u32_7 = reader.ReadUInt32(); - b_9 = reader.ReadByte(); + bytearray_0 = reader.ReadBytes(25); + u16_2 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs b/LostArkLogger/Packets/Steam/PKTCounterAttackNotify.cs index 0135427b..b95f593f 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_1 = reader.ReadBytes(0); - TargetId = reader.ReadUInt64(); - bytearray_2 = reader.ReadBytes(0); + bytearray_1 = reader.ReadBytes(1); SourceId = reader.ReadUInt64(); - bytearray_0 = reader.ReadBytes(7); + bytearray_2 = reader.ReadBytes(0); + TargetId = reader.ReadUInt64(); + bytearray_0 = reader.ReadBytes(6); } } } diff --git a/LostArkLogger/Packets/Steam/PKTDeathNotify.cs b/LostArkLogger/Packets/Steam/PKTDeathNotify.cs index 8ea89f99..77119315 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(); + u64_0 = reader.ReadUInt64(); b_0 = reader.ReadByte(); - b_1 = reader.ReadByte(); - if (b_1 == 1) - b_2 = reader.ReadByte(); + if (b_0 == 1) + b_1 = reader.ReadByte(); u16_0 = reader.ReadUInt16(); - u64_0 = 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(); + u32_0 = reader.ReadUInt32(); + b_2 = reader.ReadByte(); + if (b_2 == 1) + b_3 = reader.ReadByte(); + b_4 = reader.ReadByte(); + if (b_4 == 1) + b_5 = reader.ReadByte(); TargetId = reader.ReadUInt64(); + b_6 = reader.ReadByte(); + SourceId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTInitEnv.cs b/LostArkLogger/Packets/Steam/PKTInitEnv.cs index 98002644..a0e09431 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) { - u16list_0 = reader.ReadList(); u32_0 = reader.ReadUInt32(); - u32_1 = reader.ReadUInt32(); - subPKTInitEnv8 = reader.Read(); - s64_0 = reader.ReadSimpleInt(); - b_0 = reader.ReadByte(); s64_1 = reader.ReadUInt64(); + b_0 = reader.ReadByte(); + subPKTInitEnv8 = reader.Read(); PlayerId = reader.ReadUInt64(); + u16list_0 = reader.ReadList(); + u32_1 = reader.ReadUInt32(); + s64_0 = reader.ReadSimpleInt(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTInitPC.cs b/LostArkLogger/Packets/Steam/PKTInitPC.cs index 42e61873..8e1325f9 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_6 = reader.ReadByte(); - u32_2 = reader.ReadUInt32(); - b_16 = reader.ReadByte(); - u32_9 = reader.ReadUInt32(); + u32_0 = reader.ReadUInt32(); + bytearray_3 = reader.ReadBytes(25); + b_1 = reader.ReadByte(); + u32_4 = reader.ReadUInt32(); + b_10 = reader.ReadByte(); + b_15 = reader.ReadByte(); b_19 = reader.ReadByte(); - b_20 = reader.ReadByte(); u32_11 = reader.ReadUInt32(); + b_20 = reader.ReadByte(); u64_3 = reader.ReadUInt64(); - bytearraylist_0 = reader.ReadList(30); - b_1 = reader.ReadByte(); - u32_0 = reader.ReadUInt32(); - b_2 = reader.ReadByte(); + bytearraylist_1 = reader.ReadList(17); + u16_0 = reader.ReadUInt16(); + u16_1 = reader.ReadUInt16(); + b_0 = reader.ReadByte(); + u32_1 = reader.ReadUInt32(); + ClassId = reader.ReadUInt16(); + GearLevel = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); + u32_2 = reader.ReadUInt32(); + u16_2 = reader.ReadUInt16(); + u32_3 = reader.ReadUInt32(); u64_0 = reader.ReadUInt64(); + b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); + u16_3 = reader.ReadUInt16(); u64_1 = reader.ReadUInt64(); + bytearray_2 = reader.ReadBytes(35); + blist_0 = reader.ReadList(); b_4 = reader.ReadByte(); - u32_1 = reader.ReadUInt32(); b_5 = reader.ReadByte(); + b_6 = reader.ReadByte(); + subPKTInitPC29s = reader.ReadList(); b_7 = reader.ReadByte(); + u32_5 = reader.ReadUInt32(); b_8 = reader.ReadByte(); - u64_2 = reader.ReadUInt64(); - b_9 = reader.ReadByte(); - bytearraylist_1 = reader.ReadList(17); - ClassId = reader.ReadUInt16(); + u16_4 = reader.ReadUInt16(); Name = reader.ReadString(); - u16list_0 = reader.ReadList(); - b_10 = reader.ReadByte(); - b_11 = reader.ReadByte(); + u32_6 = reader.ReadUInt32(); + b_9 = reader.ReadByte(); PlayerId = reader.ReadUInt64(); + b_11 = reader.ReadByte(); b_12 = reader.ReadByte(); - statPair = reader.Read(); - u32_3 = reader.ReadUInt32(); b_13 = reader.ReadByte(); + if (b_13 == 1) + u32_7 = reader.ReadUInt32(); + u32_8 = reader.ReadUInt32(); b_14 = reader.ReadByte(); - u32_4 = reader.ReadUInt32(); - u32_5 = reader.ReadUInt32(); - b_15 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); - bytearray_1 = reader.ReadBytes(5); + u32_9 = reader.ReadUInt32(); + bytearray_1 = reader.ReadBytes(16); Level = reader.ReadUInt16(); - bytearray_0 = reader.ReadBytes(105); - blist_0 = reader.ReadList(); - u16_1 = reader.ReadUInt16(); - statusEffectDatas = reader.ReadList(); + bytearray_0 = reader.ReadBytes(94); + bytearraylist_0 = reader.ReadList(30); + u16list_0 = reader.ReadList(); + statPair = reader.Read(); + b_16 = reader.ReadByte(); + u64_2 = reader.ReadUInt64(); + u32_10 = reader.ReadUInt32(); b_17 = reader.ReadByte(); - u32_6 = reader.ReadUInt32(); - u32_7 = reader.ReadUInt32(); b_18 = reader.ReadByte(); - if (b_18 == 1) - u32_8 = reader.ReadUInt32(); - bytearray_2 = reader.ReadBytes(35); - subPKTInitPC29s = reader.ReadList(); - u32_10 = reader.ReadUInt32(); - 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 9e2094e6..335b078e 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(); - if (b_3 == 1) - u64_0 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs b/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs index 40826a42..4f22bdf5 100644 --- a/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs +++ b/LostArkLogger/Packets/Steam/PKTNewNpcSummon.cs @@ -6,9 +6,9 @@ public partial class PKTNewNpcSummon { public void SteamDecode(BitReader reader) { - bytearray_0 = reader.ReadBytes(31); + bytearray_0 = reader.ReadBytes(26); OwnerId = reader.ReadUInt64(); - bytearray_1 = reader.ReadBytes(0); + bytearray_1 = reader.ReadBytes(5); npcStruct = reader.Read(); b_0 = reader.ReadByte(); } diff --git a/LostArkLogger/Packets/Steam/PKTNewPC.cs b/LostArkLogger/Packets/Steam/PKTNewPC.cs index 424eca5e..377e5cd5 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(); b_2 = reader.ReadByte(); if (b_2 == 1) - bytearray_1 = reader.ReadBytes(12); - pCStruct = reader.Read(); + bytearray_0 = reader.ReadBytes(20); b_3 = reader.ReadByte(); + if (b_3 == 1) + u32_0 = reader.ReadUInt32(); + pCStruct = reader.Read(); b_4 = reader.ReadByte(); if (b_4 == 1) - subPKTNewPC33 = reader.Read(); + bytearray_1 = reader.ReadBytes(12); 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 596fdd27..9929ef26 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) { + PlayerIdOnRefresh = reader.ReadUInt64(); + 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 73eb5bc2..82cec90e 100644 --- a/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTPartyStatusEffectRemoveNotify.cs @@ -6,8 +6,8 @@ public partial class PKTPartyStatusEffectRemoveNotify { public void SteamDecode(BitReader reader) { - StatusEffectIds = reader.ReadList(); b_0 = reader.ReadByte(); + StatusEffectIds = reader.ReadList(); PartyId = reader.ReadUInt64(); } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillDamageAbnormalMoveNotify.cs index da4e83be..b3a48445 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) { - skillDamageMoveEvents = reader.ReadList(); SkillId = reader.ReadUInt32(); - u32_0 = reader.ReadUInt32(); + SourceId = reader.ReadUInt64(); SkillEffectId = reader.ReadUInt32(); + u32_0 = reader.ReadUInt32(); + skillDamageMoveEvents = reader.ReadList(); b_0 = reader.ReadByte(); - SourceId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillDamageNotify.cs index c8b07ab3..896ae750 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) { + 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 3da6d507..a7bed132 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_2 = reader.ReadBytes(0); - SkillId = reader.ReadUInt32(); - bytearray_0 = reader.ReadBytes(30); + bytearray_2 = reader.ReadBytes(4); Stage = reader.ReadByte(); - bytearray_3 = reader.ReadBytes(0); + bytearray_0 = reader.ReadBytes(22); SourceId = reader.ReadUInt64(); - bytearray_1 = reader.ReadBytes(10); + bytearray_1 = reader.ReadBytes(15); + SkillId = reader.ReadUInt32(); + bytearray_3 = reader.ReadBytes(0); } } } diff --git a/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs b/LostArkLogger/Packets/Steam/PKTSkillStartNotify.cs index 2c10e74f..9ab73fcf 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) { - u16_0 = reader.ReadUInt16(); - SourceId = reader.ReadUInt64(); b_0 = reader.ReadByte(); if (b_0 == 1) u32_0 = reader.ReadUInt32(); u64_0 = reader.ReadUInt64(); - u64_1 = reader.ReadUInt64(); + u64_2 = reader.ReadUInt64(); b_1 = reader.ReadByte(); - if (b_1 == 1) - u32_1 = reader.ReadUInt32(); + u16_1 = reader.ReadUInt16(); b_2 = reader.ReadByte(); + if (b_2 == 1) + u32_1 = reader.ReadUInt32(); + SourceId = reader.ReadUInt64(); b_3 = reader.ReadByte(); if (b_3 == 1) - u16_1 = reader.ReadUInt16(); - u16_2 = reader.ReadUInt16(); - u64_2 = reader.ReadUInt64(); - packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); + u16_2 = reader.ReadUInt16(); SkillId = reader.ReadUInt32(); + packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); + u16_0 = reader.ReadUInt16(); + u64_1 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs b/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs index a73485f7..2b27d5ae 100644 --- a/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTStatChangeOriginNotify.cs @@ -6,13 +6,13 @@ public partial class PKTStatChangeOriginNotify { public void SteamDecode(BitReader reader) { - StatPairChangedList = reader.Read(); - b_0 = reader.ReadByte(); StatPairList = reader.Read(); - ObjectId = reader.ReadUInt64(); - b_1 = reader.ReadByte(); - if (b_1 == 1) + b_0 = reader.ReadByte(); + if (b_0 == 1) u32_0 = reader.ReadUInt32(); + b_1 = reader.ReadByte(); + ObjectId = reader.ReadUInt64(); + StatPairChangedList = reader.Read(); } } } diff --git a/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs b/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs index f19e19ee..c4688c15 100644 --- a/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTStatusEffectAddNotify.cs @@ -6,9 +6,9 @@ public partial class PKTStatusEffectAddNotify { public void SteamDecode(BitReader reader) { + ObjectId = reader.ReadUInt64(); 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 0084ff5f..a0b7b3b5 100644 --- a/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs +++ b/LostArkLogger/Packets/Steam/PKTStatusEffectRemoveNotify.cs @@ -6,8 +6,8 @@ public partial class PKTStatusEffectRemoveNotify { public void SteamDecode(BitReader reader) { - ObjectId = reader.ReadUInt64(); InstanceIds = reader.ReadList(); + ObjectId = reader.ReadUInt64(); Reason = reader.ReadByte(); } } diff --git a/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs b/LostArkLogger/Packets/Steam/PKTTriggerStartNotify.cs index fec9ceb8..afcae085 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) { - Signal = reader.ReadUInt32(); - TriggerUnitIndex = reader.ReadUInt64(); u64list_0 = reader.ReadList(); ActorId = reader.ReadUInt32(); + TriggerUnitIndex = reader.ReadUInt64(); + Signal = reader.ReadUInt32(); } } } diff --git a/LostArkLogger/Packets/Steam/ProjectileInfo.cs b/LostArkLogger/Packets/Steam/ProjectileInfo.cs index dee202b0..cc3eefd2 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) { - ProjectileId = reader.ReadUInt64(); - SkillEffect = reader.ReadUInt32(); - bytearray_0 = reader.ReadBytes(6); + u32_0 = reader.ReadUInt32(); + b_0 = reader.ReadByte(); u32_2 = reader.ReadUInt32(); - SkillId = reader.ReadUInt32(); - u64_2 = reader.ReadUInt64(); - u32_3 = reader.ReadUInt32(); - Tripods = reader.ReadBytes(3); b_2 = reader.ReadByte(); if (b_2 == 1) - u32_4 = reader.ReadUInt32(); + u32_3 = reader.ReadUInt32(); + ProjectileId = reader.ReadUInt64(); + u32_4 = reader.ReadUInt32(); + SkillEffect = reader.ReadUInt32(); b_3 = reader.ReadByte(); if (b_3 == 1) u64list_0 = reader.ReadList(); - u16_0 = reader.ReadUInt16(); - u64_0 = reader.ReadUInt64(); + bytearray_0 = reader.ReadBytes(6); u16_1 = reader.ReadUInt16(); - u32_0 = reader.ReadUInt32(); - u32_1 = reader.ReadUInt32(); - OwnerId = reader.ReadUInt64(); - b_0 = reader.ReadByte(); SkillLevel = reader.ReadByte(); + Tripods = reader.ReadBytes(3); + OwnerId = reader.ReadUInt64(); + u64_0 = reader.ReadUInt64(); + u16_0 = reader.ReadUInt16(); u64_1 = reader.ReadUInt64(); + u32_1 = reader.ReadUInt32(); + u64_2 = reader.ReadUInt64(); b_1 = reader.ReadByte(); + SkillId = reader.ReadUInt32(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillDamageEvent.cs b/LostArkLogger/Packets/Steam/SkillDamageEvent.cs index 5a3a5b00..648d50e2 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(); - TargetId = reader.ReadUInt64(); - Damage = reader.ReadPackedInt(); - MaxHp = reader.ReadPackedInt(); u16_0 = reader.ReadUInt16(); - b_0 = reader.ReadByte(); + MaxHp = reader.ReadPackedInt(); + Damage = reader.ReadPackedInt(); Modifier = reader.ReadByte(); + b_0 = reader.ReadByte(); + CurHp = reader.ReadPackedInt(); b_1 = reader.ReadByte(); if (b_1 == 1) b_2 = reader.ReadByte(); + TargetId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs b/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs index 48f0d4e7..6f20fe20 100644 --- a/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs +++ b/LostArkLogger/Packets/Steam/SkillDamageMoveEvent.cs @@ -7,14 +7,14 @@ public partial class SkillDamageMoveEvent public void SteamDecode(BitReader reader) { flag_1 = reader.ReadUInt64(); - flag_2 = reader.ReadUInt64(); + b_0 = reader.ReadByte(); skillDamageEvent = reader.Read(); - flag_0 = reader.ReadFlag(); + flag_2 = reader.ReadUInt64(); + flag_3 = reader.ReadUInt64(); u16_0 = reader.ReadUInt16(); + flag_0 = reader.ReadFlag(); u16_1 = reader.ReadUInt16(); - b_0 = reader.ReadByte(); u16_2 = reader.ReadUInt16(); - flag_3 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/SkillRunes.cs b/LostArkLogger/Packets/Steam/SkillRunes.cs index 389ee173..ea155f7c 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++) { - u32_0.Add(reader.ReadUInt32()); u32list_0.Add(reader.ReadList()); + u32_0.Add(reader.ReadUInt32()); } } } diff --git a/LostArkLogger/Packets/Steam/StatPair.cs b/LostArkLogger/Packets/Steam/StatPair.cs index cf7f3049..306202f9 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++) { - Value.Add(reader.ReadPackedInt()); StatType.Add(reader.ReadByte()); + Value.Add(reader.ReadPackedInt()); } } } diff --git a/LostArkLogger/Packets/Steam/StatusEffectData.cs b/LostArkLogger/Packets/Steam/StatusEffectData.cs index c4cc4c5b..152e84e9 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) { - u64_1 = reader.ReadSimpleInt(); - bytearraylist_0 = reader.ReadList(7); + SkillLevel = reader.ReadByte(); + u32_0 = reader.ReadUInt32(); hasValue = reader.ReadByte(); if (hasValue == 1) Value = reader.ReadBytes(16); - EffectInstanceId = reader.ReadUInt32(); + InstanceId = reader.ReadUInt64(); b_0 = reader.ReadByte(); + if (b_0 == 1) + SourceId = reader.ReadUInt64(); b_1 = reader.ReadByte(); - if (b_1 == 1) - u64_0 = reader.ReadUInt64(); - u32_0 = reader.ReadUInt32(); + s64_0 = reader.ReadSimpleInt(); + bytearraylist_0 = reader.ReadList(7); + EffectInstanceId = reader.ReadUInt32(); StatusEffectId = reader.ReadUInt32(); - InstanceId = reader.ReadUInt64(); - SourceId = reader.ReadUInt64(); - SkillLevel = reader.ReadByte(); + s64_1 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs b/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs index a2448d2c..e75c8838 100644 --- a/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs +++ b/LostArkLogger/Packets/Steam/subPKTInitEnv8.cs @@ -9,9 +9,9 @@ public void SteamDecode(BitReader reader) num = reader.ReadUInt16(); for(var i = 0; i < num; i++) { - u16list_2.Add(reader.ReadList()); u16list_1.Add(reader.ReadList()); u16list_0.Add(reader.ReadList()); + u16list_2.Add(reader.ReadList()); } } } diff --git a/LostArkLogger/Packets/Steam/subPKTInitPC29.cs b/LostArkLogger/Packets/Steam/subPKTInitPC29.cs index 4c89531d..a524adbe 100644 --- a/LostArkLogger/Packets/Steam/subPKTInitPC29.cs +++ b/LostArkLogger/Packets/Steam/subPKTInitPC29.cs @@ -8,11 +8,11 @@ public void SteamDecode(BitReader reader) { b_0 = reader.ReadByte(); b_1 = reader.ReadByte(); - b_2 = reader.ReadByte(); p64_0 = reader.ReadPackedInt(); + u64_0 = reader.ReadUInt64(); + b_2 = reader.ReadByte(); 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 c69d72b1..6a7a9cbd 100644 --- a/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs +++ b/LostArkLogger/Packets/Steam/subPKTNewNpc66.cs @@ -7,13 +7,13 @@ public partial class subPKTNewNpc66 public void SteamDecode(BitReader reader) { b_0 = reader.ReadByte(); + b_1 = reader.ReadByte(); + subPKTNewNpc5 = reader.Read(); + u64_0 = reader.ReadUInt64(); + str_0 = reader.ReadString(); u16_0 = reader.ReadUInt16(); itemInfos = reader.ReadList(); - str_0 = reader.ReadString(); - b_1 = reader.ReadByte(); b_2 = reader.ReadByte(); - u64_0 = reader.ReadUInt64(); - subPKTNewNpc5 = reader.Read(); } } } diff --git a/LostArkLogger/Resources/GameMsg_English.bin b/LostArkLogger/Resources/GameMsg_English.bin index e9d8729d..5ddf2a4c 100644 Binary files a/LostArkLogger/Resources/GameMsg_English.bin and b/LostArkLogger/Resources/GameMsg_English.bin differ diff --git a/LostArkLogger/Resources/xor_Steam.bin b/LostArkLogger/Resources/xor_Steam.bin index 0c1c38d6..849245cb 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 30996112..f966904b 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.34.58.1816579"); + public static Version SupportedSteamVersion = new Version("1.309.345.1839317"); public static Version SupportedKoreaVersion = new Version("1.985.1060.1822798"); public static (Region, Version) GetLostArkVersion() {