h1z1-server 0.22.1-0 → 0.22.2-0

package/.prettierignore

@@ -0,0 +1 @@
+src/types/**/*

package/data/2016/dataSources/ServerItemDefinitions.json

@@ -143493,6 +143493,7 @@
         "PICKUP_EFFECT": 5153
     },
     "3445": {
+        "NAME": "Frostbite",
         "ID": 3445,
         "CODE_FACTORY_NAME": "Weapon",
         "NAME_ID": 14139,
@@ -143568,6 +143569,7 @@
         "PICKUP_EFFECT": 5157
     },
     "3446": {
+        "NAME": "Blaze",
         "ID": 3446,
         "CODE_FACTORY_NAME": "Weapon",
         "NAME_ID": 14141,
@@ -143716,6 +143718,7 @@
         "SCRAP_VALUE_OVERRIDE": 5
     },
     "3448": {
+        "NAME": "Nagafen's Rage",
         "ID": 3448,
         "CODE_FACTORY_NAME": "Weapon",
         "NAME_ID": 14145,
@@ -143791,6 +143794,7 @@
         "PICKUP_EFFECT": 5157
     },
     "3449": {
+        "NAME": "Purge",
         "ID": 3449,
         "CODE_FACTORY_NAME": "Weapon",
         "NAME_ID": 14147,
@@ -143866,6 +143870,7 @@
         "PICKUP_EFFECT": 5156
     },
     "3450": {
+        "NAME": "Reaper",   
         "ID": 3450,
         "CODE_FACTORY_NAME": "Weapon",
         "NAME_ID": 14154,
@@ -143880,7 +143885,7 @@
         "PROFILE_OVERRIDE": 0,
         "NO_TRADE": 0,
         "SINGLE_USE": 0,
-        "MODEL_NAME": "",
+        "MODEL_NAME": "Weapon_M24_3P.adr",
         "GENDER_USAGE": 0,
         "TEXTURE_ALIAS": "",
         "SHADER_PARAMETER_GROUP_ID": 0,
@@ -144163,6 +144168,7 @@
         "WORLD_MODEL_ID": 9952
     },
     "3455": {
+        "NAME": "Prototype Mechanism",
         "ID": 3455,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 14160,
@@ -144237,6 +144243,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3456": {
+        "NAME": "Prototype Trigger Assembly",
         "ID": 3456,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 14162,
@@ -144311,6 +144318,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3457": {
+        "NAME": "Prototype Receiver",
         "ID": 3457,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 14164,
@@ -144385,6 +144393,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3458": {
+        "NAME": "Hotwire",
         "ID": 3458,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 14166,
@@ -144459,6 +144468,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3459": {
+        "NAME": "Hotwire",
         "ID": 3459,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 14166,
@@ -144533,6 +144543,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3460": {
+        "NAME": "Vehicle Key",
         "ID": 3460,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 14018,
@@ -167350,6 +167361,7 @@
         "SCRAP_VALUE_OVERRIDE": 200
     },
     "3775": {
+        "NAME": "Plastic Shard",
         "ID": 3775,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 15140,
@@ -167424,6 +167436,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3777": {
+        "NAME": "Weapon Workbench",
         "ID": 3777,
         "CODE_FACTORY_NAME": "EquippableContainer",
         "NAME_ID": 15145,
@@ -167497,6 +167510,7 @@
         "SCRAP_VALUE_OVERRIDE": 0
     },
     "3778": {
+        "NAME": "Weapon Workbench",
         "ID": 3778,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 15145,
@@ -167571,6 +167585,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3779": {
+        "NAME": "Lead Alloy",
         "ID": 3779,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 15148,
@@ -167645,6 +167660,7 @@
         "PICKUP_EFFECT": 5151
     },
     "3780": {
+        "NAME": "Brass Shard",
         "ID": 3780,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 15150,
@@ -169338,6 +169354,7 @@
         "SCRAP_VALUE_OVERRIDE": 200
     },
     "3805": {
+        "NAME": "Refined Gunpowder",
         "ID": 3805,
         "CODE_FACTORY_NAME": "Generic",
         "NAME_ID": 15614,

package/data/defaultDatabase/shared/servers.json

@@ -14,6 +14,8 @@
         "populationData": "<Population ServerCapacity=\"0\" PingAddress=\"127.0.0.1:1117\" Rulesets=\"PvE\"><factionlist IsList=\"1\"><faction Id=\"1\" Percent=\"0\" TargetPopPct=\"0\" RewardBuff=\"52\" XPBuff=\"52\" PercentAvg=\"0\"/><faction Id=\"2\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"0\"/><faction Id=\"3\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"1\"/></factionlist></Population>",
         "allowedAccess": false,
         "populationNumber": 0,
+        "maxPopulationNumber": 100,
+        "gameVersion": 1,
         "serverVersionTag": "2015"
       },
       {
@@ -31,6 +33,27 @@
         "populationData": "<Population ServerCapacity=\"0\" PingAddress=\"127.0.0.1:1117\" Rulesets=\"PvE\"><factionlist IsList=\"1\"><faction Id=\"1\" Percent=\"0\" TargetPopPct=\"0\" RewardBuff=\"52\" XPBuff=\"52\" PercentAvg=\"0\"/><faction Id=\"2\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"0\"/><faction Id=\"3\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"1\"/></factionlist></Population>",
         "allowedAccess": true,
         "populationNumber": 0,
+        "maxPopulationNumber": 100,
+        "gameVersion": 2,
         "serverVersionTag": "2016"
+      },
+      {
+        "serverId": 3,
+        "serverState": 2,
+        "serverAddress": "localhost:1117",
+        "locked": false,
+        "name": "",
+        "nameId": 193,
+        "description": "",
+        "descriptionId": 193,
+        "reqFeatureId": 0,
+        "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
+        "populationLevel": 0,
+        "populationData": "<Population PctCap=\"0\" PingAdr=\"127.0.0.1:1117\" Rulesets=\"\" Mode=\"0\" IsLogin=\"1\" IsWL=\"0\" IsEvt=\"0\" PL=\"0\" DC=\"LVS\" PopLock=\"0\" GP=\"100\" BP=\"175\" MaxPop=\"4000\" Subregion=\"US\"><Fac IsList=\"1\"/></Population>",
+        "allowedAccess": true,
+        "populationNumber": 0,
+        "maxPopulationNumber": 100,
+        "gameVersion": 3,
+        "serverVersionTag": "KOTK"
       }
 ]

