diff --git a/LostArkLogger/Packets/Korea/ItemInfo.cs b/LostArkLogger/Packets/Korea/ItemInfo.cs index a866f509..4df699e9 100644 --- a/LostArkLogger/Packets/Korea/ItemInfo.cs +++ b/LostArkLogger/Packets/Korea/ItemInfo.cs @@ -6,14 +6,14 @@ public partial class ItemInfo { public void KoreaDecode(BitReader reader) { - bytearraylist_0 = reader.ReadList(14); - u32_0 = reader.ReadUInt32(); b_0 = reader.ReadByte(); if (b_0 == 1) b_1 = reader.ReadByte(); Level = reader.ReadUInt16(); - s64_0 = reader.ReadSimpleInt(); + bytearraylist_0 = reader.ReadList(14); u16_0 = reader.ReadUInt16(); + s64_0 = reader.ReadSimpleInt(); + u32_0 = reader.ReadUInt32(); } } } diff --git a/LostArkLogger/Packets/Korea/NpcStruct.cs b/LostArkLogger/Packets/Korea/NpcStruct.cs index a2fd04fa..6fff0570 100644 --- a/LostArkLogger/Packets/Korea/NpcStruct.cs +++ b/LostArkLogger/Packets/Korea/NpcStruct.cs @@ -6,75 +6,75 @@ public partial class NpcStruct { public void KoreaDecode(BitReader reader) { - b_0 = reader.ReadByte(); - if (b_0 == 1) - u32_0 = reader.ReadUInt32(); - statusEffectDatas = reader.ReadList(); - NpcType = reader.ReadUInt32(); - b_20 = reader.ReadByte(); - if (b_20 == 1) - u32_2 = reader.ReadUInt32(); + u16_0 = reader.ReadUInt16(); + u64_0 = reader.ReadUInt64(); + b_6 = reader.ReadByte(); + if (b_6 == 1) + b_7 = reader.ReadByte(); + b_18 = reader.ReadByte(); + if (b_18 == 1) + b_19 = reader.ReadByte(); b_24 = reader.ReadByte(); if (b_24 == 1) - u32_5 = reader.ReadUInt32(); + blist_0 = reader.ReadList(); b_25 = reader.ReadByte(); - b_26 = reader.ReadByte(); - if (b_26 == 1) - b_27 = reader.ReadByte(); - statPair = reader.Read(); + if (b_25 == 1) + b_26 = reader.ReadByte(); + b_27 = reader.ReadByte(); + if (b_27 == 1) + u16_2 = reader.ReadUInt16(); b_28 = reader.ReadByte(); - if (b_28 == 1) - b_29 = reader.ReadByte(); - b_30 = reader.ReadByte(); - if (b_30 == 1) + u16_3 = reader.ReadUInt16(); + b_29 = reader.ReadByte(); + if (b_29 == 1) + b_30 = reader.ReadByte(); + u32_0 = reader.ReadUInt32(); + b_0 = reader.ReadByte(); + if (b_0 == 1) subPKTNewNpc66 = reader.Read(); + statPair = reader.Read(); b_1 = reader.ReadByte(); if (b_1 == 1) - u16_0 = reader.ReadUInt16(); + u32_1 = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); b_2 = reader.ReadByte(); if (b_2 == 1) - b_3 = reader.ReadByte(); + u32_2 = reader.ReadUInt32(); + b_3 = reader.ReadByte(); b_4 = reader.ReadByte(); if (b_4 == 1) - u64_0 = reader.ReadUInt64(); - b_5 = reader.ReadByte(); - if (b_5 == 1) - b_6 = reader.ReadByte(); - b_7 = reader.ReadByte(); - if (b_7 == 1) - blist_0 = reader.ReadList(); + b_5 = reader.ReadByte(); + NpcId = reader.ReadUInt64(); + subPKTInitPC29s = reader.ReadList(); b_8 = reader.ReadByte(); - u16_1 = reader.ReadUInt16(); b_9 = reader.ReadByte(); - if (b_9 == 1) - b_10 = reader.ReadByte(); - subPKTInitPC29s = reader.ReadList(); - u32_1 = reader.ReadUInt32(); - NpcId = reader.ReadUInt64(); - u16_2 = reader.ReadUInt16(); + NpcType = reader.ReadUInt32(); + b_10 = reader.ReadByte(); + if (b_10 == 1) + u32_3 = reader.ReadUInt32(); b_11 = reader.ReadByte(); if (b_11 == 1) - u16_3 = reader.ReadUInt16(); + u16_1 = reader.ReadUInt16(); b_12 = reader.ReadByte(); if (b_12 == 1) - bytearraylist_0 = reader.ReadList(12); + u32_4 = reader.ReadUInt32(); b_13 = reader.ReadByte(); if (b_13 == 1) b_14 = reader.ReadByte(); b_15 = reader.ReadByte(); - if (b_15 == 1) - b_16 = reader.ReadByte(); + b_16 = reader.ReadByte(); + if (b_16 == 1) + u32_5 = reader.ReadUInt32(); b_17 = reader.ReadByte(); - b_18 = reader.ReadByte(); - u64_1 = reader.ReadUInt64(); - b_19 = reader.ReadByte(); - b_21 = reader.ReadByte(); - if (b_21 == 1) - u32_3 = reader.ReadUInt32(); + b_20 = reader.ReadByte(); + if (b_20 == 1) + b_21 = reader.ReadByte(); b_22 = reader.ReadByte(); + if (b_22 == 1) + u64_1 = reader.ReadUInt64(); b_23 = reader.ReadByte(); if (b_23 == 1) - u32_4 = reader.ReadUInt32(); + bytearraylist_0 = reader.ReadList(12); } } } diff --git a/LostArkLogger/Packets/Korea/PCStruct.cs b/LostArkLogger/Packets/Korea/PCStruct.cs index e6c9b273..c61decb7 100644 --- a/LostArkLogger/Packets/Korea/PCStruct.cs +++ b/LostArkLogger/Packets/Korea/PCStruct.cs @@ -6,52 +6,52 @@ public partial class PCStruct { public void KoreaDecode(BitReader reader) { - u16_0 = reader.ReadUInt16(); + Name = reader.ReadString(); b_0 = reader.ReadByte(); - b_3 = reader.ReadByte(); - b_4 = reader.ReadByte(); - u32_7 = reader.ReadUInt32(); - u16_3 = reader.ReadUInt16(); - statusEffectDatas = reader.ReadList(); + EquippedItems = reader.ReadList(); + b_8 = reader.ReadByte(); b_11 = reader.ReadByte(); - u32_8 = reader.ReadUInt32(); - b_12 = reader.ReadByte(); - Level = reader.ReadUInt16(); - Name = reader.ReadString(); - statPair = reader.Read(); - u16_1 = reader.ReadUInt16(); - skillRunes = reader.Read(); + u32list_0 = reader.ReadList(); bytearray_2 = reader.ReadBytes(5); + subPKTInitPC29s = reader.ReadList(); + u16_3 = reader.ReadUInt16(); + b_12 = reader.ReadByte(); b_1 = reader.ReadByte(); + u16_0 = reader.ReadUInt16(); b_2 = reader.ReadByte(); - PlayerId = reader.ReadUInt64(); u32_0 = reader.ReadUInt32(); - u16_2 = reader.ReadUInt16(); u32_1 = reader.ReadUInt32(); - subPKTNewNpc5 = reader.Read(); - u32_2 = reader.ReadUInt32(); - u32_3 = reader.ReadUInt32(); - ClassId = reader.ReadUInt16(); - u16list_0 = reader.ReadList(); - itemInfos = reader.ReadList(); + b_3 = reader.ReadByte(); + u16_1 = reader.ReadUInt16(); u64_0 = reader.ReadUInt64(); - PartyId = reader.ReadUInt64(); - bytearray_0 = reader.ReadBytes(25); - subPKTInitPC29s = reader.ReadList(); - u32_4 = reader.ReadUInt32(); - u32_5 = reader.ReadUInt32(); + b_4 = reader.ReadByte(); + itemInfos = reader.ReadList(); + Level = reader.ReadUInt16(); + u32_2 = reader.ReadUInt32(); b_5 = reader.ReadByte(); b_6 = reader.ReadByte(); + u16list_0 = reader.ReadList(); + GearLevel = reader.ReadUInt32(); + PartyId = reader.ReadUInt64(); b_7 = reader.ReadByte(); if (b_7 == 1) bytearray_1 = reader.ReadBytes(12); - u32list_0 = reader.ReadList(); - b_8 = reader.ReadByte(); - u32_6 = reader.ReadUInt32(); - EquippedItems = reader.ReadList(); - GearLevel = reader.ReadUInt32(); + u32_3 = reader.ReadUInt32(); + u32_4 = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); b_9 = reader.ReadByte(); + ClassId = reader.ReadUInt16(); b_10 = reader.ReadByte(); + u32_5 = reader.ReadUInt32(); + u16_2 = reader.ReadUInt16(); + statPair = reader.Read(); + skillRunes = reader.Read(); + PlayerId = reader.ReadUInt64(); + u32_6 = reader.ReadUInt32(); + u32_7 = reader.ReadUInt32(); + subPKTNewNpc5 = reader.Read(); + u32_8 = reader.ReadUInt32(); + bytearray_0 = reader.ReadBytes(25); } } } diff --git a/LostArkLogger/Packets/Korea/PKTCounterAttackNotify.cs b/LostArkLogger/Packets/Korea/PKTCounterAttackNotify.cs index e8dce8e4..d891a0fa 100644 --- a/LostArkLogger/Packets/Korea/PKTCounterAttackNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTCounterAttackNotify.cs @@ -6,11 +6,11 @@ public partial class PKTCounterAttackNotify { public void KoreaDecode(BitReader reader) { - bytearray_1 = reader.ReadBytes(0); - TargetId = reader.ReadUInt64(); - bytearray_2 = reader.ReadBytes(4093); + bytearray_0 = reader.ReadBytes(6); SourceId = reader.ReadUInt64(); - bytearray_0 = reader.ReadBytes(10); + bytearray_2 = reader.ReadBytes(0); + TargetId = reader.ReadUInt64(); + bytearray_1 = reader.ReadBytes(1); } } } diff --git a/LostArkLogger/Packets/Korea/PKTDeathNotify.cs b/LostArkLogger/Packets/Korea/PKTDeathNotify.cs index b67b262d..8750b084 100644 --- a/LostArkLogger/Packets/Korea/PKTDeathNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTDeathNotify.cs @@ -6,18 +6,18 @@ public partial class PKTDeathNotify { public void KoreaDecode(BitReader reader) { + SourceId = reader.ReadUInt64(); + u32_0 = reader.ReadUInt32(); b_0 = reader.ReadByte(); if (b_0 == 1) b_1 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); - u64_0 = reader.ReadUInt64(); - TargetId = reader.ReadUInt64(); b_2 = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); b_3 = reader.ReadByte(); if (b_3 == 1) b_4 = reader.ReadByte(); - SourceId = reader.ReadUInt64(); - u32_0 = reader.ReadUInt32(); + u16_0 = reader.ReadUInt16(); + TargetId = reader.ReadUInt64(); b_5 = reader.ReadByte(); if (b_5 == 1) b_6 = reader.ReadByte(); diff --git a/LostArkLogger/Packets/Korea/PKTInitEnv.cs b/LostArkLogger/Packets/Korea/PKTInitEnv.cs index 5b05b327..758013a8 100644 --- a/LostArkLogger/Packets/Korea/PKTInitEnv.cs +++ b/LostArkLogger/Packets/Korea/PKTInitEnv.cs @@ -9,11 +9,11 @@ public void KoreaDecode(BitReader reader) PlayerId = reader.ReadUInt64(); u32_0 = reader.ReadUInt32(); s64_1 = reader.ReadUInt64(); - b_0 = reader.ReadByte(); + s64_0 = reader.ReadSimpleInt(); u16list_0 = reader.ReadList(); - u32_1 = reader.ReadUInt32(); subPKTInitEnv8 = reader.Read(); - s64_0 = reader.ReadSimpleInt(); + u32_1 = reader.ReadUInt32(); + b_0 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTInitPC.cs b/LostArkLogger/Packets/Korea/PKTInitPC.cs index 1e483307..c9936d9b 100644 --- a/LostArkLogger/Packets/Korea/PKTInitPC.cs +++ b/LostArkLogger/Packets/Korea/PKTInitPC.cs @@ -6,67 +6,67 @@ public partial class PKTInitPC { public void KoreaDecode(BitReader reader) { - blist_0 = reader.ReadList(); - statPair = reader.Read(); - u32_2 = reader.ReadUInt32(); - b_7 = reader.ReadByte(); - u32_9 = reader.ReadUInt32(); - b_16 = reader.ReadByte(); - b_19 = reader.ReadByte(); - b_20 = reader.ReadByte(); + b_0 = reader.ReadByte(); + b_1 = reader.ReadByte(); + u32_1 = reader.ReadUInt32(); + u16_3 = reader.ReadUInt16(); + b_11 = reader.ReadByte(); + u32_11 = reader.ReadUInt32(); + statusEffectDatas = reader.ReadList(); + u16list_0 = reader.ReadList(); u16_4 = reader.ReadUInt16(); - PlayerId = reader.ReadUInt64(); + b_20 = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); + u16_0 = reader.ReadUInt16(); + u16_1 = reader.ReadUInt16(); + blist_0 = reader.ReadList(); bytearray_2 = reader.ReadBytes(35); bytearraylist_0 = reader.ReadList(30); - u16_0 = reader.ReadUInt16(); - bytearray_3 = reader.ReadBytes(25); - u32_0 = reader.ReadUInt32(); - u32_1 = reader.ReadUInt32(); - b_0 = reader.ReadByte(); - b_1 = reader.ReadByte(); + u16_2 = reader.ReadUInt16(); b_2 = reader.ReadByte(); - u16_1 = reader.ReadUInt16(); - bytearraylist_1 = reader.ReadList(17); - u64_0 = reader.ReadUInt64(); + statPair = reader.Read(); + u32_0 = reader.ReadUInt32(); + u32_2 = reader.ReadUInt32(); + u32_3 = reader.ReadUInt32(); b_3 = reader.ReadByte(); b_4 = reader.ReadByte(); - u64_1 = reader.ReadUInt64(); + Name = reader.ReadString(); ClassId = reader.ReadUInt16(); - u64_2 = reader.ReadUInt64(); + u64_1 = reader.ReadUInt64(); b_5 = reader.ReadByte(); - u32_3 = reader.ReadUInt32(); - b_6 = reader.ReadByte(); - u64_3 = reader.ReadUInt64(); - b_8 = reader.ReadByte(); + bytearray_1 = reader.ReadBytes(31); + Level = reader.ReadUInt16(); + bytearray_0 = reader.ReadBytes(79); u32_4 = reader.ReadUInt32(); u32_5 = reader.ReadUInt32(); - b_9 = reader.ReadByte(); + b_6 = reader.ReadByte(); u32_6 = reader.ReadUInt32(); - bytearray_1 = reader.ReadBytes(36); - Level = reader.ReadUInt16(); - bytearray_0 = reader.ReadBytes(74); - GearLevel = reader.ReadUInt32(); + u32_7 = reader.ReadUInt32(); + b_7 = reader.ReadByte(); + b_8 = reader.ReadByte(); + PlayerId = reader.ReadUInt64(); + b_9 = reader.ReadByte(); + u64_2 = reader.ReadUInt64(); b_10 = reader.ReadByte(); - if (b_10 == 1) - u32_7 = reader.ReadUInt32(); - u32_8 = reader.ReadUInt32(); - u16list_0 = reader.ReadList(); - b_11 = reader.ReadByte(); - subPKTInitPC29s = reader.ReadList(); - u64_4 = reader.ReadUInt64(); + u64_3 = reader.ReadUInt64(); + GearLevel = reader.ReadUInt32(); b_12 = reader.ReadByte(); + if (b_12 == 1) + u32_8 = reader.ReadUInt32(); b_13 = reader.ReadByte(); - u16_2 = reader.ReadUInt16(); b_14 = reader.ReadByte(); - b_15 = reader.ReadByte(); + bytearraylist_1 = reader.ReadList(17); + u64_4 = reader.ReadUInt64(); + u32_9 = reader.ReadUInt32(); u32_10 = reader.ReadUInt32(); + subPKTInitPC29s = reader.ReadList(); + b_15 = reader.ReadByte(); + bytearray_3 = reader.ReadBytes(25); + b_16 = reader.ReadByte(); b_17 = reader.ReadByte(); - statusEffectDatas = reader.ReadList(); - Name = reader.ReadString(); - u32_11 = reader.ReadUInt32(); b_18 = reader.ReadByte(); - u16_3 = reader.ReadUInt16(); u32_12 = reader.ReadUInt32(); + b_19 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTNewNpc.cs b/LostArkLogger/Packets/Korea/PKTNewNpc.cs index 9f3c19c6..f4befbd8 100644 --- a/LostArkLogger/Packets/Korea/PKTNewNpc.cs +++ b/LostArkLogger/Packets/Korea/PKTNewNpc.cs @@ -7,13 +7,13 @@ public partial class PKTNewNpc public void KoreaDecode(BitReader reader) { b_0 = reader.ReadByte(); - if (b_0 == 1) - b_1 = reader.ReadByte(); - b_2 = reader.ReadByte(); - if (b_2 == 1) - u64_0 = reader.ReadUInt64(); - b_3 = 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(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTNewNpcSummon.cs b/LostArkLogger/Packets/Korea/PKTNewNpcSummon.cs index 601c6c5e..f76e1e13 100644 --- a/LostArkLogger/Packets/Korea/PKTNewNpcSummon.cs +++ b/LostArkLogger/Packets/Korea/PKTNewNpcSummon.cs @@ -6,11 +6,11 @@ public partial class PKTNewNpcSummon { public void KoreaDecode(BitReader reader) { - bytearray_0 = reader.ReadBytes(20); - OwnerId = reader.ReadUInt64(); - bytearray_1 = reader.ReadBytes(11); npcStruct = reader.Read(); b_0 = reader.ReadByte(); + bytearray_1 = reader.ReadBytes(4087); + OwnerId = reader.ReadUInt64(); + bytearray_0 = reader.ReadBytes(40); } } } diff --git a/LostArkLogger/Packets/Korea/PKTNewPC.cs b/LostArkLogger/Packets/Korea/PKTNewPC.cs index 0c90104a..8f998aaf 100644 --- a/LostArkLogger/Packets/Korea/PKTNewPC.cs +++ b/LostArkLogger/Packets/Korea/PKTNewPC.cs @@ -6,21 +6,21 @@ public partial class PKTNewPC { public void KoreaDecode(BitReader reader) { + pCStruct = reader.Read(); b_0 = reader.ReadByte(); + if (b_0 == 1) + subPKTNewPC33 = reader.Read(); b_1 = reader.ReadByte(); if (b_1 == 1) - bytearray_1 = reader.ReadBytes(12); - b_2 = reader.ReadByte(); - if (b_2 == 1) bytearray_0 = reader.ReadBytes(20); + b_2 = reader.ReadByte(); b_3 = reader.ReadByte(); + if (b_3 == 1) + bytearray_1 = reader.ReadBytes(12); b_4 = reader.ReadByte(); - if (b_4 == 1) - subPKTNewPC33 = reader.Read(); b_5 = reader.ReadByte(); if (b_5 == 1) u32_0 = reader.ReadUInt32(); - pCStruct = reader.Read(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTPartyStatusEffectAddNotify.cs b/LostArkLogger/Packets/Korea/PKTPartyStatusEffectAddNotify.cs index cccf40cb..7395dd4c 100644 --- a/LostArkLogger/Packets/Korea/PKTPartyStatusEffectAddNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTPartyStatusEffectAddNotify.cs @@ -6,10 +6,10 @@ public partial class PKTPartyStatusEffectAddNotify { public void KoreaDecode(BitReader reader) { - u64_0 = reader.ReadUInt64(); + statusEffectDatas = reader.ReadList(); b_0 = reader.ReadByte(); PartyId = reader.ReadUInt64(); - statusEffectDatas = reader.ReadList(); + u64_0 = reader.ReadUInt64(); PlayerIdOnRefresh = reader.ReadUInt64(); } } diff --git a/LostArkLogger/Packets/Korea/PKTPartyStatusEffectRemoveNotify.cs b/LostArkLogger/Packets/Korea/PKTPartyStatusEffectRemoveNotify.cs index 2ae94ede..260423bb 100644 --- a/LostArkLogger/Packets/Korea/PKTPartyStatusEffectRemoveNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTPartyStatusEffectRemoveNotify.cs @@ -6,10 +6,10 @@ public partial class PKTPartyStatusEffectRemoveNotify { public void KoreaDecode(BitReader reader) { - b_0 = reader.ReadByte(); PartyId = reader.ReadUInt64(); u64_0 = reader.ReadUInt64(); StatusEffectIds = reader.ReadList(); + b_0 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTSkillDamageAbnormalMoveNotify.cs b/LostArkLogger/Packets/Korea/PKTSkillDamageAbnormalMoveNotify.cs index 4ae2e969..f84404a5 100644 --- a/LostArkLogger/Packets/Korea/PKTSkillDamageAbnormalMoveNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTSkillDamageAbnormalMoveNotify.cs @@ -6,12 +6,12 @@ public partial class PKTSkillDamageAbnormalMoveNotify { public void KoreaDecode(BitReader reader) { - skillDamageMoveEvents = reader.ReadList(); + SkillEffectId = reader.ReadUInt32(); + u32_0 = reader.ReadUInt32(); b_0 = reader.ReadByte(); SkillId = reader.ReadUInt32(); - u32_0 = reader.ReadUInt32(); - SkillEffectId = reader.ReadUInt32(); SourceId = reader.ReadUInt64(); + skillDamageMoveEvents = reader.ReadList(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTSkillDamageNotify.cs b/LostArkLogger/Packets/Korea/PKTSkillDamageNotify.cs index 4bb660dc..2b27fe2a 100644 --- a/LostArkLogger/Packets/Korea/PKTSkillDamageNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTSkillDamageNotify.cs @@ -6,11 +6,11 @@ public partial class PKTSkillDamageNotify { public void KoreaDecode(BitReader reader) { + skillDamageEvents = reader.ReadList(); + b_0 = reader.ReadByte(); SkillEffectId = reader.ReadUInt32(); SkillId = reader.ReadUInt32(); SourceId = reader.ReadUInt64(); - skillDamageEvents = reader.ReadList(); - b_0 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTSkillStageNotify.cs b/LostArkLogger/Packets/Korea/PKTSkillStageNotify.cs index 8efc0ae1..1a4e5db5 100644 --- a/LostArkLogger/Packets/Korea/PKTSkillStageNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTSkillStageNotify.cs @@ -6,13 +6,13 @@ public partial class PKTSkillStageNotify { public void KoreaDecode(BitReader reader) { - bytearray_0 = reader.ReadBytes(17); - Stage = reader.ReadByte(); - bytearray_3 = reader.ReadBytes(6); + bytearray_2 = reader.ReadBytes(1); SkillId = reader.ReadUInt32(); bytearray_1 = reader.ReadBytes(8); SourceId = reader.ReadUInt64(); - bytearray_2 = reader.ReadBytes(8); + bytearray_0 = reader.ReadBytes(30); + Stage = reader.ReadByte(); + bytearray_3 = reader.ReadBytes(1); } } } diff --git a/LostArkLogger/Packets/Korea/PKTSkillStartNotify.cs b/LostArkLogger/Packets/Korea/PKTSkillStartNotify.cs index 57cf24b0..e50476fb 100644 --- a/LostArkLogger/Packets/Korea/PKTSkillStartNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTSkillStartNotify.cs @@ -6,24 +6,24 @@ public partial class PKTSkillStartNotify { public void KoreaDecode(BitReader reader) { - packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); u64_0 = reader.ReadUInt64(); + u64_1 = reader.ReadUInt64(); + packed_0 = reader.ReadPackedValues(1, 1, 4, 4, 4, 3, 6); + u16_1 = reader.ReadUInt16(); + SourceId = reader.ReadUInt64(); b_0 = reader.ReadByte(); + if (b_0 == 1) + u32_0 = reader.ReadUInt32(); SkillId = reader.ReadUInt32(); - u16_0 = reader.ReadUInt16(); - SourceId = reader.ReadUInt64(); b_1 = reader.ReadByte(); if (b_1 == 1) - u32_0 = reader.ReadUInt32(); + u16_2 = reader.ReadUInt16(); b_2 = reader.ReadByte(); if (b_2 == 1) - u16_1 = reader.ReadUInt16(); - b_3 = reader.ReadByte(); - if (b_3 == 1) u32_1 = reader.ReadUInt32(); - u16_2 = reader.ReadUInt16(); - u64_1 = reader.ReadUInt64(); + b_3 = reader.ReadByte(); u64_2 = reader.ReadUInt64(); + u16_0 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTStatChangeOriginNotify.cs b/LostArkLogger/Packets/Korea/PKTStatChangeOriginNotify.cs index 55c3a305..e4f36de0 100644 --- a/LostArkLogger/Packets/Korea/PKTStatChangeOriginNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTStatChangeOriginNotify.cs @@ -6,13 +6,13 @@ public partial class PKTStatChangeOriginNotify { public void KoreaDecode(BitReader reader) { - StatPairList = reader.Read(); b_0 = reader.ReadByte(); - if (b_0 == 1) - u32_0 = reader.ReadUInt32(); StatPairChangedList = reader.Read(); - ObjectId = reader.ReadUInt64(); + StatPairList = reader.Read(); b_1 = reader.ReadByte(); + if (b_1 == 1) + u32_0 = reader.ReadUInt32(); + ObjectId = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Korea/PKTStatusEffectAddNotify.cs b/LostArkLogger/Packets/Korea/PKTStatusEffectAddNotify.cs index 9cafc514..e1fb2f5d 100644 --- a/LostArkLogger/Packets/Korea/PKTStatusEffectAddNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTStatusEffectAddNotify.cs @@ -6,12 +6,12 @@ public partial class PKTStatusEffectAddNotify { public void KoreaDecode(BitReader reader) { - ObjectId = reader.ReadUInt64(); - u64_0 = reader.ReadUInt64(); New = reader.ReadByte(); + u64_0 = reader.ReadUInt64(); b_0 = reader.ReadByte(); if (b_0 == 1) u64_1 = reader.ReadUInt64(); + ObjectId = reader.ReadUInt64(); statusEffectData = reader.Read(); } } diff --git a/LostArkLogger/Packets/Korea/PKTStatusEffectRemoveNotify.cs b/LostArkLogger/Packets/Korea/PKTStatusEffectRemoveNotify.cs index e4383a1f..099b65d5 100644 --- a/LostArkLogger/Packets/Korea/PKTStatusEffectRemoveNotify.cs +++ b/LostArkLogger/Packets/Korea/PKTStatusEffectRemoveNotify.cs @@ -6,8 +6,8 @@ public partial class PKTStatusEffectRemoveNotify { public void KoreaDecode(BitReader reader) { - InstanceIds = reader.ReadList(); ObjectId = reader.ReadUInt64(); + InstanceIds = reader.ReadList(); Reason = reader.ReadByte(); } } diff --git a/LostArkLogger/Packets/Korea/ProjectileInfo.cs b/LostArkLogger/Packets/Korea/ProjectileInfo.cs index db5bdfe8..7726e1c6 100644 --- a/LostArkLogger/Packets/Korea/ProjectileInfo.cs +++ b/LostArkLogger/Packets/Korea/ProjectileInfo.cs @@ -6,33 +6,33 @@ public partial class ProjectileInfo { public void KoreaDecode(BitReader reader) { - u32_0 = reader.ReadUInt32(); - SkillLevel = reader.ReadByte(); - b_1 = reader.ReadByte(); - u32_3 = reader.ReadUInt32(); - b_3 = reader.ReadByte(); - u32_4 = reader.ReadUInt32(); SkillId = reader.ReadUInt32(); + u16_0 = reader.ReadUInt16(); + u32_4 = reader.ReadUInt32(); + bytearray_0 = reader.ReadBytes(6); b_4 = reader.ReadByte(); if (b_4 == 1) blist_0 = reader.ReadList(); - bytearray_0 = reader.ReadBytes(6); - SkillEffect = reader.ReadUInt32(); - Tripods = reader.ReadBytes(3); - u64_0 = reader.ReadUInt64(); - OwnerId = reader.ReadUInt64(); - u64_1 = reader.ReadUInt64(); u64_2 = reader.ReadUInt64(); - u16_0 = reader.ReadUInt16(); + u64_3 = reader.ReadUInt64(); + u16_1 = reader.ReadUInt16(); + SkillLevel = reader.ReadByte(); + OwnerId = reader.ReadUInt64(); + u64_0 = reader.ReadUInt64(); b_0 = reader.ReadByte(); if (b_0 == 1) - u32_1 = reader.ReadUInt32(); + u32_0 = reader.ReadUInt32(); + b_1 = reader.ReadByte(); + if (b_1 == 1) + u64_1 = reader.ReadUInt64(); + b_2 = reader.ReadByte(); + u32_1 = reader.ReadUInt32(); + b_3 = reader.ReadByte(); + Tripods = reader.ReadBytes(3); + SkillEffect = reader.ReadUInt32(); u32_2 = reader.ReadUInt32(); - u16_1 = reader.ReadUInt16(); + u32_3 = reader.ReadUInt32(); ProjectileId = reader.ReadUInt64(); - b_2 = reader.ReadByte(); - if (b_2 == 1) - u64_3 = reader.ReadUInt64(); } } } diff --git a/LostArkLogger/Packets/Korea/SkillDamageEvent.cs b/LostArkLogger/Packets/Korea/SkillDamageEvent.cs index dc02149a..8154f537 100644 --- a/LostArkLogger/Packets/Korea/SkillDamageEvent.cs +++ b/LostArkLogger/Packets/Korea/SkillDamageEvent.cs @@ -6,16 +6,16 @@ public partial class SkillDamageEvent { public void KoreaDecode(BitReader reader) { + MaxHp = reader.ReadPackedInt(); b_0 = reader.ReadByte(); if (b_0 == 1) b_1 = reader.ReadByte(); - Damage = reader.ReadPackedInt(); + TargetId = reader.ReadUInt64(); b_2 = reader.ReadByte(); - u16_0 = reader.ReadUInt16(); CurHp = reader.ReadPackedInt(); + u16_0 = reader.ReadUInt16(); + Damage = reader.ReadPackedInt(); Modifier = reader.ReadByte(); - TargetId = reader.ReadUInt64(); - MaxHp = reader.ReadPackedInt(); } } } diff --git a/LostArkLogger/Packets/Korea/SkillDamageMoveEvent.cs b/LostArkLogger/Packets/Korea/SkillDamageMoveEvent.cs index 5dec0847..83a5a7d8 100644 --- a/LostArkLogger/Packets/Korea/SkillDamageMoveEvent.cs +++ b/LostArkLogger/Packets/Korea/SkillDamageMoveEvent.cs @@ -6,15 +6,15 @@ public partial class SkillDamageMoveEvent { public void KoreaDecode(BitReader reader) { + b_0 = reader.ReadByte(); flag_0 = reader.ReadFlag(); u16_0 = reader.ReadUInt16(); + skillDamageEvent = reader.Read(); flag_1 = reader.ReadUInt64(); - u16_1 = reader.ReadUInt16(); - u16_2 = reader.ReadUInt16(); flag_2 = reader.ReadUInt64(); - b_0 = reader.ReadByte(); + u16_1 = reader.ReadUInt16(); flag_3 = reader.ReadUInt64(); - skillDamageEvent = reader.Read(); + u16_2 = reader.ReadUInt16(); } } } diff --git a/LostArkLogger/Packets/Korea/StatPair.cs b/LostArkLogger/Packets/Korea/StatPair.cs index 928aeaf4..9f94867d 100644 --- a/LostArkLogger/Packets/Korea/StatPair.cs +++ b/LostArkLogger/Packets/Korea/StatPair.cs @@ -9,8 +9,8 @@ public void KoreaDecode(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/Korea/StatusEffectData.cs b/LostArkLogger/Packets/Korea/StatusEffectData.cs index 62e72a30..cacd1e29 100644 --- a/LostArkLogger/Packets/Korea/StatusEffectData.cs +++ b/LostArkLogger/Packets/Korea/StatusEffectData.cs @@ -7,20 +7,20 @@ public partial class StatusEffectData public void KoreaDecode(BitReader reader) { EffectInstanceId = reader.ReadUInt32(); + s64_0 = reader.ReadSimpleInt(); + SkillLevel = reader.ReadByte(); + b_0 = reader.ReadByte(); + if (b_0 == 1) + InstanceId = reader.ReadUInt64(); + bytearraylist_0 = reader.ReadList(7); + b_1 = reader.ReadByte(); + SourceId = reader.ReadUInt64(); + s64_1 = reader.ReadUInt64(); + StatusEffectId = reader.ReadUInt32(); hasValue = reader.ReadByte(); if (hasValue == 1) Value = reader.ReadBytes(16); - SourceId = reader.ReadUInt64(); - b_0 = reader.ReadByte(); u32_0 = reader.ReadUInt32(); - StatusEffectId = reader.ReadUInt32(); - InstanceId = reader.ReadUInt64(); - b_1 = reader.ReadByte(); - if (b_1 == 1) - s64_1 = reader.ReadUInt64(); - s64_0 = reader.ReadSimpleInt(); - SkillLevel = reader.ReadByte(); - bytearraylist_0 = reader.ReadList(7); } } } diff --git a/LostArkLogger/Packets/Korea/subPKTInitEnv8.cs b/LostArkLogger/Packets/Korea/subPKTInitEnv8.cs index 9f75b4d6..951de27a 100644 --- a/LostArkLogger/Packets/Korea/subPKTInitEnv8.cs +++ b/LostArkLogger/Packets/Korea/subPKTInitEnv8.cs @@ -9,9 +9,9 @@ public void KoreaDecode(BitReader reader) num = reader.ReadUInt16(); for(var i = 0; i < num; i++) { + u16list_2.Add(reader.ReadList()); u16list_0.Add(reader.ReadList()); u16list_1.Add(reader.ReadList()); - u16list_2.Add(reader.ReadList()); } } } diff --git a/LostArkLogger/Packets/Korea/subPKTInitPC29.cs b/LostArkLogger/Packets/Korea/subPKTInitPC29.cs index 94bd44cd..afb08b51 100644 --- a/LostArkLogger/Packets/Korea/subPKTInitPC29.cs +++ b/LostArkLogger/Packets/Korea/subPKTInitPC29.cs @@ -6,13 +6,13 @@ public partial class subPKTInitPC29 { public void KoreaDecode(BitReader reader) { - b_0 = reader.ReadByte(); - u64_0 = reader.ReadUInt64(); - u16_0 = reader.ReadUInt16(); p64_0 = reader.ReadPackedInt(); + u64_0 = reader.ReadUInt64(); + b_0 = reader.ReadByte(); b_1 = reader.ReadByte(); - b_2 = reader.ReadByte(); + u16_0 = reader.ReadUInt16(); p64_1 = reader.ReadPackedInt(); + b_2 = reader.ReadByte(); } } } diff --git a/LostArkLogger/Packets/Korea/subPKTNewNpc66.cs b/LostArkLogger/Packets/Korea/subPKTNewNpc66.cs index 18a62a2d..d474ca48 100644 --- a/LostArkLogger/Packets/Korea/subPKTNewNpc66.cs +++ b/LostArkLogger/Packets/Korea/subPKTNewNpc66.cs @@ -6,14 +6,14 @@ public partial class subPKTNewNpc66 { public void KoreaDecode(BitReader reader) { - b_0 = reader.ReadByte(); + str_0 = reader.ReadString(); u16_0 = reader.ReadUInt16(); + b_0 = reader.ReadByte(); + b_1 = reader.ReadByte(); u64_0 = reader.ReadUInt64(); + itemInfos = reader.ReadList(); subPKTNewNpc5 = reader.Read(); - str_0 = reader.ReadString(); - b_1 = reader.ReadByte(); b_2 = reader.ReadByte(); - itemInfos = reader.ReadList(); } } } diff --git a/LostArkLogger/Packets/Korea/subPKTNewPC33.cs b/LostArkLogger/Packets/Korea/subPKTNewPC33.cs index 64540fbd..d3437400 100644 --- a/LostArkLogger/Packets/Korea/subPKTNewPC33.cs +++ b/LostArkLogger/Packets/Korea/subPKTNewPC33.cs @@ -9,9 +9,9 @@ public void KoreaDecode(BitReader reader) b_0 = reader.ReadByte(); if (b_0 == 1) bytearray_0 = reader.ReadBytes(12); + bytearray_1 = reader.ReadBytes(12); u32_0 = reader.ReadUInt32(); u32_1 = reader.ReadUInt32(); - bytearray_1 = reader.ReadBytes(12); } } } diff --git a/LostArkLogger/Packets/OpCodes_Korea.cs b/LostArkLogger/Packets/OpCodes_Korea.cs index c1b1035e..75baef13 100644 --- a/LostArkLogger/Packets/OpCodes_Korea.cs +++ b/LostArkLogger/Packets/OpCodes_Korea.cs @@ -3,28 +3,28 @@ namespace LostArkLogger { public enum OpCodes_Korea : UInt16 { - PKTAuthTokenResult = 0x79C4, - PKTCounterAttackNotify = 0x8C9A, - PKTDeathNotify = 0xBCAE, - PKTInitEnv = 0xA0A2, - PKTInitPC = 0x2D55, - PKTNewNpc = 0x3189, - PKTNewNpcSummon = 0x73DC, - PKTNewPC = 0x231, - PKTNewProjectile = 0xBE19, - PKTPartyStatusEffectAddNotify = 0x352A, - PKTPartyStatusEffectRemoveNotify = 0x6FB0, - PKTRaidBossKillNotify = 0x98E9, - PKTRaidResult = 0xB3FE, - PKTRemoveObject = 0x12B9, - PKTSkillDamageAbnormalMoveNotify = 0xAF0D, - PKTSkillDamageNotify = 0x58E1, - PKTSkillStageNotify = 0x83F4, - PKTSkillStartNotify = 0x680A, - PKTStatChangeOriginNotify = 0x652A, - PKTStatusEffectAddNotify = 0xA005, - PKTStatusEffectRemoveNotify = 0xDF4F, - PKTTriggerBossBattleStatus = 0x8F97, - PKTTriggerStartNotify = 0xE411, + PKTAuthTokenResult = 0x103C, + PKTCounterAttackNotify = 0x2743, + PKTDeathNotify = 0x655B, + PKTInitEnv = 0xE42E, + PKTInitPC = 0x6514, + PKTNewNpc = 0x2FB3, + PKTNewNpcSummon = 0x8103, + PKTNewPC = 0xA64C, + PKTNewProjectile = 0x672F, + PKTPartyStatusEffectAddNotify = 0xE87C, + PKTPartyStatusEffectRemoveNotify = 0x42FD, + PKTRaidBossKillNotify = 0x5D3C, + PKTRaidResult = 0x1833, + PKTRemoveObject = 0x79DA, + PKTSkillDamageAbnormalMoveNotify = 0xD1DB, + PKTSkillDamageNotify = 0x3724, + PKTSkillStageNotify = 0xAD44, + PKTSkillStartNotify = 0x14A2, + PKTStatChangeOriginNotify = 0x4D15, + PKTStatusEffectAddNotify = 0xDCE2, + PKTStatusEffectRemoveNotify = 0x1B2F, + PKTTriggerBossBattleStatus = 0x91B0, + PKTTriggerStartNotify = 0x17B0, } } diff --git a/LostArkLogger/Utilities/VersionCheck.cs b/LostArkLogger/Utilities/VersionCheck.cs index f966904b..a3a8837b 100644 --- a/LostArkLogger/Utilities/VersionCheck.cs +++ b/LostArkLogger/Utilities/VersionCheck.cs @@ -14,7 +14,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.309.345.1839317"); - public static Version SupportedKoreaVersion = new Version("1.985.1060.1822798"); + public static Version SupportedKoreaVersion = new Version("1.253.481.1841119"); public static (Region, Version) GetLostArkVersion() { var lostArkProcesses = Process.GetProcessesByName("LOSTARK");