quake2ts 0.0.470 → 0.0.473

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

@@ -12229,6 +12229,9 @@ var ClientNetworkHandler = class {
     }
   }
   onLayout(layout) {
+    if (this.callbacks?.onLayout) {
+      this.callbacks.onLayout(layout);
+    }
   }
   onInventory(inventory) {
     this.inventory = [...inventory];
@@ -14445,6 +14448,7 @@ var ScoreboardManager = class {
         entry.frags = existing.frags;
         entry.deaths = existing.deaths;
         entry.ping = existing.ping;
+        entry.team = existing.team;
       }
       this.players.set(id, entry);
     }
@@ -14491,7 +14495,8 @@ var ScoreboardManager = class {
       deaths: 0,
       ping: 0,
       skin: info.skin,
-      model: info.model
+      model: info.model,
+      team: void 0
     };
   }
   // Method to update scores explicitly
@@ -14504,6 +14509,105 @@ var ScoreboardManager = class {
       this.notifyUpdate();
     }
   }
+  /**
+   * Parses the layout string from svc_layout and updates player scores.
+   * Expected format example:
+   * xv 32 yv 32 string "%4i %4i %-12.12s %4i"
+   * followed by values? No, the string command draws text.
+   * In Q2, the layout message sends a series of drawing commands.
+   * The server formats the string:
+   * "xv 32 yv %i string \"%4i %4i %-12.12s %4i\" "
+   * The client receives the formatting commands AND the string data.
+   * Wait, svc_layout in Q2 sends a single string that the client parses and draws.
+   * The string contains tokens.
+   * Example:
+   * "xv 32 yv 32 string \"  10   50 PlayerName   10\""
+   * We need to regex this.
+   */
+  processScoreboardMessage(layout) {
+    const stringCmdRegex = /string\s+"([^"]+)"/g;
+    let match;
+    while ((match = stringCmdRegex.exec(layout)) !== null) {
+      const content = match[1];
+      if (content.length > 20) {
+        const fragsStr = content.substring(0, 4).trim();
+        const pingStr = content.substring(5, 9).trim();
+        const nameStr = content.substring(10, 22).trim();
+        const frags = parseInt(fragsStr, 10);
+        const ping = parseInt(pingStr, 10);
+        if (!isNaN(frags) && !isNaN(ping) && nameStr.length > 0) {
+          for (const player of this.players.values()) {
+            if (player.name === nameStr) {
+              player.frags = frags;
+              player.ping = ping;
+            }
+          }
+        }
+      }
+    }
+    this.notifyUpdate();
+  }
+};
+
+// src/chat.ts
+var ChatManager = class {
+  constructor(sendCommand) {
+    this.history = [];
+    this.maxHistory = 100;
+    this.listeners = [];
+    this.sendCommand = sendCommand;
+  }
+  addListener(listener) {
+    this.listeners.push(listener);
+  }
+  removeListener(listener) {
+    const index = this.listeners.indexOf(listener);
+    if (index !== -1) {
+      this.listeners.splice(index, 1);
+    }
+  }
+  sendChatMessage(message, team = false) {
+    const escaped = message.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    const cmd = team ? `say_team "${escaped}"` : `say "${escaped}"`;
+    this.sendCommand(cmd);
+  }
+  addMessage(level, text) {
+    let sender;
+    let content = text;
+    let team = false;
+    const match = text.match(/^([^:]+):\s(.*)$/);
+    const teamMatch = text.match(/^\(([^)]+)\):\s(.*)$/);
+    if (teamMatch) {
+      sender = teamMatch[1];
+      content = teamMatch[2];
+      team = true;
+    } else if (match) {
+      sender = match[1];
+      content = match[2];
+      team = false;
+    }
+    const message = {
+      timestamp: Date.now(),
+      sender,
+      text: content,
+      team
+    };
+    this.history.push(message);
+    if (this.history.length > this.maxHistory) {
+      this.history.shift();
+    }
+    if (sender) {
+      this.notifyListeners(sender, content, team);
+    }
+  }
+  getHistory() {
+    return [...this.history];
+  }
+  notifyListeners(sender, message, team) {
+    for (const listener of this.listeners) {
+      listener(sender, message, team);
+    }
+  }
 };
 
 // src/input/bindings.ts
@@ -15429,6 +15533,11 @@ function createClient(imports) {
   let optionsFactory;
   const configStrings = new ClientConfigStrings();
   const scoreboardManager = new ScoreboardManager(configStrings);
+  const chatManager = new ChatManager((cmd) => {
+    if (imports.engine.cmd) {
+      imports.engine.cmd.executeText(cmd);
+    }
+  });
   const blendState = createBlendState();
   let currentBlend = [0, 0, 0, 0];
   let pendingDamage = 0;
@@ -15479,7 +15588,10 @@ function createClient(imports) {
   const multiplayerFactory = new MultiplayerMenuFactory(menuSystem, multiplayer);
   demoHandler.setCallbacks({
     onCenterPrint: (msg) => cg.ParseCenterPrint(msg, 0, false),
-    onPrint: (level, msg) => cg.NotifyMessage(0, msg, false),
+    onPrint: (level, msg) => {
+      cg.NotifyMessage(0, msg, false);
+      chatManager.addMessage(level, msg);
+    },
     onConfigString: (index, str3) => {
       configStrings.set(index, str3);
       cg.ParseConfigString(index, str3);
@@ -15510,6 +15622,10 @@ function createClient(imports) {
     },
     onDamage: (indicators) => {
       pendingDamage = 0.5;
+    },
+    onLayout: (layout) => {
+      scoreboardManager.processScoreboardMessage(layout);
+      scoreboardManager.notifyUpdate();
     }
   });
   demoPlayback.setHandler(demoHandler);
@@ -16206,6 +16322,13 @@ function createClient(imports) {
     // Scoreboard API
     getScoreboard() {
       return scoreboardManager.getScoreboard();
+    },
+    // Chat API
+    sendChatMessage(message, team = false) {
+      chatManager.sendChatMessage(message, team);
+    },
+    getChatHistory() {
+      return chatManager.getHistory();
     }
   };
   scoreboardManager.addListener((data) => {
@@ -16213,6 +16336,11 @@ function createClient(imports) {
       clientExports.onScoreboardUpdate(data);
     }
   });
+  chatManager.addListener((sender, message, team) => {
+    if (clientExports.onChatMessage) {
+      clientExports.onChatMessage(sender, message, team);
+    }
+  });
   return clientExports;
 }
 // Annotate the CommonJS export names for ESM import in node: