h1z1-server 0.23.1 → 0.23.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <quentingruber@gmail.com> (http://github.com/quentingruber)",
   "license": "GPL-3.0-only",

package/src/packets/ClientProtocol/ClientProtocol_1080/command.ts

@@ -35,7 +35,15 @@ export const commandPackets: any = [
     "Command.InteractRequest",
     0x090700,
     {
-      fields: [{ name: "guid", type: "uint64string", defaultValue: "0" }],
+      fields: [
+        { name: "characterId", type: "uint64string", defaultValue: "0" },
+        {
+          name: "entityPosition",
+          type: "floatvector4",
+          defaultValue: [0, 0, 0, 0],
+        },
+        { name: "isInstant", type: "boolean", defaultValue: true },
+      ],
     },
   ],
   [

package/src/servers/ZoneServer2016/classes/baseItem.ts

@@ -19,7 +19,22 @@ export class BaseItem {
   itemGuid: string;
   containerGuid = "0x0";
   currentDurability: number;
-  stackCount: number;
+  debugFlag: string = "unset";
+  set stackCount(stackCount: number) {
+    if (stackCount <= 0) {
+      console.error(
+        `negative stackcount (${stackCount}) detected for item ${this.itemDefinitionId} debugflag ${this.debugFlag}`
+      );
+      this._stackCount = 1;
+      return;
+    }
+    this._stackCount = stackCount;
+  }
+  private _stackCount?: number = 0;
+  /* eslint-disable @typescript-eslint/adjacent-overload-signatures */
+  get stackCount() {
+    return this._stackCount || 1;
+  }
   weapon?: Weapon;
   constructor(
     itemDefinitionId: number,

package/src/servers/ZoneServer2016/classes/collectingentity.ts

@@ -124,7 +124,12 @@ export class CollectingEntity {
           passed = true;
           if (this.currentTicks >= this.requiredTicks) {
             this.currentTicks = 0;
-            server.removeContainerItemNoClient(item, parentObject, 1);
+            server.removeContainerItem(
+              this.parentObject,
+              item,
+              parentObject.getContainer(),
+              1
+            );
             server.addContainerItemExternal(
               parentObject.mountedCharacter
                 ? parentObject.mountedCharacter

package/src/servers/ZoneServer2016/classes/gridcell.ts

@@ -1,8 +1,6 @@
-import { BaseEntity } from "../entities/baseentity";
-
 export class GridCell {
   position: Float32Array;
-  objects: Array<BaseEntity> = [];
+  objects: Array<any> = [];
   width: number;
   height: number;
   constructor(x: number, y: number, width: number, height: number) {

package/src/servers/ZoneServer2016/classes/loadoutcontainer.ts

@@ -199,7 +199,7 @@ export class LoadoutContainer extends LoadoutItem {
       // allows items in the same container but different stacks to be stacked
       return;
     }
-    if (!server.removeContainerItem(client, item, this, count)) {
+    if (!server.removeContainerItem(client.character, item, this, count)) {
       server.containerError(client, ContainerErrors.NO_ITEM_IN_SLOT);
       return;
     }

package/src/servers/ZoneServer2016/classes/smeltingentity.ts

@@ -148,7 +148,12 @@ export class SmeltingEntity {
     Object.values(container.items).forEach((item: BaseItem) => {
       if (allowBurn) return;
       if (this.allowedFuel.includes(item.itemDefinitionId)) {
-        server.removeContainerItemNoClient(item, parentObject, 1);
+        server.removeContainerItem(
+          this.parentObject,
+          item,
+          this.parentObject.getContainer(),
+          1
+        );
         if (item.itemDefinitionId == Items.WOOD_LOG) {
           // give charcoal if wood log was burned
           server.addContainerItemExternal(
@@ -231,9 +236,10 @@ export class SmeltingEntity {
                 if (fulfilledComponents.length == recipe.components.length) {
                   itemsToRemove.forEach(
                     (item: { item: BaseItem; count: number }) => {
-                      server.removeContainerItemNoClient(
+                      server.removeContainerItem(
+                        this.parentObject,
                         item.item,
-                        parentObject,
+                        this.parentObject.getContainer(),
                         item.count
                       );
                     }
@@ -255,7 +261,6 @@ export class SmeltingEntity {
         });
       }
     });
-    this.isSmelting = false;
     setTimeout(() => {
       this.startSmelting(server, parentObject);
     }, this.smeltingTime);

package/src/servers/ZoneServer2016/commands/commands.ts

@@ -1559,6 +1559,38 @@ export const commands: Array<Command> = [
         }
       }
 
+      for (const a in server._temporaryObjects) {
+        const construction = server._temporaryObjects[a];
+        if (
+          isPosInRadius(
+            Number(args[0]),
+            client.character.state.position,
+            construction.state.position
+          )
+        ) {
+          entitiesToDelete.push({
+            characterId: construction.characterId,
+            dictionary: server._temporaryObjects,
+          });
+        }
+      }
+
+      for (const a in server._plants) {
+        const construction = server._plants[a];
+        if (
+          isPosInRadius(
+            Number(args[0]),
+            client.character.state.position,
+            construction.state.position
+          )
+        ) {
+          entitiesToDelete.push({
+            characterId: construction.characterId,
+            dictionary: server._plants,
+          });
+        }
+      }
+
       entitiesToDelete.forEach(
         (entity: { characterId: string; dictionary: any }) => {
           server.deleteEntity(entity.characterId, entity.dictionary, 1875, 500);

package/src/servers/ZoneServer2016/data/Recipes.ts

@@ -462,6 +462,16 @@ export const smeltingData: { [recipeId: number]: smeltRecipe } = {
       },
     ],
   },
+  41: {
+    filterId: FilterIds.FURNACE,
+    rewardId: Items.METAL_BAR,
+    components: [
+      {
+        itemDefinitionId: Items.METAL_PIPE,
+        requiredAmount: 1,
+      },
+    ],
+  },
 };
 
 export const recipes: { [recipeId: number]: Recipe } = {

package/src/servers/ZoneServer2016/data/lootspawns.ts

@@ -535,6 +535,38 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
   "ItemSpawnerResidential_Tier00.adr": {
     spawnChance: 20,
     items: [
+      {
+        item: Items.WEAPON_308,
+        weight: 7,
+        spawnCount: {
+          min: 1,
+          max: 1,
+        },
+      },
+      {
+        item: Items.WEAPON_SHOTGUN,
+        weight: 5,
+        spawnCount: {
+          min: 1,
+          max: 1,
+        },
+      },
+      {
+        item: Items.WEAPON_1911,
+        weight: 10,
+        spawnCount: {
+          min: 1,
+          max: 1,
+        },
+      },
+      {
+        item: Items.WEAPON_M9,
+        weight: 10,
+        spawnCount: {
+          min: 1,
+          max: 1,
+        },
+      },
       {
         item: Items.DUCT_TAPE,
         weight: 20,
@@ -553,7 +585,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.SHIRT_DEFAULT,
-        weight: 100,
+        weight: 40,
         spawnCount: {
           min: 1,
           max: 1,
@@ -561,7 +593,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.PANTS_DEFAULT,
-        weight: 100,
+        weight: 40,
         spawnCount: {
           min: 1,
           max: 1,
@@ -569,7 +601,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.CONVEYS_BLUE,
-        weight: 50,
+        weight: 30,
         spawnCount: {
           min: 1,
           max: 1,
@@ -593,7 +625,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.HAT_CAP,
-        weight: 100,
+        weight: 15,
         spawnCount: {
           min: 1,
           max: 1,
@@ -601,7 +633,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.HAT_BEANIE,
-        weight: 100,
+        weight: 15,
         spawnCount: {
           min: 1,
           max: 1,
@@ -609,7 +641,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.HELMET_MOTORCYCLE,
-        weight: 10,
+        weight: 15,
         spawnCount: {
           min: 1,
           max: 1,
@@ -697,7 +729,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.AMMO_308,
-        weight: 20,
+        weight: 18,
         spawnCount: {
           min: 1,
           max: 3,
@@ -705,7 +737,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.AMMO_12GA,
-        weight: 20,
+        weight: 18,
         spawnCount: {
           min: 1,
           max: 3,
@@ -721,7 +753,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.FIRST_AID,
-        weight: 20,
+        weight: 15,
         spawnCount: {
           min: 1,
           max: 1,
@@ -1142,11 +1174,11 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
 
   // #region FARM
   "ItemSpawnerFarm.adr": {
-    spawnChance: 30,
+    spawnChance: 50,
     items: [
       {
         item: Items.FERTILIZER,
-        weight: 60,
+        weight: 65,
         spawnCount: {
           min: 1,
           max: 1,
@@ -1186,7 +1218,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.WATER_EMPTY,
-        weight: 40,
+        weight: 35,
         spawnCount: {
           min: 1,
           max: 1,
@@ -1194,7 +1226,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.GROUND_TILLER,
-        weight: 40,
+        weight: 20,
         spawnCount: {
           min: 1,
           max: 1,
@@ -1862,20 +1894,20 @@ export const containerLootSpawners: {
     ],
   },
   "Weapons Locker": {
-    spawnChance: 100,
+    spawnChance: 60,
     maxItems: 1,
     items: [
       {
         item: Items.WEAPON_AR15,
-        weight: 30,
+        weight: 20,
         spawnCount: {
           min: 1,
           max: 1,
         },
       },
       {
-        item: Items.WEAPON_308,
-        weight: 5,
+        item: Items.KEVLAR_DEFAULT,
+        weight: 35,
         spawnCount: {
           min: 1,
           max: 1,
@@ -1889,14 +1921,6 @@ export const containerLootSpawners: {
           max: 11,
         },
       },
-      {
-        item: Items.AMMO_308,
-        weight: 10,
-        spawnCount: {
-          min: 2,
-          max: 8,
-        },
-      },
     ],
   },
   Locker: {

package/src/servers/ZoneServer2016/entities/baseentity.ts

@@ -84,10 +84,15 @@ export class BaseEntity {
     // default: do nothing
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+  ) {
     // default: do nothing
   }
+  /* eslint-enable @typescript-eslint/no-unused-vars */
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   OnInteractionString(server: ZoneServer2016, client: ZoneClient2016) {

package/src/servers/ZoneServer2016/entities/basefullcharacter.ts

@@ -28,6 +28,7 @@ import { BaseLightweightCharacter } from "./baselightweightcharacter";
 import { LoadoutContainer } from "../classes/loadoutcontainer";
 import { LoadoutItem } from "../classes/loadoutItem";
 import { ZoneClient2016 } from "../classes/zoneclient";
+import { Weapon } from "../classes/weapon";
 
 const debugName = "ZoneServer",
   debug = require("debug")(debugName);
@@ -482,14 +483,24 @@ export class BaseFullCharacter extends BaseLightweightCharacter {
 
   getDeathItems(server: ZoneServer2016) {
     const items: { [itemGuid: string]: BaseItem } = {};
-    Object.values(this._loadout).forEach((item) => {
+    Object.values(this._loadout).forEach((itemData) => {
       if (
-        item.itemGuid != "0x0" &&
-        !this.isDefaultItem(item.itemDefinitionId) &&
-        !server.isAdminItem(item.itemDefinitionId)
+        itemData.itemGuid != "0x0" &&
+        !this.isDefaultItem(itemData.itemDefinitionId) &&
+        !server.isAdminItem(itemData.itemDefinitionId)
       ) {
-        items[item.itemGuid] = _.cloneDeep(item);
-        items[item.itemGuid].slotId = Object.keys(items).length + 1;
+        const item = new BaseItem(
+          itemData.itemDefinitionId,
+          itemData.itemGuid,
+          itemData.currentDurability,
+          itemData.stackCount
+        );
+
+        item.debugFlag = "getDeathItems";
+        if (itemData.weapon)
+          item.weapon = new Weapon(item, itemData.weapon.ammoCount);
+        item.slotId = Object.keys(items).length + 1;
+        items[item.itemGuid] = item;
       }
     });
 

package/src/servers/ZoneServer2016/entities/baselootableentity.ts

@@ -43,8 +43,13 @@ export class BaseLootableEntity extends BaseFullCharacter {
       stringId: StringIds.OPEN,
     });
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016): void {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ): void {
     if (client.character.characterId == this.mountedCharacter) {
       client.character.dismountContainer(server);
       delete this.mountedCharacter; // the check below wont fix container if characterId is the same

package/src/servers/ZoneServer2016/entities/constructionchildentity.ts

@@ -345,6 +345,12 @@ export class ConstructionChildEntity extends BaseLightweightCharacter {
 
   isInside(position: Float32Array) {
     if (!this.bounds) {
+      switch (this.itemDefinitionId) {
+        case Items.STRUCTURE_STAIRS:
+        case Items.STRUCTURE_STAIRS_UPPER:
+        case Items.LOOKOUT_TOWER:
+          return false;
+      }
       console.error(
         `ERROR: CONSTRUCTION BOUNDS IS NOT DEFINED FOR ${this.itemDefinitionId} ${this.characterId}`
       );
@@ -485,8 +491,13 @@ export class ConstructionChildEntity extends BaseLightweightCharacter {
     if (!this.slot) return 0;
     return getConstructionSlotId(this.slot);
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     if (this.canUndoPlacement(server, client)) {
       this.destroy(server);
       client.character.lootItem(

package/src/servers/ZoneServer2016/entities/constructiondoor.ts

@@ -82,6 +82,7 @@ export class ConstructionDoor extends DoorEntity {
     );
     const itemDefinition = server.getItemDefinition(this.itemDefinitionId);
     if (itemDefinition) this.nameId = itemDefinition.NAME_ID;
+    this.grantedAccess.push(ownerCharacterId);
   }
 
   pGetConstructionHealth() {
@@ -176,7 +177,11 @@ export class ConstructionDoor extends DoorEntity {
     return getConstructionSlotId(this.slot);
   }
 
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+  ) {
     if (this.canUndoPlacement(server, client)) {
       this.destroy(server);
       client.character.lootItem(
@@ -186,69 +191,97 @@ export class ConstructionDoor extends DoorEntity {
       return;
     }
 
-    if (
-      this.passwordHash != 0 &&
-      this.ownerCharacterId != client.character.characterId &&
-      !this.grantedAccess.includes(client.character.characterId)
-    ) {
-      server.sendData(client, "Locks.ShowMenu", {
-        characterId: client.character.characterId,
-        unknownDword1: 2,
-        lockType: 2,
-        objectCharacterId: this.characterId,
-      });
-      return;
-    }
-    if (
-      this.passwordHash == 0 &&
-      this.ownerCharacterId === client.character.characterId
-    ) {
-      server.sendData(client, "Locks.ShowMenu", {
-        characterId: client.character.characterId,
-        unknownDword1: 2,
-        lockType: 1,
-        objectCharacterId: this.characterId,
-      });
-      return;
-    }
-    if (this.moving) {
-      return;
-    }
-    this.moving = true;
-    // eslint-disable-next-line
-    const door = this; // for setTimeout callback
-    setTimeout(function () {
-      door.moving = false;
-    }, 1000);
-    server.sendDataToAllWithSpawnedEntity(
-      server._constructionDoors,
-      this.characterId,
-      "PlayerUpdatePosition",
-      {
-        transientId: this.transientId,
-        positionUpdate: {
-          sequenceTime: 0,
-          unknown3_int8: 0,
-          position: this.state.position,
-          orientation: this.isOpen ? this.closedAngle : this.openAngle,
-        },
+    if (isInstant) {
+      if (
+        this.passwordHash == 0 ||
+        this.grantedAccess.includes(client.character.characterId) ||
+        client.character.characterId === this.ownerCharacterId
+      ) {
+        if (this.moving) {
+          return;
+        }
+        this.moving = true;
+        // eslint-disable-next-line
+        const door = this; // for setTimeout callback
+        setTimeout(function () {
+          door.moving = false;
+        }, 1000);
+        server.sendDataToAllWithSpawnedEntity(
+          server._constructionDoors,
+          this.characterId,
+          "PlayerUpdatePosition",
+          {
+            transientId: this.transientId,
+            positionUpdate: {
+              sequenceTime: 0,
+              unknown3_int8: 0,
+              position: this.state.position,
+              orientation: this.isOpen ? this.closedAngle : this.openAngle,
+            },
+          }
+        );
+        server.sendDataToAllWithSpawnedEntity(
+          server._constructionDoors,
+          this.characterId,
+          "Command.PlayDialogEffect",
+          {
+            characterId: this.characterId,
+            effectId: this.isOpen ? this.closeSound : this.openSound,
+          }
+        );
+        this.isOpen = !this.isOpen;
+        this.isSecured = !this.isOpen;
+        const parent = this.getParent(server);
+        if (parent) {
+          parent.updateSecuredState(server);
+          // spawn hidden characters emmediately after door opens
+          const allowedConstruction = [
+            Items.SHELTER,
+            Items.SHELTER_LARGE,
+            Items.SHELTER_UPPER,
+            Items.SHELTER_UPPER_LARGE,
+            Items.SHACK,
+            Items.SHACK_BASIC,
+            Items.SHACK_SMALL,
+          ];
+          if (
+            this.isOpen &&
+            allowedConstruction.includes(parent.itemDefinitionId)
+          ) {
+            for (const a in server._clients) {
+              const client = server._clients[a];
+              if (client.character.isHidden == parent.characterId)
+                server.constructionManager(client);
+            }
+          }
+        }
+        return;
+      } else {
+        server.sendData(client, "Locks.ShowMenu", {
+          characterId: client.character.characterId,
+          unknownDword1: 2,
+          lockType: 2,
+          objectCharacterId: this.characterId,
+        });
+        return;
       }
-    );
-    server.sendDataToAllWithSpawnedEntity(
-      server._constructionDoors,
-      this.characterId,
-      "Command.PlayDialogEffect",
-      {
-        characterId: this.characterId,
-        effectId: this.isOpen ? this.closeSound : this.openSound,
+    } else if (!isInstant) {
+      if (client.character.characterId === this.ownerCharacterId) {
+        server.sendData(client, "Locks.ShowMenu", {
+          characterId: client.character.characterId,
+          unknownDword1: 2,
+          lockType: 1,
+          objectCharacterId: this.characterId,
+        });
+        return;
+      } else if (!this.grantedAccess.includes(client.character.characterId)) {
+        server.sendData(client, "Locks.ShowMenu", {
+          characterId: client.character.characterId,
+          unknownDword1: 2,
+          lockType: 2,
+          objectCharacterId: this.characterId,
+        });
       }
-    );
-    this.isOpen = !this.isOpen;
-    this.isSecured = !this.isOpen;
-
-    const parent = this.getParent(server);
-    if (parent) {
-      parent.updateSecuredState(server);
     }
   }
 
@@ -257,9 +290,19 @@ export class ConstructionDoor extends DoorEntity {
       server.undoPlacementInteractionString(this, client);
       return;
     }
-    server.sendData(client, "Command.InteractionString", {
-      guid: this.characterId,
-      stringId: StringIds.OPEN_AND_LOCK,
-    });
+    if (
+      client.character.characterId === this.ownerCharacterId ||
+      !this.grantedAccess.includes(client.character.characterId)
+    ) {
+      server.sendData(client, "Command.InteractionString", {
+        guid: this.characterId,
+        stringId: StringIds.OPEN_AND_LOCK,
+      });
+    } else {
+      server.sendData(client, "Command.InteractionString", {
+        guid: this.characterId,
+        stringId: StringIds.OPEN,
+      });
+    }
   }
 }