Merge pull request #2871 from QuentinGruber/fix/clientprotocol-1080-opcode-reconciliation

Misc client/server packet parity

Author: Z1Meme

src/packets/ClientProtocol/ClientProtocol_1080/character.ts

@@ -1261,7 +1261,8 @@ export const characterPackets: PacketStructures = [
     {
       fields: [
         { name: "characterId", type: "uint64string", defaultValue: "0" },
-        { name: "twitchName", type: "string", defaultValue: "" }
+        { name: "twitchName", type: "string", defaultValue: "" },
+        { name: "unknownQword1", type: "uint64string", defaultValue: "0" }
       ]
     }
   ],

src/packets/ClientProtocol/ClientProtocol_1080/clientUpdate.ts

@@ -166,35 +166,18 @@ export const clientUpdatePackets: PacketStructures = [
       ]
     }
   ],
-  [
-    "ClientUpdate.ZonePopulation",
-    0x112f00,
-    {
-      fields: [
-        {
-          name: "populations",
-          type: "array",
-          defaultValue: [{}],
-          elementType: "uint8"
-        }
-      ]
-    }
-  ],
   [
     // 2016
     "ClientUpdate.RespawnLocations",
     0x111f00,
     {
       fields: [
-        { name: "unknownFlags", type: "uint8", defaultValue: 0 },
         {
           name: "locations",
           type: "array",
           defaultValue: [{}],
           fields: respawnLocationSchema
         },
-        { name: "unknownDword1", type: "uint32", defaultValue: 0 },
-        { name: "unknownDword2", type: "uint32", defaultValue: 0 },
         {
           name: "locations2",
           type: "array",

src/packets/ClientProtocol/ClientProtocol_1080/loadout.ts

@@ -24,7 +24,7 @@ export const loadoutPackets: PacketStructures = [
   ],
 
   [
-    "Loadout.Unk1",
+    "Loadout.SetCurrentLoadoutSlot",
     0x8703,
     {
       fields: [

src/packets/ClientProtocol/ClientProtocol_1080/shared.ts

@@ -1457,9 +1457,9 @@ export function packItemSubData(obj: any) {
   data.writeUInt8(obj["hasSubData"] ? 1 : 0, 0);
   if (!obj.hasSubData) return data;
   const v = Buffer.alloc(4);
-  v.writeUInt32LE(obj["unknownDword1"], 0);
+  v.writeUInt32LE(obj["subDataType"], 0);
   data = Buffer.concat([data, v]);
-  if (obj.unknownDword1 <= 0) return data;
+  if (obj.subDataType !== 1) return data; // client reads unknownData1 only when subDataType == 1
   const unknownData1Obj = DataSchema.pack(
     unknownData1Schema,
     obj["unknownData1"]
@@ -2641,8 +2641,6 @@ export const respawnLocationSchema: PacketFields = [
   { name: "iconId2", type: "uint32", defaultValue: 0 },
   { name: "respawnTotalTime", type: "uint32", defaultValue: 0 },
   { name: "respawnTimeMs", type: "uint32", defaultValue: 0 },
-  { name: "nameId", type: "uint32", defaultValue: 0 },
-  { name: "distance", type: "float", defaultValue: 0.0 },
   { name: "unknownByte1", type: "uint8", defaultValue: 0 },
   { name: "unknownByte2", type: "uint8", defaultValue: 0 },
   {

src/packets/ClientProtocol/ClientProtocol_1080/weapon.ts

@@ -143,7 +143,7 @@ const weaponPackets: PacketStructures = [
       fields: [
         { name: "guid", type: "uint64string", defaultValue: "0" },
         { name: "unknownBoolean1", type: "boolean", defaultValue: false },
-        { name: "unknownDword1", type: "uint32", defaultValue: 0 }
+        { name: "unknownData1", type: "byteswithlength" }
       ]
     }
   ],
@@ -166,7 +166,7 @@ const weaponPackets: PacketStructures = [
         { name: "guid", type: "uint64string", defaultValue: "0" },
         { name: "unknownByte1", type: "uint8", defaultValue: 0 },
         { name: "unknownBoolean1", type: "boolean", defaultValue: false },
-        { name: "unknownDword1", type: "uint32", defaultValue: 0 }
+        { name: "unknownData1", type: "byteswithlength" }
       ]
     }
   ],