h1z1-server 0.36.2 → 0.36.3-0

package/config.yaml

@@ -0,0 +1,27 @@
+server:
+  welcomeMessage: "Welcome to local wsh! :D"
+  adminMessage: "You are an Admin!"
+  isPvE: false 
+
+rcon:
+  port: 55554
+  password: ""
+
+# Fairplay / anticheat config
+fairplay:
+  useFairplay: true
+  maxPing: 250
+  
+  # Removing an entry below will allow clients with a certain rejectionFlag to join
+  # ex. Removing "5 # UNVERIFIED" will allow users with an unverified h1emu status to join
+
+  # by default, globally banned, hwid banned, vpn detected, and unverified clients will have their
+  # connections rejected
+  acceptedRejectionTypes:
+  # LOCAL_BAN, SERVER_LOCKED, and SERVER_REBOOT are always accepted
+  - 2 # GLOBAL_BAN
+  - 3 # VPN
+  - 4 # HWID
+  - 5 # UNVERIFIED
+
+  useAssetValidation: false 

package/data/2016/dataSources/AllowedFileHashes.json

@@ -1024,6 +1024,6 @@
     },
     {
         "file_name": "Assets_256.pack",
-        "crc32_hash": "0f9d31cf"
+        "crc32_hash": "c8b93131"
     }
 ]

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "h1z1-server",
-  "version": "0.36.2",
+  "version": "0.36.3-0",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <quentingruber@gmail.com> (http://github.com/quentingruber)",
   "license": "GPL-3.0-only",
   "main": "h1z1-server.js",
   "engines": {
-    "node": ">=0.17.0 <21"
+    "node": ">=0.17.0 <23"
   },
   "bin": {
     "h1z1-server-demo": "scripts/h1z1-server-demo.js",
@@ -14,27 +14,27 @@
   },
   "dependencies": {
     "@types/js-yaml": "4.0.9",
-    "@types/node": "20.11.19",
-    "@types/ws": "8.5.10",
-    "debug": "4.3.4",
+    "@types/node": "20.14.12",
+    "@types/ws": "8.5.11",
+    "debug": "4.3.6",
     "h1emu-core": "1.2.8",
-    "h1z1-dataschema": "1.7.1",
+    "h1z1-dataschema": "1.7.2",
     "js-yaml": "4.1.0",
-    "mongodb": "6.3.0",
+    "mongodb": "6.8.0",
     "threads": "1.7.0",
-    "typescript": "5.3.3",
-    "ws": "8.16.0"
+    "typescript": "5.5.4",
+    "ws": "8.18.0"
   },
   "directories": {
     "src": "./src"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
     "eslint": "^8.56.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.25.8"
+    "typedoc": "^0.26.5"
   },
   "scripts": {
     "gen-packets-types": "npx ts-node ./scripts/genPacketsNames.ts",

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

@@ -55,7 +55,7 @@ export const dtoPackets: PacketStructures = [
             { name: "unknownDword1", type: "uint32", defaultValue: 0 },
             { name: "unknownBool1", type: "boolean", defaultValue: true },
             { name: "unknownBool2", type: "boolean", defaultValue: true },
-            { name: "unknownBool3", type: "boolean", defaultValue: true }
+            { name: "invisibility", type: "boolean", defaultValue: true }
           ]
         },
         {

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

@@ -2857,8 +2857,7 @@ export function pack2ByteLengthString(string: string) {
 
 export const accountItemSchema: PacketFields = [
   { name: "itemId", type: "uint64string", defaultValue: "0" },
-  { name: "itemDefinitionId", type: "uint32", defaultValue: 0 },
-  { name: "unknownDword2", type: "uint32", defaultValue: 0 }, // 44 for itemDefId 1871, 37 for itemDefId 37, ... (No idea where it comes from)
+  { name: "itemDefinitionId", type: "uint64", defaultValue: 0 },
   { name: "itemCount", type: "uint32", defaultValue: 0 },
   { name: "itemGuid", type: "uint64string", defaultValue: "0" },
   { name: "unknownDword4", type: "uint32", defaultValue: 0 }

package/src/servers/LoginServer/loginserver.test.ts

@@ -19,7 +19,6 @@ test("LoginServer-mongo", { timeout: 5000, skip: !isMongoTests }, async (t) => {
   await t.test("start", async () => {
     await loginServer.start();
   });
-  // TODO: start should stop awaiting only when everything is really done
   await scheduler.yield();
   await t.test("stop", async () => {
     await loginServer.stop();

package/src/servers/LoginServer/loginserver.ts

@@ -40,7 +40,7 @@ import { Worker } from "node:worker_threads";
 import { FileHash, httpServerMessage } from "types/shared";
 import { LoginProtocol2016 } from "../../protocols/loginprotocol2016";
 import { crc_length_options } from "../../types/soeserver";
-import { DB_NAME, DEFAULT_CRYPTO_KEY } from "../../utils/constants";
+import { DB_NAME, DEFAULT_CRYPTO_KEY, MAX_UINT32 } from "../../utils/constants";
 import {
   LoginReply,
   CharacterSelectInfoReply,
@@ -1112,12 +1112,10 @@ export class LoginServer extends EventEmitter {
     ];
     const [address, port] = zoneConnectionString.split(":");
 
-    return {
-      address: address,
-      port: port,
-      clientId: zoneConnectionString,
-      serverId: 1 // TODO: that's a hack
-    } as any;
+    const LZClient = new LZConnectionClient({ address, port: Number(port) });
+    // Hack since the loginserver doesn't have a serverId
+    LZClient.serverId = MAX_UINT32;
+    return LZClient;
   }
 
   async askZone(

package/src/servers/LoginZoneConnection/shared/lzconnectionclient.ts

@@ -11,8 +11,6 @@
 //   Based on https://github.com/psemu/soe-network
 // ======================================================================
 
-import { RemoteInfo } from "node:dgram";
-
 export class LZConnectionClient {
   sessionId: number = 0;
   address: string;
@@ -21,8 +19,8 @@ export class LZConnectionClient {
   clientId: string;
   lastPing: number = 0;
 
-  constructor(remote: RemoteInfo) {
-    this.address = remote.address;
+  constructor(remote: { address?: string; port: number }) {
+    this.address = remote.address ?? "";
     this.port = remote.port;
     this.clientId = `${remote.address}:${remote.port}`;
   }

package/src/servers/SoeServer/soeserver.ts

@@ -412,7 +412,7 @@ export class SOEServer extends EventEmitter {
           );
 
           // client.outputStream.on(SOEOutputChannels.Raw, (data: Buffer) => {
-          // TODO:
+          //  unused in h1z1
           // });
         } else {
           client = this._clients.get(clientId) as SOEClient;

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

@@ -195,9 +195,3 @@ export const lootableContainerDefaultLoadouts = {
   repair_box: [{ item: Items.CONTAINER_REPAIR_BOX }],
   stash: [{ item: Items.CONTAINER_STASH }]
 };
-
-export const accountInventoryDefaultRewards = [
-  { item: Items.REWARD_CRATE_WEARABLES, count: 3 },
-  { item: Items.REWARD_CRATE_ALPHA_LAUNCH, count: 3 },
-  { item: Items.MYSTERY_BAG_1, count: 2 }
-];

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

@@ -220,7 +220,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
     ]
   },
   "ItemSpawner_Weapon_Bat01.adr": {
-    spawnChance: 20,
+    spawnChance: 10,
     items: [
       {
         item: Items.WEAPON_BAT_WOOD,
@@ -311,7 +311,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
     ]
   },
   "ItemSpawner_Weapon_Bat02.adr": {
-    spawnChance: 20,
+    spawnChance: 10,
     items: [
       {
         item: Items.WEAPON_BAT_ALUM,
@@ -482,6 +482,19 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       }
     ]
   },
+  "ItemSpawner_Clothes_Helmet_Tactical_ChipsScratches.adr": {
+    spawnChance: 10,
+    items: [
+      {
+        item: Items.DEFAULT_TACTICAL_HELMET,
+        weight: 100,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      }
+    ]
+  },
   "ItemSpawner_Clothes_BaseballCap.adr": {
     spawnChance: 20,
     items: [
@@ -672,7 +685,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.WATER_PURE,
+        item: Items.WATER_DIRTY,
         weight: 15,
         spawnCount: {
           min: 1,
@@ -769,7 +782,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.WEAPON_BAT_WOOD,
-        weight: 15,
+        weight: 10,
         spawnCount: {
           min: 1,
           max: 1
@@ -777,7 +790,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.WEAPON_BAT_ALUM,
-        weight: 15,
+        weight: 10,
         spawnCount: {
           min: 1,
           max: 1
@@ -1057,7 +1070,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.WATER_PURE,
+        item: Items.WATER_DIRTY,
         weight: 10,
         spawnCount: {
           min: 1,
@@ -1199,6 +1212,30 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
           min: 1,
           max: 1
         }
+      },
+      {
+        item: Items.GROUND_COFFEE,
+        weight: 15,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.SUGAR,
+        weight: 10,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.CANNED_FOOD26,
+        weight: 7,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
       }
     ]
   },
@@ -1305,7 +1342,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.SHIRT_DEFAULT,
+        item: Items.SHIRT_SCRUBS_GRAY,
         weight: 100,
         spawnCount: {
           min: 1,
@@ -1313,7 +1350,15 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.PANTS_DEFAULT,
+        item: Items.PANTS_SCRUBS_GRAY,
+        weight: 100,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.CAP_SCRUBS_GRAY,
         weight: 100,
         spawnCount: {
           min: 1,
@@ -2072,16 +2117,24 @@ export const containerLootSpawners: {
           min: 2,
           max: 10
         }
+      },
+      {
+        item: Items.AMMO_12GA,
+        weight: 20,
+        spawnCount: {
+          min: 1,
+          max: 6
+        }
       }
     ]
   },
   Locker: {
-    spawnChance: 100,
+    spawnChance: 60,
     maxItems: 1,
     items: [
       {
         item: Items.BACKPACK_MILITARY_TAN,
-        weight: 35,
+        weight: 25,
         spawnCount: {
           min: 1,
           max: 1
@@ -2097,7 +2150,15 @@ export const containerLootSpawners: {
       },
       {
         item: Items.KEVLAR_DEFAULT,
-        weight: 35,
+        weight: 25,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.DEFAULT_TACTICAL_HELMET,
+        weight: 25,
         spawnCount: {
           min: 1,
           max: 1
@@ -3427,6 +3488,82 @@ export const containerLootSpawners: {
       }
     ]
   },
+  Washer: {
+    spawnChance: 10,
+    maxItems: 2,
+    items: [
+      {
+        item: Items.SHIRT_DEFAULT,
+        weight: 30,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.PANTS_DEFAULT,
+        weight: 20,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.BASIC_HOODIE,
+        weight: 10,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.CLOTH,
+        weight: 5,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      }
+    ]
+  },
+  Dryer: {
+    spawnChance: 10,
+    maxItems: 2,
+    items: [
+      {
+        item: Items.SHIRT_DEFAULT,
+        weight: 30,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.PANTS_DEFAULT,
+        weight: 20,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.BASIC_HOODIE,
+        weight: 10,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      },
+      {
+        item: Items.CLOTH,
+        weight: 5,
+        spawnCount: {
+          min: 1,
+          max: 1
+        }
+      }
+    ]
+  },
   // used for crate props
   Crate_buffed: {
     spawnChance: 60,
@@ -3457,7 +3594,7 @@ export const containerLootSpawners: {
         }
       },
       {
-        item: Items.WATER_PURE,
+        item: Items.WATER_DIRTY,
         weight: 10,
         spawnCount: {
           min: 1,
@@ -3479,7 +3616,7 @@ export const containerLootSpawners: {
         }
       },
       {
-        item: Items.WATER_PURE,
+        item: Items.WATER_DIRTY,
         weight: 10,
         spawnCount: {
           min: 1,

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

@@ -428,7 +428,7 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
     }
     const itemDefId = item.itemDefinitionId;
     if (server.isAccountItem(itemDefId) && client) {
-      this.lootAccountItem(server, client, item, sendUpdate);
+      server.lootAccountItem(server, client, item, sendUpdate);
     } else if (this.getAvailableLoadoutSlot(server, itemDefId)) {
       if (client && client.character.initialized && sendUpdate) {
         server.sendData(client, "Reward.AddNonRewardItem", {
@@ -444,33 +444,6 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
     }
   }
 
-  lootAccountItem(
-    server: ZoneServer2016,
-    client: ZoneClient2016,
-    item: BaseItem,
-    sendUpdate: boolean = false
-  ) {
-    const items = server._accountInventories[client.loginSessionId]?.items;
-    if (!items) return;
-    items[item.itemGuid] = item;
-    server.sendData(client, "Items.AddEscrowAccountItem", {
-      itemData: {
-        itemId: item.itemGuid,
-        itemDefinitionId: item.itemDefinitionId,
-        itemCount: item.stackCount,
-        itemGuid: item.itemGuid
-      }
-    });
-
-    if (!sendUpdate) return;
-    server.sendData(client, "Reward.AddNonRewardItem", {
-      itemDefId: item.itemDefinitionId,
-      iconId: server.getItemDefinition(item.itemDefinitionId)?.IMAGE_SET_ID,
-      nameId: server.getItemDefinition(item.itemDefinitionId)?.NAME_ID,
-      count: item.stackCount
-    });
-  }
-
   lootItemFromContainer(
     server: ZoneServer2016,
     sourceContainer: LoadoutContainer,
@@ -556,7 +529,9 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
       if (
         ammo &&
         loadoutItem.weapon.ammoCount > 0 &&
-        loadoutItem.weapon.itemDefinitionId != Items.WEAPON_REMOVER
+        loadoutItem.weapon.itemDefinitionId != Items.WEAPON_REMOVER &&
+        server.getItemDefinition(loadoutItem.itemDefinitionId)?.ITEM_CLASS !=
+          ItemClasses.THROWABLES
       ) {
         this.lootContainerItem(server, ammo, ammo.stackCount, true);
       }
@@ -951,7 +926,6 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
     let slot = loadoutSlotItemClass?.SLOT;
     if (!slot) return 0;
     switch (itemDef?.ITEM_CLASS) {
-      // TODO: Prevent equipping throwables until fixed
       case ItemClasses.THROWABLES:
       case ItemClasses.WEAPONS_LONG:
       case ItemClasses.WEAPONS_PISTOL:

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

@@ -101,6 +101,9 @@ export class Character2016 extends BaseFullCharacter {
   /** Used to update the status of the players resources */
   resourcesUpdater?: any;
   factionId = 2;
+  isInInventory: boolean = false;
+  playTime: number = 0;
+  lastDropPlaytime: number = 0;
   set godMode(state: boolean) {
     this.characterStates.invincibility = state;
   }

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

@@ -17,7 +17,6 @@ import { eul2quat } from "../../../utils/utils";
 import { Effects, ModelIds } from "../models/enums";
 import { AddLightweightNpc, AddSimpleNpc } from "types/zone2016packets";
 import { BaseSimpleNpc } from "./basesimplenpc";
-import { MAX_UINT32 } from "../../../utils/constants";
 
 function getDestroyedModels(actorModelId: ModelIds): number[] {
   switch (actorModelId) {
@@ -48,8 +47,8 @@ function getMaxHealth(actorModelId: ModelIds): number {
     case ModelIds.FENCES_WOOD_PLANKS_GREY_1X1:
     case ModelIds.FENCES_WOOD_PLANKS_GREY_POSTS_1X2:
     case ModelIds.FENCES_WOOD_PLANKS_GREY_GAP_1X1:
-      // temp hack so it can't be destroyed ( or you really wanted to )
-      return MAX_UINT32;
+    // temp hack so it can't be destroyed ( or you really wanted to )
+    // return MAX_UINT32;
     default:
       return 5000;
   }

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

@@ -118,6 +118,16 @@ function getContainerAndTime(entity: LootableProp) {
       entity.searchTime = 500;
       entity.lootSpawner = "Fridge";
       break;
+    case ModelIds.WASHER:
+      entity.containerId = Items.CONTAINER_WASHING_MACHINE;
+      entity.searchTime = 500;
+      entity.lootSpawner = "Washer";
+      break;
+    case ModelIds.DRYER:
+      entity.containerId = Items.CONTAINER_DRYER;
+      entity.searchTime = 500;
+      entity.lootSpawner = "Dryer";
+      break;
     case ModelIds.OTTOMAN_01:
     case ModelIds.OTTOMAN_02:
       entity.containerId = Items.CONTAINER_OTTOMAN;
@@ -181,16 +191,6 @@ function getContainerAndTime(entity: LootableProp) {
       entity.searchTime = 500;
       entity.lootSpawner = "Dresser";
       break;
-    case ModelIds.WASHER:
-      entity.containerId = Items.CONTAINER_WASHING_MACHINE;
-      entity.searchTime = 500;
-      entity.lootSpawner = "Washer_Dryer";
-      break;
-    case ModelIds.DRYER:
-      entity.containerId = Items.CONTAINER_DRYER;
-      entity.searchTime = 500;
-      entity.lootSpawner = "Washer_Dryer";
-      break;
     case ModelIds.FURNACE:
       entity.containerId = Items.CONTAINER_FURNACE;
       entity.searchTime = 0;