1.309.345.1839317

shalzuth · Aug 24, 2022 · 97c30ec · 97c30ec
1 parent 0a99859
commit 97c30ec
Show file tree

Hide file tree

Showing 33 changed files with 240 additions and 240 deletions.
diff --git 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
@@ -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<Byte[]>(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
@@ -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<StatusEffectData>();
             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<UInt64>();
             b_30 = reader.ReadByte();
             if (b_30 == 1)
-                bytearraylist_0 = reader.ReadList<Byte[]>(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<subPKTNewNpc66>();
+            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<subPKTInitPC29>();
+            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<UInt64>();
-            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<subPKTInitPC29>();
+            b_15 = reader.ReadByte();
             b_16 = reader.ReadByte();
-            if (b_16 == 1)
-                subPKTNewNpc66 = reader.Read<subPKTNewNpc66>();
             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<StatPair>();
+                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<StatusEffectData>();
+            b_22 = reader.ReadByte();
+            if (b_22 == 1)
+                bytearraylist_0 = reader.ReadList<Byte[]>(12);
+            u64_1 = reader.ReadUInt64();
+            u16_2 = reader.ReadUInt16();
+            b_23 = reader.ReadByte();
+            if (b_23 == 1)
+                b_24 = reader.ReadByte();
+            statPair = reader.Read<StatPair>();
         }
     }
 }
diff --git 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<subPKTInitPC29>();
-            b_1 = reader.ReadByte();
-            u16_1 = reader.ReadUInt16();
-            u32_6 = reader.ReadUInt32();
-            GearLevel = reader.ReadUInt32();
-            b_10 = reader.ReadByte();
+            EquippedItems = reader.ReadList<ItemInfo>();
+            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<ItemInfo>();
+            ClassId = reader.ReadUInt16();
+            u64_0 = reader.ReadUInt64();
             bytearray_2 = reader.ReadBytes(5);
-            statPair = reader.Read<StatPair>();
-            bytearray_0 = reader.ReadBytes(25);
+            str_0 = reader.ReadString();
             b_0 = reader.ReadByte();
-            u16_0 = reader.ReadUInt16();
-            skillRunes = reader.Read<SkillRunes>();
             PartyId = reader.ReadUInt64();
             u32_1 = reader.ReadUInt32();
             u32_2 = reader.ReadUInt32();
-            u32_3 = reader.ReadUInt32();
-            ClassId = reader.ReadUInt16();
+            subPKTInitPC29s = reader.ReadList<subPKTInitPC29>();
+            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<subPKTNewNpc5>();
+            u16_1 = reader.ReadUInt16();
             b_5 = reader.ReadByte();
-            u32_4 = reader.ReadUInt32();
+            statusEffectDatas = reader.ReadList<StatusEffectData>();
+            Name = reader.ReadString();
+            statPair = reader.Read<StatPair>();
+            b_6 = reader.ReadByte();
+            b_8 = reader.ReadByte();
+            u32list_0 = reader.ReadList<UInt32>();
+            skillRunes = reader.Read<SkillRunes>();
             u32_5 = reader.ReadUInt32();
+            b_9 = reader.ReadByte();
             itemInfos = reader.ReadList<ItemInfo>();
+            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<StatusEffectData>();
-            u32list_0 = reader.ReadList<UInt32>();
-            b_7 = reader.ReadByte();
-            if (b_7 == 1)
-                bytearray_1 = reader.ReadBytes(12);
-            subPKTNewNpc5 = reader.Read<subPKTNewNpc5>();
-            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
@@ -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
@@ -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
@@ -6,14 +6,14 @@ public partial class PKTInitEnv
     {
         public void SteamDecode(BitReader reader)
         {
-            u16list_0 = reader.ReadList<UInt16>();
             u32_0 = reader.ReadUInt32();
-            u32_1 = reader.ReadUInt32();
-            subPKTInitEnv8 = reader.Read<subPKTInitEnv8>();
-            s64_0 = reader.ReadSimpleInt();
-            b_0 = reader.ReadByte();
             s64_1 = reader.ReadUInt64();
+            b_0 = reader.ReadByte();
+            subPKTInitEnv8 = reader.Read<subPKTInitEnv8>();
             PlayerId = reader.ReadUInt64();
+            u16list_0 = reader.ReadList<UInt16>();
+            u32_1 = reader.ReadUInt32();
+            s64_0 = reader.ReadSimpleInt();
         }
     }
 }