Merge pull request #2891 from QuentinGruber/cleanup/reconstruction-sweep

Cleanup/reconstruction sweep

Author: Z1Meme

data/2016/dataSources/Abilities.json

@@ -98,7 +98,8 @@ export const abilitiesPackets: PacketStructures = [
             { name: "loadoutSlotId", type: "uint32", defaultValue: 0 },
             { name: "abilityLineId", type: "uint32", defaultValue: 0 },
             {
-              name: "unknownArray1",
+              // the client copies this member list verbatim; each entry is { abilityId, abilityId, 0 }
+              name: "memberIds",
               type: "array",
               defaultValue: [],
               fields: [
@@ -109,7 +110,7 @@ export const abilitiesPackets: PacketStructures = [
             },
             { name: "unknownDword3", type: "uint32", defaultValue: 0 },
             { name: "itemDefinitionId", type: "uint32", defaultValue: 0 },
-            { name: "unknownByte", type: "uint8", defaultValue: 0 }
+            { name: "abilityFlags", type: "uint8", defaultValue: 0 }
           ]
         }
       ]

src/packets/ClientProtocol/ClientProtocol_1080/abilities.ts

@@ -1932,6 +1932,8 @@ export const basePackets: PacketStructures = [
                 }
               ]
             },
+            // the client reads the self packet to the end and requires it to consume the buffer
+            // exactly, so these trailing fields must stay in place and must not be trimmed
             { name: "quizComplete", type: "boolean", defaultValue: false },
             { name: "unknownQword1", type: "uint64string", defaultValue: "" },
             { name: "unknownDword38", type: "uint32", defaultValue: 0 },

src/packets/ClientProtocol/ClientProtocol_1080/base.ts

@@ -24,7 +24,8 @@ export const mountPackets: PacketStructures = [
         { name: "characterId", type: "uint64string", defaultValue: "0" },
         { name: "vehicleGuid", type: "uint64string", defaultValue: "0" },
         { name: "seatId", type: "uint32", defaultValue: 0 }, // seat 0-3
-        { name: "unknownDword2", type: "uint32", defaultValue: 1 }, // must be 1 or we dont get into vehicle?
+        // the client requires this to be 1 or it will not enter the vehicle
+        { name: "mountAcceptFlag", type: "uint32", defaultValue: 1 },
         { name: "isDriver", type: "uint32", defaultValue: 0 }, // is driver? (you can be on seat 3 and still have control)
         { name: "debugStuff", type: "uint32", defaultValue: 0 }, // colored lines on screen
         { name: "identity", type: "schema", fields: identitySchema },
@@ -100,8 +101,10 @@ export const mountPackets: PacketStructures = [
         { name: "vehicleGuid", type: "uint64string", defaultValue: "0" },
         { name: "identity", type: "schema", fields: identitySchema },
         { name: "seatId", type: "uint32", defaultValue: 0 },
-        { name: "unknownDword1", type: "uint32", defaultValue: 1 }, // needs to be 1
-        { name: "unknownDword2", type: "uint32", defaultValue: 1 } // needs to be 1
+        // paired accept flag; the client requires this to be 1
+        { name: "acceptFlag", type: "uint32", defaultValue: 1 },
+        // whether the seat has drive control (seatId == 0 ? 1 : 0)
+        { name: "driveAccess", type: "uint32", defaultValue: 1 }
       ]
     }
   ],

src/packets/ClientProtocol/ClientProtocol_1080/mount.ts

