Merge branch 'release/0.29.8'

QuentinGruber · Dec 22, 2023 · 7059cf9 · 7059cf9
2 parents 8f4ee15 + 882afda
commit 7059cf9
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 32 deletions.
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.29.7",
+  "version": "0.29.8",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <[email protected]> (https://github.com/quentingruber)",
   "license": "GPL-3.0-only",
@@ -17,7 +17,7 @@
     "@types/node": "20.8.10",
     "debug": "4.3.4",
     "h1emu-core": "1.2.6",
-    "h1z1-dataschema": "1.7.0",
+    "h1z1-dataschema": "1.7.1",
     "js-yaml": "4.1.0",
     "mongodb": "6.2.0",
     "threads": "1.7.0",

diff --git a/src/packets/ClientProtocol/ClientProtocol_1080/h1emu.ts b/src/packets/ClientProtocol/ClientProtocol_1080/h1emu.ts
@@ -41,5 +41,33 @@ export const h1emuPackets: PacketStructures = [
     {
       fields: []
     }
+  ],
+  [
+    "H1emu.VoiceInit",
+    0x9904,
+    {
+      fields: []
+    }
+  ],
+  [
+    "H1emu.RequestModules",
+    0x9905,
+    {
+      fields: []
+    }
+  ],
+  [
+    "H1emu.RequestWindows",
+    0x9906,
+    {
+      fields: []
+    }
+  ],
+  [
+    "H1emu.VoiceState",
+    0x9907,
+    {
+      fields: [{ name: "message", type: "string", defaultValue: "" }]
+    }
   ]
 ];
diff --git a/src/packets/ClientProtocol/ClientProtocol_1080/items.ts b/src/packets/ClientProtocol/ClientProtocol_1080/items.ts
@@ -78,8 +78,28 @@ export const itemsPackets: PacketStructures = [
   ["Items.RemoveItemRentalTimer", 0xad0d, {}],
   ["Items.ExpireItemRentalTimer", 0xad0e, {}],
   ["Items.UseClientItem", 0xad0f, {}],
-  ["Items.SetAccountItemManager", 0xad10, {}],
-  ["Items.AddAccountItem", 0xad11, {}],
+  [
+    "Items.SetAccountItemManager",
+    0xad10,
+    {
+      fields: [
+        // Todo
+        { name: "unknowWord2", type: "uint32", defaultValue: 1 }
+      ]
+    }
+  ],
+  [
+    "Items.AddAccountItem",
+    0xad1100,
+    {
+      fields: [
+        { name: "itemId", type: "uint64", defaultValue: 0x3100000000000000n },
+        { name: "unknowWord2", type: "uint32", defaultValue: 1 },
+        { name: "unknowWord3", type: "uint32", defaultValue: 2 },
+        { name: "unknowWord4", type: "uint32", defaultValue: 3 } // count ?
+      ]
+    }
+  ],
   ["Items.RemoveAccountItem", 0xad12, {}],
   ["Items.UpdateAccountItem", 0xad13, {}],
   ["Items.SetEscrowAccountItemManager", 0xad14, {}],

diff --git a/src/packets/LoginUdp/LoginUdp_9/loginpackets.ts b/src/packets/LoginUdp/LoginUdp_9/loginpackets.ts
@@ -139,10 +139,10 @@ const packets: any[] = [
             { name: "serverTicket", type: "string" },
             { name: "encryptionKey", type: "byteswithlength" },
             { name: "guid", type: "int64string" },
-            { name: "unknownQword2", type: "int64string" },
-            { name: "stationName", type: "string" },
-            { name: "characterName", type: "string" },
-            { name: "unknownString", type: "string" }
+            { name: "unknownQword2", type: "int64string", defaultValue: "" },
+            { name: "stationName", type: "string", defaultValue: "" },
+            { name: "characterName", type: "string", defaultValue: "" },
+            { name: "unknownString", type: "string", defaultValue: "" }
           ]
         }
       ]

diff --git a/src/servers/ZoneServer2016/handlers/commands/commands.ts b/src/servers/ZoneServer2016/handlers/commands/commands.ts
@@ -1137,6 +1137,70 @@ export const commands: Array<Command> = [
       }
     }
   },
