quake2ts 0.0.297 → 0.0.299

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

@@ -8738,15 +8738,15 @@ var PmFlag = /* @__PURE__ */ ((PmFlag22) => {
 function hasPmFlag(flags, flag) {
   return (flags & flag) !== 0;
 }
-var PlayerButton = /* @__PURE__ */ ((PlayerButton2) => {
-  PlayerButton2[PlayerButton2["None"] = 0] = "None";
-  PlayerButton2[PlayerButton2["Attack"] = 1] = "Attack";
-  PlayerButton2[PlayerButton2["Use"] = 2] = "Use";
-  PlayerButton2[PlayerButton2["Holster"] = 4] = "Holster";
-  PlayerButton2[PlayerButton2["Jump"] = 8] = "Jump";
-  PlayerButton2[PlayerButton2["Crouch"] = 16] = "Crouch";
-  PlayerButton2[PlayerButton2["Any"] = 128] = "Any";
-  return PlayerButton2;
+var PlayerButton = /* @__PURE__ */ ((PlayerButton3) => {
+  PlayerButton3[PlayerButton3["None"] = 0] = "None";
+  PlayerButton3[PlayerButton3["Attack"] = 1] = "Attack";
+  PlayerButton3[PlayerButton3["Use"] = 2] = "Use";
+  PlayerButton3[PlayerButton3["Holster"] = 4] = "Holster";
+  PlayerButton3[PlayerButton3["Jump"] = 8] = "Jump";
+  PlayerButton3[PlayerButton3["Crouch"] = 16] = "Crouch";
+  PlayerButton3[PlayerButton3["Any"] = 128] = "Any";
+  return PlayerButton3;
 })(PlayerButton || {});
 var WATERJUMP_CLEAR2 = 8 | 16 | 32 | 1024;
 var DEFAULT_FORWARD_SPEED = 200;
@@ -9623,7 +9623,7 @@ var AmmoType2 = /* @__PURE__ */ ((AmmoType22) => {
 var AMMO_TYPE_COUNT2 = Object.keys(AmmoType2).length / 2;
 
 // src/index.ts
-import { ClientPrediction, interpolatePredictionState as interpolatePredictionState2, GetCGameAPI } from "@quake2ts/cgame";
+import { ClientPrediction as ClientPrediction2, interpolatePredictionState as interpolatePredictionState2, GetCGameAPI } from "@quake2ts/cgame";
 import { ViewEffects as ViewEffects2 } from "@quake2ts/cgame";
 
 // src/cgameBridge.ts
@@ -9674,6 +9674,24 @@ function createCGameImport(imports, state) {
         flags
       });
     },
+    Cvar_Get: (name, value, flags) => {
+      if (!imports.host || !imports.host.cvars) {
+        return { value: parseInt(value) || 0 };
+      }
+      let existing = imports.host.cvars.get(name);
+      if (!existing) {
+        existing = imports.host.cvars.register({
+          name,
+          defaultValue: value,
+          flags
+        });
+      }
+      return {
+        get value() {
+          return existing.number;
+        }
+      };
+    },
     cvar_set: (name, value) => {
       imports.host?.cvars?.setValue(name, value);
     },
@@ -11611,6 +11629,7 @@ var BrowserWebSocketNetDriver = class {
 };
 
 // src/net/connection.ts
+import { defaultPredictionState as defaultPredictionState2 } from "@quake2ts/cgame";
 var MultiplayerConnection = class {
   constructor(options) {
     this.state = 0 /* Disconnected */;
@@ -11628,6 +11647,8 @@ var MultiplayerConnection = class {
     this.connectPacketTime = 0;
     this.latestServerFrame = 0;
     this.commandHistory = [];
+    // Prediction
+    this.prediction = null;
     this.driver = new BrowserWebSocketNetDriver();
     this.options = options;
     this.netchan = new NetChan();
@@ -11635,6 +11656,9 @@ var MultiplayerConnection = class {
     this.driver.onClose(() => this.handleDisconnect());
     this.driver.onError((err2) => console.error("Network Error:", err2));
   }
+  setPrediction(prediction) {
+    this.prediction = prediction;
+  }
   async connect(url) {
     if (this.state !== 0 /* Disconnected */) {
       this.disconnect();
@@ -11672,6 +11696,9 @@ var MultiplayerConnection = class {
     if (this.commandHistory.length > CMD_BACKUP) {
       this.commandHistory.shift();
     }
+    if (this.prediction) {
+      this.prediction.enqueueCommand(commandWithFrame);
+    }
     const writer = new BinaryWriter2();
     writer.writeByte(ClientCommand.move);
     writer.writeByte(0);
@@ -11769,6 +11796,31 @@ var MultiplayerConnection = class {
     if (frame.serverFrame > this.latestServerFrame) {
       this.latestServerFrame = frame.serverFrame;
     }
+    if (this.prediction && frame.playerState) {
+      const ps = frame.playerState;
+      const predState = {
+        ...defaultPredictionState2(),
+        // Manual mapping due to type mismatch (MutableVec3 vs Vec3, and property names)
+        origin: { x: ps.origin.x, y: ps.origin.y, z: ps.origin.z },
+        velocity: { x: ps.velocity.x, y: ps.velocity.y, z: ps.velocity.z },
+        viewAngles: { x: ps.viewangles.x, y: ps.viewangles.y, z: ps.viewangles.z },
+        deltaAngles: { x: ps.delta_angles.x, y: ps.delta_angles.y, z: ps.delta_angles.z },
+        pmFlags: ps.pm_flags,
+        pmType: ps.pm_type,
+        gravity: ps.gravity,
+        // Copy other matching fields
+        health: ps.stats[0]
+        // Assuming stat 0 is health? Or generic copy
+        // ...
+      };
+      const gameFrame = {
+        frame: frame.serverFrame,
+        timeMs: 0,
+        // Should be server time, but frame doesn't always have it explicitly?
+        state: predState
+      };
+      this.prediction.setAuthoritative(gameFrame);
+    }
   }
   // Stubs for other handlers
   onCenterPrint(msg) {
@@ -11960,6 +12012,7 @@ var InputController = class {
     this.touchButtons = /* @__PURE__ */ new Map();
     this.touchMove = { x: 0, y: 0 };
     this.touchLook = { x: 0, y: 0 };
+    this.sequence = 0;
     this.bindings = bindings;
     this.forwardSpeed = options.forwardSpeed ?? DEFAULT_FORWARD_SPEED;
     this.sideSpeed = options.sideSpeed ?? DEFAULT_SIDE_SPEED;
@@ -12098,6 +12151,7 @@ var InputController = class {
       buttons |= PlayerButton.Any;
     }
     this.anyPressed = false;
+    this.sequence++;
     return {
       msec,
       buttons,
@@ -12105,7 +12159,10 @@ var InputController = class {
       forwardmove,
       sidemove,
       upmove,
-      serverFrame
+      serverFrame,
+      sequence: this.sequence,
+      lightlevel: 0,
+      impulse: 0
     };
   }
   consumeConsoleCommands() {
@@ -12286,7 +12343,7 @@ var InputCommandBuffer = class {
 
 // src/index.ts
 import {
-  ClientPrediction as ClientPrediction2,
+  ClientPrediction as ClientPrediction3,
   interpolatePredictionState as interpolatePredictionState3
 } from "@quake2ts/cgame";
 import { ViewEffects as ViewEffects3 } from "@quake2ts/cgame";
@@ -12303,7 +12360,7 @@ function createClient(imports) {
     const tr = imports.engine.trace(point, point, zero3, zero3);
     return tr.contents || 0;
   };
-  const prediction = new ClientPrediction(imports.engine.trace, pointContents);
+  const prediction = new ClientPrediction2(imports.engine.trace, pointContents);
   const view = new ViewEffects2();
   const demoPlayback = new DemoPlaybackController();
   const demoHandler = new ClientNetworkHandler(imports);
@@ -12803,7 +12860,7 @@ function createClient(imports) {
 export {
   ClientConfigStrings,
   ClientMode,
-  ClientPrediction2 as ClientPrediction,
+  ClientPrediction3 as ClientPrediction,
   InputAction,
   InputBindings,
   InputCommandBuffer,