quake2ts 0.0.467 → 0.0.469

package/packages/client/dist/cjs/index.cjs

@@ -29,6 +29,7 @@ __export(index_exports, {
   InputBindings: () => InputBindings,
   InputCommandBuffer: () => InputCommandBuffer,
   InputController: () => InputController,
+  ScoreboardManager: () => ScoreboardManager,
   ViewEffects: () => import_cgame6.ViewEffects,
   createClient: () => createClient,
   createDefaultBindings: () => createDefaultBindings,
@@ -14388,6 +14389,123 @@ var updateBlend = (state, ps, dt, damageIntensity = 0) => {
   return [0, 0, 0, 0];
 };
 
+// src/scoreboard.ts
+var ScoreboardManager = class {
+  constructor(configStrings) {
+    this.localPlayerId = -1;
+    this.listeners = [];
+    // Cache players to support stateful updates (e.g. scores)
+    this.players = /* @__PURE__ */ new Map();
+    this.configStrings = configStrings;
+    this.refreshAll();
+  }
+  setLocalPlayerId(id) {
+    this.localPlayerId = id;
+  }
+  addListener(listener) {
+    this.listeners.push(listener);
+  }
+  removeListener(listener) {
+    const index = this.listeners.indexOf(listener);
+    if (index !== -1) {
+      this.listeners.splice(index, 1);
+    }
+  }
+  notifyUpdate() {
+    const data = this.getScoreboard();
+    for (const listener of this.listeners) {
+      listener(data);
+    }
+  }
+  refreshAll() {
+    this.players.clear();
+    for (let i = 0; i < MAX_CLIENTS2; i++) {
+      const csIndex = ConfigStringIndex2.PlayerSkins + i;
+      const str3 = this.configStrings.get(csIndex);
+      if (str3 && str3.length > 0) {
+        this.parseConfigString(csIndex, str3);
+      }
+    }
+  }
+  parseConfigString(index, str3) {
+    if (index < ConfigStringIndex2.PlayerSkins || index >= ConfigStringIndex2.PlayerSkins + MAX_CLIENTS2) {
+      return;
+    }
+    const id = index - ConfigStringIndex2.PlayerSkins;
+    if (!str3 || str3.length === 0) {
+      if (this.players.has(id)) {
+        this.players.delete(id);
+      }
+      return;
+    }
+    const entry = this.parsePlayerConfigString(id, str3);
+    if (entry) {
+      const existing = this.players.get(id);
+      if (existing) {
+        entry.frags = existing.frags;
+        entry.deaths = existing.deaths;
+        entry.ping = existing.ping;
+      }
+      this.players.set(id, entry);
+    }
+  }
+  getScoreboard() {
+    const players = Array.from(this.players.values());
+    players.sort((a, b) => b.frags - a.frags);
+    const worldModel = this.configStrings.getModelName(1);
+    let mapName = "unknown";
+    if (worldModel) {
+      const match = worldModel.match(/maps\/(.*)\.bsp/i);
+      if (match) {
+        mapName = match[1];
+      } else {
+        mapName = worldModel;
+      }
+    }
+    return {
+      players,
+      mapName
+    };
+  }
+  parsePlayerConfigString(id, str3) {
+    const parts = str3.split("\\");
+    const info = {};
+    let startIndex = 0;
+    if (parts.length > 0 && parts[0] === "") {
+      startIndex = 1;
+    }
+    for (let i = startIndex; i < parts.length; i += 2) {
+      if (i + 1 < parts.length) {
+        const key = parts[i].toLowerCase();
+        const value = parts[i + 1];
+        info[key] = value;
+      }
+    }
+    if (!info.name) {
+      return null;
+    }
+    return {
+      id,
+      name: info.name,
+      frags: 0,
+      deaths: 0,
+      ping: 0,
+      skin: info.skin,
+      model: info.model
+    };
+  }
+  // Method to update scores explicitly
+  updateScore(id, frags, deaths, ping) {
+    const player = this.players.get(id);
+    if (player) {
+      player.frags = frags;
+      player.deaths = deaths;
+      player.ping = ping;
+      this.notifyUpdate();
+    }
+  }
+};
+
 // src/input/bindings.ts
 var DEFAULT_BINDINGS = [
   { code: "KeyW", command: "+forward" },
@@ -14915,6 +15033,7 @@ var GameSession = class {
     this.currentMapName = "";
     this.options = options;
     this.engine = options.engine;
+    this.inputController = new InputController();
   }
   startNewGame(mapName, skill = 1) {
     if (this.host) {
@@ -15005,9 +15124,16 @@ var GameSession = class {
     this.host = new EngineHost(this.game, clientProxy);
     const clientImports = {
       engine: this.engine,
-      host: this.host
+      host: this.host,
+      inputController: this.inputController
     };
     this.client = createClient(clientImports);
+    if (this._onInputCommand) {
+      this.client.onInputCommand = this._onInputCommand;
+    }
+    if (this._onHudUpdate) {
+      this.client.onHudUpdate = this._onHudUpdate;
+    }
     this.game.spawnWorld();
     this.host.start();
     if (this.engine.cmd) {
@@ -15101,9 +15227,16 @@ var GameSession = class {
     this.host = new EngineHost(this.game, clientProxy);
     const clientImports = {
       engine: this.engine,
-      host: this.host
+      host: this.host,
+      inputController: this.inputController
     };
     this.client = createClient(clientImports);
+    if (this._onInputCommand) {
+      this.client.onInputCommand = this._onInputCommand;
+    }
+    if (this._onHudUpdate) {
+      this.client.onHudUpdate = this._onHudUpdate;
+    }
     if (this.engine.cmd) {
       this.engine.cmd.executeText(`map ${mapName}`);
     } else if (this.host.commands) {
@@ -15134,6 +15267,43 @@ var GameSession = class {
   getHost() {
     return this.host;
   }
+  bindInputSource(source) {
+    this.inputController.bindInputSource(source);
+  }
+  setKeyBinding(action, keys) {
+    this.inputController.setKeyBinding(action, keys);
+  }
+  getDefaultBindings() {
+    return this.inputController.getDefaultBindings();
+  }
+  set onInputCommand(handler) {
+    this._onInputCommand = handler;
+    if (this.client) {
+      this.client.onInputCommand = handler;
+    }
+  }
+  get onInputCommand() {
+    return this._onInputCommand;
+  }
+  // Section 4.2: HUD and UI Integration
+  getHudData() {
+    return this.client?.getHudData() ?? null;
+  }
+  getStatusBar() {
+    return this.client?.getStatusBar() ?? null;
+  }
+  getCrosshairInfo() {
+    return this.client?.getCrosshairInfo() ?? null;
+  }
+  set onHudUpdate(handler) {
+    this._onHudUpdate = handler;
+    if (this.client) {
+      this.client.onHudUpdate = handler;
+    }
+  }
+  get onHudUpdate() {
+    return this._onHudUpdate;
+  }
   // Section 4.1.3: Game State Queries
   getPlayerState() {
     if (this.client && this.client.lastRendered) {
@@ -15236,6 +15406,12 @@ function createClient(imports) {
     freeCameraAngles: { x: 0, y: 0, z: 0 },
     followEntityId: -1
   };
+  const inputController = imports.inputController ?? new InputController();
+  inputController.onInputCommand = (cmd) => {
+    if (clientExports.onInputCommand) {
+      clientExports.onInputCommand(cmd);
+    }
+  };
   const inputState = {
     forward: false,
     backward: false,
@@ -15252,6 +15428,7 @@ function createClient(imports) {
   let pauseMenuFactory;
   let optionsFactory;
   const configStrings = new ClientConfigStrings();
+  const scoreboardManager = new ScoreboardManager(configStrings);
   const blendState = createBlendState();
   let currentBlend = [0, 0, 0, 0];
   let pendingDamage = 0;
@@ -15306,6 +15483,10 @@ function createClient(imports) {
     onConfigString: (index, str3) => {
       configStrings.set(index, str3);
       cg.ParseConfigString(index, str3);
+      if (index >= ConfigStringIndex2.PlayerSkins && index < ConfigStringIndex2.PlayerSkins + MAX_CLIENTS2) {
+        scoreboardManager.parseConfigString(index, str3);
+        scoreboardManager.notifyUpdate();
+      }
     },
     onServerData: (protocol, tickRate) => {
       if (tickRate && tickRate > 0) {
@@ -15541,6 +15722,15 @@ function createClient(imports) {
         menuSystem.pushMenu(pauseMenuFactory.createPauseMenu());
       }
     },
+    bindInputSource(source) {
+      inputController.bindInputSource(source);
+    },
+    setKeyBinding(action, keys) {
+      inputController.setKeyBinding(action, keys);
+    },
+    getDefaultBindings() {
+      return inputController.getDefaultBindings();
+    },
     createMainMenu(options, storage, saveCallback, loadCallback, deleteCallback) {
       const saveLoadFactory = new SaveLoadMenuFactory(menuSystem, storage, saveCallback, loadCallback, deleteCallback);
       let optsFactory = optionsFactory;
@@ -15708,7 +15898,10 @@ function createClient(imports) {
       } else {
         currentBlend = [0, 0, 0, 0];
       }
-      const command = {};
+      const command = inputController.buildCommand(dtMs, now, demoHandler.latestServerFrame);
+      if (!isDemoPlaying && !menuSystem.isActive()) {
+        clientExports.predict(command);
+      }
       const timeSeconds = sample.nowMs / 1e3;
       dlightManager.update(timeSeconds, dtMs / 1e3);
       const dlights = [...dlightManager.getActiveLights()];
@@ -16009,8 +16202,17 @@ function createClient(imports) {
     },
     setDemoFollowEntity(entityId) {
       demoCameraState.followEntityId = entityId;
+    },
+    // Scoreboard API
+    getScoreboard() {
+      return scoreboardManager.getScoreboard();
     }
   };
+  scoreboardManager.addListener((data) => {
+    if (clientExports.onScoreboardUpdate) {
+      clientExports.onScoreboardUpdate(data);
+    }
+  });
   return clientExports;
 }
 // Annotate the CommonJS export names for ESM import in node:
@@ -16024,6 +16226,7 @@ function createClient(imports) {
   InputBindings,
   InputCommandBuffer,
   InputController,
+  ScoreboardManager,
   ViewEffects,
   createClient,
   createDefaultBindings,