+  {
+    name: "listmodules",
+    permissionLevel: PermissionLevels.MODERATOR,
+    execute: async (
+      server: ZoneServer2016,
+      client: Client,
+      args: Array<string>
+    ) => {
+      if (!args[0]) {
+        server.sendChatText(
+          client,
+          `Correct usage: /listmodules {name | ZoneClientId}`
+        );
+        return;
+      }
+      const targetClient = server.getClientByNameOrLoginSession(
+        args[0].toString()
+      );
+      if (server.playerNotFound(client, args[0].toString(), targetClient)) {
+        return;
+      }
+      if (!targetClient || !(targetClient instanceof Client)) {
+        server.sendChatText(client, "Client not found.");
+        return;
+      }
+      server.sendChatText(
+        client,
+        `Requesting modules from: ${targetClient.character.name}`
+      );
+      server.sendData(client, "H1emu.RequestModules", {});
+    }
+  },
+  {
+    name: "listwindows",
+    permissionLevel: PermissionLevels.MODERATOR,
+    execute: async (
+      server: ZoneServer2016,
+      client: Client,
+      args: Array<string>
+    ) => {
+      if (!args[0]) {
+        server.sendChatText(
+          client,
+          `Correct usage: /listwindows {name | ZoneClientId}`
+        );
+        return;
+      }
+      const targetClient = server.getClientByNameOrLoginSession(
+        args[0].toString()
+      );
+      if (server.playerNotFound(client, args[0].toString(), targetClient)) {
+        return;
+      }
+      if (!targetClient || !(targetClient instanceof Client)) {
+        server.sendChatText(client, "Client not found.");
+        return;
+      }
+      server.sendChatText(
+        client,
+        `Requesting windows from: ${targetClient.character.name}`
+      );
+      server.sendData(client, "H1emu.RequestWindows", {});
+    }
+  },
   {
     name: "globalmute",
     permissionLevel: PermissionLevels.MODERATOR,

diff --git a/src/servers/ZoneServer2016/handlers/commands/dev.ts b/src/servers/ZoneServer2016/handlers/commands/dev.ts
@@ -17,7 +17,8 @@ import { h1z1PacketsType2016 } from "types/packets";
 import {
   CharacterManagedObject,
   CharacterPlayWorldCompositeEffect,
-  CharacterSeekTarget
+  CharacterSeekTarget,
+  ItemsAddAccountItem
 } from "types/zone2016packets";
 import { Npc } from "../../entities/npc";
 import { ZoneClient2016 as Client } from "../../classes/zoneclient";
@@ -51,6 +52,9 @@ const dev: any = {
       });
     }, 2000);
   },
+  acc: function (server: ZoneServer2016, client: Client, args: Array<string>) {
+    server.sendData<ItemsAddAccountItem>(client, "Items.AddAccountItem", {});
+  },
   ui: function (server: ZoneServer2016, client: Client, args: Array<string>) {
     server.sendData(client, "Effect.AddUiIndicator", {
       characterId: client.character.characterId,

diff --git a/src/servers/ZoneServer2016/zonepackethandlers.ts b/src/servers/ZoneServer2016/zonepackethandlers.ts
@@ -3353,6 +3353,9 @@ export class ZonePacketHandlers {
       case "01": // asset validator
         server.fairPlayManager.handleAssetCheck(server, client, data);
         break;
+      case "02": // client messages
+        server.sendChatTextToAdmins(`${client.character.name}: ${data}`);
+        break;
       default:
         console.log(
           `Unknown custom packet opcode: ${opcode} from ${client.loginSessionId}`

diff --git a/src/types/LoginUdp_9packets.ts b/src/types/LoginUdp_9packets.ts
@@ -55,10 +55,10 @@ export interface CharacterLoginReply {
   serverTicket: string;
   encryptionKey: unknown;
   guid: string;
-  unknownQword2: string;
-  stationName: string;
-  characterName: string;
-  unknownString: string;
+  unknownQword2?: string;
+  stationName?: string;
+  characterName?: string;
+  unknownString?: string;
 };
 }
 export interface CharacterDeleteRequest {

diff --git a/src/types/packets.ts b/src/types/packets.ts
diff --git a/src/types/zone2016packets.ts b/src/types/zone2016packets.ts