package/data/kotk/sampleData/single_player_server.json

@@ -0,0 +1,19 @@
+{
+  "serverId": 1,
+  "serverState": 2,
+  "serverAddress": "localhost:1117",
+  "locked": false,
+  "name": "",
+  "nameId": 193,
+  "description": "",
+  "descriptionId": 193,
+  "reqFeatureId": 0,
+  "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
+  "populationLevel": 0,
+  "populationData": "<Population PctCap=\"0\" PingAdr=\"127.0.0.1:1117\" Rulesets=\"\" Mode=\"0\" IsLogin=\"1\" IsWL=\"0\" IsEvt=\"0\" PL=\"0\" DC=\"LVS\" PopLock=\"0\" GP=\"100\" BP=\"175\" MaxPop=\"4000\" Subregion=\"US\"><Fac IsList=\"1\"/></Population>",
+  "allowedAccess": true,
+  "populationNumber": 0,
+  "maxPopulationNumber": 100,
+  "gameVersion": 3,
+  "serverVersionTag": "KOTK"
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "h1z1-server",
-  "version": "0.22.1-0",
+  "version": "0.22.2-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.16.0 <19"
+    "node": ">=0.16.0 <20"
   },
   "bin": {
     "h1z1-server-demo": "scripts/h1z1-server-demo.js",
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "debug": "4.3.4",
-    "h1emu-core": "0.9.3",
-    "h1z1-dataschema": "1.5.12",
+    "h1emu-core": "1.0.0",
+    "h1z1-dataschema": "1.7.0",
     "mongodb": "4.7.0",
     "typescript": "4.7.2"
   },
