Merge branch 'release/0.32.1'

QuentinGruber · Feb 3, 2024 · a7f954e · a7f954e
2 parents 397a0b3 + 8004b18
commit a7f954e
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 102 deletions.
diff --git a/data/2016/dataSources/ServerItemDefinitions.json b/data/2016/dataSources/ServerItemDefinitions.json
@@ -56176,7 +56176,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2207": {
@@ -56252,7 +56251,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2208": {
@@ -56328,7 +56326,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2209": {
@@ -56404,7 +56401,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2210": {
@@ -61521,7 +61517,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2282": {
@@ -61597,7 +61592,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2283": {
@@ -85289,7 +85283,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2614": {
@@ -85515,7 +85508,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2617": {
@@ -85666,7 +85658,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2619": {
@@ -85742,7 +85733,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2620": {
@@ -85818,7 +85808,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2621": {
@@ -85894,7 +85883,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "2631": {
@@ -124629,7 +124617,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3181": {
@@ -137801,7 +137788,6 @@
         "SCRAP_VALUE_OVERRIDE": 5
     },
     "3358": {
-        "NAME": "Challenger's Hardcore Boots",
         "ID": 3358,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 13948,
@@ -137873,7 +137859,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3359": {
@@ -145168,7 +145153,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3467": {
@@ -147100,7 +147084,6 @@
         "SCRAP_VALUE_OVERRIDE": 1000
     },
     "3493": {
-        "NAME": "Tech Combat Boots",
         "ID": 3493,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 14246,
@@ -147172,7 +147155,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3494": {
@@ -151350,7 +151332,6 @@
         "PICKUP_EFFECT": 5153
     },
     "3552": {
-        "NAME": "Red Bone Work Boots",
         "ID": 3552,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 14657,
@@ -151422,7 +151403,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3553": {
@@ -157844,7 +157824,6 @@
         "PICKUP_EFFECT": 5148
     },
     "3641": {
-        "NAME": "Desert Warfare Work Boots",
         "ID": 3641,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 14965,
@@ -157916,7 +157895,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3642": {
@@ -163980,7 +163958,6 @@
         "PICKUP_EFFECT": 5148
     },
     "3725": {
-        "NAME": "Arachnid Combat Boots",
         "ID": 3725,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 15053,
@@ -164052,7 +164029,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3726": {
@@ -176679,7 +176655,6 @@
         "PICKUP_EFFECT": 5148
     },
     "3983": {
-        "NAME": "Eagle Crest Combat Boots",
         "ID": 3983,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 15988,
@@ -176751,11 +176726,9 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3984": {
-        "NAME": "Snakeskin Work Boots",
         "ID": 3984,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 15989,
@@ -176827,11 +176800,9 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3985": {
-        "NAME": "Brown Leather Combat Boots",
         "ID": 3985,
         "CODE_FACTORY_NAME": "InfantryEquipment",
         "NAME_ID": 15990,
@@ -176903,7 +176874,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 9429,
         "PICKUP_EFFECT": 5148
     },
     "3986": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <[email protected]> (https://github.com/quentingruber)",
   "license": "GPL-3.0-only",

diff --git a/src/servers/ZoneServer2016/data/loadouts.ts b/src/servers/ZoneServer2016/data/loadouts.ts
@@ -28,7 +28,6 @@ export const characterDefaultLoadout = [
   { item: Items.PANTS_DEFAULT },
   { item: Items.SKINNING_KNIFE },
 
-  { item: Items.BOOTS_GRAY_BLUE },
   { item: Items.MAP },
   { item: Items.COMPASS_IMPROVISED },
   { item: Items.GAUZE, count: 5 }

diff --git a/src/servers/ZoneServer2016/entities/basefullcharacter.ts b/src/servers/ZoneServer2016/entities/basefullcharacter.ts
@@ -180,7 +180,7 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
     const client = server.getClientByContainerAccessor(this);
     if (client) {
       if (!client.character.initialized) return;
-      server.checkShoes(client);
+      server.checkConveys(client);
     }
     server.sendDataToAllWithSpawnedEntity(
       server._characters,
@@ -1083,9 +1083,6 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
       case server.isHelmet(item.itemDefinitionId):
         durability = 100;
         break;
-      case server.isConvey(item.itemDefinitionId):
-        durability = 5400;
-        break;
     }
     return {
       itemDefinitionId: item.itemDefinitionId,

diff --git a/src/servers/ZoneServer2016/entities/character.ts b/src/servers/ZoneServer2016/entities/character.ts
@@ -156,7 +156,6 @@ export class Character2016 extends BaseFullCharacter {
   ) => void;
   timeouts: any;
   hasConveys: boolean = false;
-  hasBoots: boolean = false;
   positionUpdate?: positionUpdate;
   tempGodMode = false;
   isVanished = false;
@@ -675,7 +674,7 @@ export class Character2016 extends BaseFullCharacter {
   updateLoadout(server: ZoneServer2016, sendPacketToLocalClient = true) {
     const client = server.getClientByContainerAccessor(this);
     if (!client || !client.character.initialized) return;
-    server.checkShoes(client);
+    server.checkConveys(client);
     if (sendPacketToLocalClient) {
       server.sendData(
         client,
@@ -1378,9 +1377,6 @@ export class Character2016 extends BaseFullCharacter {
       case server.isHelmet(item.itemDefinitionId):
         durability = 100;
         break;
-      case server.isConvey(item.itemDefinitionId):
-        durability = 5400;
-        break;
     }
     return {
       itemDefinitionId: item.itemDefinitionId,

diff --git a/src/servers/ZoneServer2016/entities/vehicle.ts b/src/servers/ZoneServer2016/entities/vehicle.ts
@@ -579,7 +579,7 @@ export class Vehicle2016 extends BaseLootableEntity {
     const client = server.getClientByCharId(this.characterId);
     if (client) {
       if (!client.character.initialized) return;
-      server.checkShoes(client);
+      server.checkConveys(client);
     }
     server.sendDataToAllWithSpawnedEntity(
       server._vehicles,
@@ -1093,9 +1093,6 @@ export class Vehicle2016 extends BaseLootableEntity {
       case server.isHelmet(item.itemDefinitionId):
         durability = 100;
         break;
-      case server.isConvey(item.itemDefinitionId):
-        durability = 5400;
-        break;
     }
     return {
       itemDefinitionId: item.itemDefinitionId,

diff --git a/src/servers/ZoneServer2016/managers/worldobjectmanager.ts b/src/servers/ZoneServer2016/managers/worldobjectmanager.ts
@@ -52,8 +52,7 @@ import {
   Skins_AR15,
   Skins_TacticalHelmet,
   Skins_Respirator,
-  Skins_Bandana,
-  Skins_Boots
+  Skins_Bandana
 } from "../models/enums";
 import { Vehicle2016 } from "../entities/vehicle";
 import { LootDefinition } from "types/zoneserver";
@@ -109,9 +108,6 @@ function getRandomSkin(itemDefinitionId: number) {
     case Items.CONVEYS_BLUE:
       arr = Object.keys(Skins_Conveys);
       break;
-    case Items.BOOTS_TAN:
-      arr = Object.keys(Skins_Boots);
-      break;
     case Items.WEAPON_308:
       arr = Object.keys(Skins_Sniper);
       break;

diff --git a/src/servers/ZoneServer2016/models/enums.ts b/src/servers/ZoneServer2016/models/enums.ts
@@ -201,8 +201,7 @@ export enum MovementModifiers {
   RESTED = 1.11,
   SWIZZLE = 1.1,
   SNARED = 0.5,
-  CONVEYS = 1.15,
-  BOOTS = 1.07
+  BOOTS = 1.15
 }
 
 export enum ContainerErrors {
@@ -697,8 +696,6 @@ export enum Items {
   CONVEYS_NEKOCHAN = 3404,
   CONVEYS_ELLOHIME = 3574,
   HAT_BEANIE = 2162,
-  BOOTS_TAN = 2207,
-  BOOTS_GRAY_BLUE = 2209,
   SUGAR = 57,
   BATTERY = 1696,
   SPARKPLUGS = 1701,
@@ -1099,21 +1096,6 @@ export enum Skins_Conveys {
   CONVEYS_NEKOCHAN = 3404,
   CONVEYS_ELLOHIME = 3574
 }
-export enum Skins_Boots {
-  BOOTS_TAN = 2207
-  /*BOOTS_BROWN = 2206,
-  BOOTS_GRAY = 2208,
-  BOOTS_GRAY_BLUE = 2209,
-  BOOTS_GREEN_SPLATTER = 2281,
-  BOOTS_CHEETAH_CAMO = 2282,
-  BOOTS_TAN_GHILLE = 2613,
-  BOOTS_WOODLAND_GHILLE = 2616,
-  BOOTS_TEAL_COMBAT = 2618,
-  BOOTS_HAPPY_FACE = 2619,
-  BOOTS_PATRIOTIC = 2620,
-  BOOTS_PURPLE = 2621,
-  BOOTS_HEAVY_ASSAULT = 3180*/
-}
 export enum Skins_Sniper {
   DEFAULT_SNIPER = 1373
   /*BLACK_SNIPER = 2900,