@@ -1601,7 +1601,7 @@ function packFullNPCRemoteWeaponsData(obj: any) {
           ]
         },
         {
-          name: "remoteWeaponExtra",
+          name: "remoteWeaponsExtra",
           type: "array",
           defaultValue: {},
           fields: [
@@ -2625,7 +2625,7 @@ export const fullPcSchema: PacketFields = [
     fields: statSchema
   },
   {
-    name: "remoteWeaponExtra",
+    name: "remoteWeaponsExtra",
     type: "array",
     defaultValue: {},
     fields: [
@@ -2714,7 +2714,7 @@ export const skyData: PacketFields = [
   { name: "windDirectionY", type: "float", defaultValue: 0 },
   { name: "windDirectionZ", type: "float", defaultValue: 0 },
   { name: "wind", type: "float", defaultValue: 0 },
-  { name: "rainminStrength", type: "float", defaultValue: 0 },
+  { name: "rainMinStrength", type: "float", defaultValue: 0 },
   { name: "rainRampupTimeSeconds", type: "float", defaultValue: 0 },
   { name: "cloudFile", type: "string", defaultValue: "" },
   { name: "stratusCloudTiling", type: "float", defaultValue: 0 },

src/packets/ClientProtocol/ClientProtocol_1080/shared.ts

@@ -753,7 +753,7 @@ function parseHitReportPacket(data: Buffer, offset: number) {
   obj.unknownBytes = DataSchema.parse(
     [{ name: "unknownBytes", type: "bytes", length: byteLen }],
     data,
-    0
+    offset
   ).result;
   offset += byteLen;
 

src/packets/ClientProtocol/ClientProtocol_1080/weapon.ts

@@ -1453,6 +1453,8 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
         resourceType = 0;
       }
       return {
+        // outer resourceId mirrors resourceData.resourceId so the packed entry is labelled
+        resourceId: resourceId,
         resourceType: resourceType,
         resourceData: {
           resourceId: resourceId,

src/servers/ZoneServer2016/entities/basefullcharacter.ts

@@ -251,6 +251,8 @@ export abstract class BaseLightweightCharacter extends BaseEntity {
       },
       movementVersion: this.movementVersion,
       headActor: this.headActor,
+      // zombie models render hair from the eyeActor slot, so for zombies the hair goes in eyeActor and
+      // the real eye actor moves to unknownString4; non-zombies use each slot as named
       eyeActor: zombieModel ? this.hairModel : this.eyeActor,
       unknownString4: zombieModel ? this.eyeActor : this.hairModel,
       attachedObject: {

src/servers/ZoneServer2016/entities/baselightweightcharacter.ts

@@ -1363,7 +1363,7 @@ export class Character2016 extends BaseFullCharacter {
     return {
       loadoutSlotId: slotId,
       abilityLineId: abilityLineId,
-      unknownArray1:
+      memberIds:
         itemDefinitionId == WEAPON_FISTS
           ? [
               {
@@ -1376,7 +1376,7 @@ export class Character2016 extends BaseFullCharacter {
           : [abilityEntry],
       unknownDword3: 2,
       itemDefinitionId: itemDefinitionId,
-      unknownByte: 64
+      abilityFlags: 64
     };
   }
 
@@ -1385,7 +1385,7 @@ export class Character2016 extends BaseFullCharacter {
       {
         loadoutSlotId: 1,
         abilityLineId: 1,
-        unknownArray1: [
+        memberIds: [
           {
             unknownDword1: 1111164,
             unknownDword2: 1111164,
@@ -1394,7 +1394,7 @@ export class Character2016 extends BaseFullCharacter {
         ],
         unknownDword3: 2,
         itemDefinitionId: 83,
-        unknownByte: 64
+        abilityFlags: 64
       }
       // hardcoded one weapon ability to fix fists after respawning
     ];
@@ -1521,7 +1521,7 @@ export class Character2016 extends BaseFullCharacter {
       grants.push({
         loadoutSlotId: loadoutSlotId,
         abilityLineId: abilityLineId,
-        unknownArray1: [
+        memberIds: [
           {
             unknownDword1: abilityId,
             unknownDword2: abilityId,
@@ -1530,7 +1530,7 @@ export class Character2016 extends BaseFullCharacter {
         ],
         unknownDword3: 2,
         itemDefinitionId: itemDefinitionId,
-        unknownByte: 64
+        abilityFlags: 64
       });
       return true;
     };
@@ -2282,7 +2282,7 @@ export class Character2016 extends BaseFullCharacter {
       case "HEAD":
       case "GLASSES":
       case "NECK":
-        damage = damage *= headshotDmgMultiplier;
+        damage *= headshotDmgMultiplier;
         damage = server.applyHelmetDamageReduction(this, damage, 1);
         break;
       default:

src/servers/ZoneServer2016/entities/character.ts

@@ -113,7 +113,7 @@ export class Plant extends ItemObject {
             this.actorModelId = ModelIds.WHEAT_CROPSTATE_1;
             break;
           case 2:
-            this.actorModelId = ModelIds.WEHAT_CROPSTATE_2;
+            this.actorModelId = ModelIds.WHEAT_CROPSTATE_2;
             break;
           case 3:
             this.actorModelId = ModelIds.WHEAT_CROPSTATE_3;
@@ -172,16 +172,14 @@ export class Plant extends ItemObject {
         client.character.lootItem(server, server.generateItem(Items.WHEAT));
         client.character.lootItem(
           server,
-          server.generateItem(Items.SEED_WHEAT, 2),
-          2
+          server.generateItem(Items.SEED_WHEAT, 2)
         );
         break;
       case Items.SEED_CORN:
         client.character.lootItem(server, server.generateItem(Items.CORN));
         client.character.lootItem(
           server,
-          server.generateItem(Items.SEED_CORN, 2),
-          2
+          server.generateItem(Items.SEED_CORN, 2)
         );
         break;
     }