@@ -32,9 +32,9 @@
     "typedoc": "0.23.15"
   },
   "scripts": {
-    "gen-packets-types": "npx ts-node ./scripts/genPacketsNames.ts && npx prettier -w ./src/types/packets.ts",
+    "gen-packets-types": "npx ts-node ./scripts/genPacketsNames.ts",
     "gen-model-textures": "npx ts-node ./scripts/genModelTextures.ts",
-    "gen-packets-interfaces": "npx ts-node ./scripts/genPacketsInterfaces.ts",
+    "gen-packets-interfaces": "npx ts-node ./scripts/genPacketsInterfaces.ts ",
     "fix-signatures": "npx ts-node ./scripts/fixSignatures.ts && npm run prettier_sources",
     "gen-doc": "npx typedoc",
     "lint": "npx eslint src",
@@ -61,6 +61,7 @@
     "postinstall": "npm run build",
     "publish_release": "git push --tags && git push origin dev && git push origin master && git checkout dev && npm run publish_release-next",
     "publish_release-next": "npm version prerelease && git add * && git commit -m 'publish-a-next-version' && npm publish --tag next && git push origin dev",
+    "check_prettier": "prettier --check ./src && prettier --check ./tests && prettier --check ./benchmarks",
     "prettier_sources": "prettier --write ./src && prettier --write ./tests && prettier --write ./benchmarks"
   },
   "repository": {

package/scripts/demo/ZoneServer2016.js

@@ -1,4 +1,3 @@
-process.env.DEBUG = "ZoneServer";
 const H1Z1servers = require("../../h1z1-server");
 var Zone = new H1Z1servers.ZoneServer2016(
   1117,

package/scripts/demo/loginserver2016.js

@@ -1,4 +1,3 @@
-process.env.DEBUG = "*";
 const H1Z1servers = require("../../h1z1-server");
 var server = new H1Z1servers.LoginServer(
   1115, // <- server port

package/scripts/genPacketsInterfaces.ts

@@ -23,13 +23,12 @@ const typeMap: Record<string, string> = {
   array8: "any[]",
   int64string: "string",
   uint64string: "string",
-  floatvector3: "number[]",
-  floatvector4: "number[]",
+  floatvector3: "Float32Array",
+  floatvector4: "Float32Array",
   byteswithlength: "any", // todo
   string: "string",
   boolean: "boolean",
 };
-
 function getSchemaBody(schema: any) {
   let bodyInterfaceString = "";
   schema.forEach((element: any) => {
@@ -51,7 +50,7 @@ function getSchemaBody(schema: any) {
 }
 
 function writeInterface(packets: any, name: string) {
-  let packetsInterfaces = "";
+  let packetsInterfaces = "/* prettier-ignore */ \n";
   const packetsIntercacesNames:string[] = []
   Object.values(packets).forEach((packet: any) => {
     const { schema } = packet;

package/scripts/genPacketsNames.ts

@@ -10,6 +10,12 @@ const packetsFiles: any = {
     ...Object.keys(h1z1packets2015.PacketTypes),
     ...Object.keys(h1z1packets2016.PacketTypes),
   ],
+  h1z1PacketsType2015: [
+    ...Object.keys(h1z1packets2015.PacketTypes),
+  ],
+  h1z1PacketsType2016: [
+    ...Object.keys(h1z1packets2016.PacketTypes),
+  ],
   loginPacketsType: [
     ...Object.keys(loginpackets2015.PacketTypes),
     ...Object.keys(loginpackets2016.PacketTypes),
@@ -17,7 +23,7 @@ const packetsFiles: any = {
 };
 
 const typePath: string = "./src/types/packets.ts";
-let steamString = ""; // should use a streamWriter but i'm lazy
+let steamString = "/* prettier-ignore */ \n"; // should use a streamWriter but i'm lazy
 Object.keys(packetsFiles).forEach((packetsFileName) => {
   const packetsFile: string[] = packetsFiles[packetsFileName];
   steamString += `export type ${packetsFileName} = `;