quake2ts 0.0.256 → 0.0.261

package/packages/client/dist/esm/index.js

@@ -8418,6 +8418,7 @@ var ClientCommand = /* @__PURE__ */ ((ClientCommand2) => {
   ClientCommand2[ClientCommand2["stringcmd"] = 4] = "stringcmd";
   return ClientCommand2;
 })(ClientCommand || {});
+var CMD_BACKUP = 64;
 var MZ_BLASTER = 0;
 var MZ_MACHINEGUN = 1;
 var MZ_SHOTGUN = 2;
@@ -8573,7 +8574,16 @@ var POWERUP_STAT_MAP = {
     "enviro_suit"
     /* EnviroSuit */
   ]: 9,
-  // 10 is POWERUP_ADRENALINE (not in PowerupId?)
+  [
+    "bandolier"
+    /* Bandolier */
+  ]: 10,
+  // Placeholder/Map mismatch handling?
+  [
+    "ammo_pack"
+    /* AmmoPack */
+  ]: 10,
+  // Original reused indices or had gaps?
   [
     "ir_goggles"
     /* IRGoggles */
@@ -8621,7 +8631,12 @@ var POWERUP_STAT_MAP = {
   [
     "tech_regeneration"
     /* TechRegeneration */
-  ]: 22
+  ]: 22,
+  // Add missing mappings to avoid runtime lookups failing for new types
+  [
+    "tag_token"
+    /* TagToken */
+  ]: -1
 };
 function G_GetPowerupStat(stats, powerupId) {
   let index;
@@ -8633,6 +8648,18 @@ function G_GetPowerupStat(stats, powerupId) {
   if (index === void 0 || index < 0 || index >= POWERUP_MAX2) return 0;
   return getCompressedInteger(stats, 41, index, NUM_BITS_FOR_POWERUP2);
 }
+function writeUserCommand(writer, cmd) {
+  writer.writeByte(cmd.msec);
+  writer.writeByte(cmd.buttons);
+  writer.writeAngle16(cmd.angles.x);
+  writer.writeAngle16(cmd.angles.y);
+  writer.writeAngle16(cmd.angles.z);
+  writer.writeShort(cmd.forwardmove);
+  writer.writeShort(cmd.sidemove);
+  writer.writeShort(cmd.upmove);
+  writer.writeByte(0);
+  writer.writeByte(0);
+}
 var entityFlags_exports2 = {};
 __export3(entityFlags_exports2, {
   U_ANGLE1: () => U_ANGLE13,
@@ -8791,6 +8818,108 @@ var BinaryStream2 = class {
     out.z = norm[2];
   }
 };
+var BinaryWriter = class {
+  constructor(sizeOrBuffer = 1400) {
+    if (typeof sizeOrBuffer === "number") {
+      this.buffer = new Uint8Array(sizeOrBuffer);
+      this.fixed = false;
+    } else {
+      this.buffer = sizeOrBuffer;
+      this.fixed = true;
+    }
+    this.view = new DataView(this.buffer.buffer, this.buffer.byteOffset, this.buffer.byteLength);
+    this.offset = 0;
+  }
+  ensureSpace(bytes) {
+    if (this.offset + bytes > this.buffer.byteLength) {
+      if (this.fixed) {
+        throw new Error(`Buffer overflow: capacity ${this.buffer.byteLength}, needed ${this.offset + bytes}`);
+      }
+      const newSize = Math.max(this.buffer.byteLength * 2, this.offset + bytes);
+      const newBuffer = new Uint8Array(newSize);
+      newBuffer.set(this.buffer);
+      this.buffer = newBuffer;
+      this.view = new DataView(this.buffer.buffer, this.buffer.byteOffset, this.buffer.byteLength);
+    }
+  }
+  writeByte(value) {
+    this.ensureSpace(1);
+    this.view.setUint8(this.offset, value);
+    this.offset += 1;
+  }
+  writeChar(value) {
+    this.ensureSpace(1);
+    this.view.setInt8(this.offset, value);
+    this.offset += 1;
+  }
+  writeShort(value) {
+    this.ensureSpace(2);
+    this.view.setInt16(this.offset, value, true);
+    this.offset += 2;
+  }
+  writeLong(value) {
+    this.ensureSpace(4);
+    this.view.setInt32(this.offset, value, true);
+    this.offset += 4;
+  }
+  writeFloat(value) {
+    this.ensureSpace(4);
+    this.view.setFloat32(this.offset, value, true);
+    this.offset += 4;
+  }
+  writeString(value) {
+    const len2 = value.length;
+    this.ensureSpace(len2 + 1);
+    for (let i = 0; i < len2; i++) {
+      this.view.setUint8(this.offset + i, value.charCodeAt(i));
+    }
+    this.view.setUint8(this.offset + len2, 0);
+    this.offset += len2 + 1;
+  }
+  writeCoord(value) {
+    this.writeShort(Math.trunc(value * 8));
+  }
+  writeAngle(value) {
+    this.writeByte(Math.trunc(value * 256 / 360) & 255);
+  }
+  writeAngle16(value) {
+    this.writeShort(Math.trunc(value * 65536 / 360) & 65535);
+  }
+  writePos(pos) {
+    this.writeCoord(pos.x);
+    this.writeCoord(pos.y);
+    this.writeCoord(pos.z);
+  }
+  writeDir(dir) {
+    let maxDot = -1;
+    let bestIndex = 0;
+    if (dir.x === 0 && dir.y === 0 && dir.z === 0) {
+      this.writeByte(0);
+      return;
+    }
+    for (let i = 0; i < ANORMS2.length; i++) {
+      const norm = ANORMS2[i];
+      const dot2 = dir.x * norm[0] + dir.y * norm[1] + dir.z * norm[2];
+      if (dot2 > maxDot) {
+        maxDot = dot2;
+        bestIndex = i;
+      }
+    }
+    this.writeByte(bestIndex);
+  }
+  getData() {
+    return this.buffer.slice(0, this.offset);
+  }
+  getBuffer() {
+    return this.buffer;
+  }
+  getOffset() {
+    return this.offset;
+  }
+  reset() {
+    this.offset = 0;
+  }
+};
 var NetworkMessageBuilder = class {
   constructor(initialSize = 1024) {
     this.buffer = new Uint8Array(initialSize);
@@ -9132,7 +9261,7 @@ var Cycle_Crosshair = () => {
 };
 
 // src/hud/icons.ts
-import { WEAPON_ITEMS } from "@quake2ts/game";
+import { WEAPON_ITEMS, KeyId } from "@quake2ts/game";
 var iconPics = /* @__PURE__ */ new Map();
 var ICON_NAMES = [
   // Weapons
@@ -9234,7 +9363,7 @@ var Init_Hud = async (renderer, assets) => {
 import { defaultPredictionState, interpolatePredictionState } from "@quake2ts/cgame";
 
 // src/demo/itemMapping.ts
-import { WeaponId, PowerupId as PowerupId3, KeyId } from "@quake2ts/game";
+import { WeaponId, PowerupId as PowerupId3, KeyId as KeyId2 } from "@quake2ts/game";
 import { AmmoType as AmmoType3 } from "@quake2ts/game";
 import { ArmorType } from "@quake2ts/game";
 var DEMO_ITEM_MAPPING = [
@@ -9360,35 +9489,35 @@ var DEMO_ITEM_MAPPING = [
   { type: "powerup", id: PowerupId3.TagToken },
   // IT_ITEM_TAG_TOKEN
   // Keys
-  { type: "key", id: KeyId.DataCD },
+  { type: "key", id: KeyId2.DataCD },
   // IT_KEY_DATA_CD
-  { type: "key", id: KeyId.PowerCube },
+  { type: "key", id: KeyId2.PowerCube },
   // IT_KEY_POWER_CUBE
-  { type: "key", id: KeyId.ExplosiveCharges },
+  { type: "key", id: KeyId2.ExplosiveCharges },
   // IT_KEY_EXPLOSIVE_CHARGES
-  { type: "key", id: KeyId.Yellow },
+  { type: "key", id: KeyId2.Yellow },
   // IT_KEY_YELLOW
-  { type: "key", id: KeyId.PowerCore },
+  { type: "key", id: KeyId2.PowerCore },
   // IT_KEY_POWER_CORE
-  { type: "key", id: KeyId.Pyramid },
+  { type: "key", id: KeyId2.Pyramid },
   // IT_KEY_PYRAMID
-  { type: "key", id: KeyId.DataSpinner },
+  { type: "key", id: KeyId2.DataSpinner },
   // IT_KEY_DATA_SPINNER
-  { type: "key", id: KeyId.Pass },
+  { type: "key", id: KeyId2.Pass },
   // IT_KEY_PASS
-  { type: "key", id: KeyId.Blue },
+  { type: "key", id: KeyId2.Blue },
   // IT_KEY_BLUE_KEY
-  { type: "key", id: KeyId.Red },
+  { type: "key", id: KeyId2.Red },
   // IT_KEY_RED_KEY
-  { type: "key", id: KeyId.Green },
+  { type: "key", id: KeyId2.Green },
   // IT_KEY_GREEN_KEY
-  { type: "key", id: KeyId.CommanderHead },
+  { type: "key", id: KeyId2.CommanderHead },
   // IT_KEY_COMMANDER_HEAD
-  { type: "key", id: KeyId.Airstrike },
+  { type: "key", id: KeyId2.Airstrike },
   // IT_KEY_AIRSTRIKE
-  { type: "key", id: KeyId.NukeContainer },
+  { type: "key", id: KeyId2.NukeContainer },
   // IT_KEY_NUKE_CONTAINER
-  { type: "key", id: KeyId.Nuke },
+  { type: "key", id: KeyId2.Nuke },
   // IT_KEY_NUKE
   // Health
   { type: "health", id: "health_small" },
@@ -9400,9 +9529,9 @@ var DEMO_ITEM_MAPPING = [
   { type: "health", id: "health_mega" },
   // IT_HEALTH_MEGA
   // CTF
-  { type: "key", id: KeyId.RedFlag },
+  { type: "key", id: KeyId2.RedFlag },
   // IT_FLAG1
-  { type: "key", id: KeyId.BlueFlag },
+  { type: "key", id: KeyId2.BlueFlag },
   // IT_FLAG2
   // Tech
   { type: "powerup", id: PowerupId3.TechResistance },
@@ -10866,6 +10995,8 @@ var MultiplayerConnection = class {
     this.challenge = 0;
     this.connectPacketCount = 0;
     this.connectPacketTime = 0;
+    this.latestServerFrame = 0;
+    this.commandHistory = [];
     this.driver = new BrowserWebSocketNetDriver();
     this.options = options;
     this.driver.onMessage((data) => this.handleMessage(data));
@@ -10895,12 +11026,27 @@ var MultiplayerConnection = class {
     this.state = 0 /* Disconnected */;
     this.configStrings.clear();
     this.baselines.clear();
+    this.commandHistory = [];
+    this.latestServerFrame = 0;
   }
   sendCommand(cmd) {
     if (this.state !== 5 /* Active */) return;
-    const builder = new NetworkMessageBuilder();
-    builder.writeByte(ClientCommand.nop);
-    this.driver.send(builder.getData());
+    const commandWithFrame = {
+      ...cmd,
+      serverFrame: cmd.serverFrame ?? this.latestServerFrame
+    };
+    this.commandHistory.push(commandWithFrame);
+    if (this.commandHistory.length > CMD_BACKUP) {
+      this.commandHistory.shift();
+    }
+    const writer = new BinaryWriter();
+    writer.writeLong(0);
+    writer.writeLong(0);
+    writer.writeByte(ClientCommand.move);
+    writer.writeByte(0);
+    writer.writeLong(this.latestServerFrame);
+    writeUserCommand(writer, commandWithFrame);
+    this.driver.send(writer.getData());
   }
   handleMessage(data) {
     let buffer = data.buffer;
@@ -10979,9 +11125,12 @@ var MultiplayerConnection = class {
     this.driver.send(builder.getData());
     this.state = 5 /* Active */;
   }
-  // Stubs for other handlers
   onFrame(frame) {
+    if (frame.serverFrame > this.latestServerFrame) {
+      this.latestServerFrame = frame.serverFrame;
+    }
   }
+  // Stubs for other handlers
   onCenterPrint(msg) {
   }
   onPrint(level, msg) {