quake2ts 0.0.89 → 0.0.90

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

@@ -3829,13 +3829,13 @@ var ViewEffects = class {
 };
 
 // src/hud/numbers.ts
-var Draw_Number = (renderer, x, y, value, pics, width) => {
+var Draw_Number = (renderer, x, y, value, pics, width, color) => {
   const s = Math.abs(value).toString();
   for (let i = 0; i < s.length; i++) {
     const digit = parseInt(s[i]);
     const pic = pics[digit];
     if (pic) {
-      renderer.drawPic(x + i * width, y, pic);
+      renderer.drawPic(x + i * width, y, pic, color);
     }
   }
 };
@@ -3874,10 +3874,18 @@ var Draw_Crosshair = (renderer, width, height) => {
 // src/hud/icons.ts
 import { WEAPON_ITEMS } from "@quake2ts/game";
 var iconPics = /* @__PURE__ */ new Map();
-var Draw_Icons = (renderer, client) => {
+var Draw_Icons = (renderer, client, hudNumberPics2, numberWidth2, timeMs) => {
   if (!client) {
     return;
   }
+  const armor = client.inventory.armor;
+  if (armor && armor.armorCount > 0) {
+    const iconName = `i_${armor.armorType}armor`;
+    const icon = iconPics.get(iconName);
+    if (icon) {
+      renderer.drawPic(HUD_LAYOUT.ARMOR_X - 24, HUD_LAYOUT.ARMOR_Y - 2, icon);
+    }
+  }
   const currentWeapon = client.inventory.currentWeapon;
   if (currentWeapon) {
     const weaponDef = Object.values(WEAPON_ITEMS).find((w) => w.weaponId === currentWeapon);
@@ -3890,13 +3898,44 @@ var Draw_Icons = (renderer, client) => {
     }
   }
   let powerupX = HUD_LAYOUT.POWERUP_X;
-  for (const [powerup, timer] of client.inventory.powerups.entries()) {
-    if (timer && timer > 0) {
+  for (const [powerup, expiresAt] of client.inventory.powerups.entries()) {
+    if (expiresAt && expiresAt > timeMs) {
       const iconName = `p_${powerup}`;
       const icon = iconPics.get(iconName);
       if (icon) {
         renderer.drawPic(powerupX, HUD_LAYOUT.POWERUP_Y, icon);
-        powerupX -= icon.width + 4;
+        const remainingSeconds = Math.ceil((expiresAt - timeMs) / 1e3);
+        Draw_Number(renderer, powerupX + icon.width + 2, HUD_LAYOUT.POWERUP_Y, remainingSeconds, hudNumberPics2, numberWidth2);
+        powerupX -= icon.width + numberWidth2 * remainingSeconds.toString().length + 8;
+      }
+    }
+  }
+  const keys = Array.from(client.inventory.keys).sort();
+  let keyY = 300;
+  for (const key of keys) {
+    let iconName = "";
+    switch (key) {
+      case "blue":
+        iconName = "k_bluekey";
+        break;
+      case "red":
+        iconName = "k_redkey";
+        break;
+      // 'green' and 'yellow' keys in KeyId enum map to specific Q2 key items in pickupKey logic.
+      // We map them to likely icons for now to provide visual feedback as requested.
+      // Future work should align KeyId enum with actual Q2 item names more closely.
+      case "green":
+        iconName = "k_security";
+        break;
+      case "yellow":
+        iconName = "k_pyramid";
+        break;
+    }
+    if (iconName) {
+      const icon = iconPics.get(iconName);
+      if (icon) {
+        renderer.drawPic(HUD_LAYOUT.WEAPON_ICON_X, keyY, icon);
+        keyY += icon.height + 2;
       }
     }
   }
@@ -3968,17 +4007,20 @@ var Draw_Diagnostics = (renderer, stats) => {
 // src/hud.ts
 var hudNumberPics = [];
 var numberWidth = 0;
-var Draw_Hud = (renderer, ps, client, health, armor, ammo, stats) => {
+var Draw_Hud = (renderer, ps, client, health, armor, ammo, stats, messageSystem, timeMs) => {
   renderer.begin2D();
   if (ps.damageAlpha > 0) {
     renderer.drawfillRect(0, 0, renderer.width, renderer.height, [1, 0, 0, ps.damageAlpha]);
   }
-  Draw_Number(renderer, HUD_LAYOUT.HEALTH_X, HUD_LAYOUT.HEALTH_Y, health, hudNumberPics, numberWidth);
+  const healthColor = health <= 25 ? [1, 0, 0, 1] : void 0;
+  Draw_Number(renderer, HUD_LAYOUT.HEALTH_X, HUD_LAYOUT.HEALTH_Y, health, hudNumberPics, numberWidth, healthColor);
   Draw_Number(renderer, HUD_LAYOUT.ARMOR_X, HUD_LAYOUT.ARMOR_Y, armor, hudNumberPics, numberWidth);
   Draw_Number(renderer, HUD_LAYOUT.AMMO_X, HUD_LAYOUT.AMMO_Y, ammo, hudNumberPics, numberWidth);
-  Draw_Icons(renderer, client);
+  Draw_Icons(renderer, client, hudNumberPics, numberWidth, timeMs);
   Draw_Damage(renderer, ps);
   Draw_Diagnostics(renderer, stats);
+  messageSystem.drawCenterPrint(renderer, timeMs);
+  messageSystem.drawNotifications(renderer, timeMs);
   if (ps.centerPrint) {
     renderer.drawCenterString(renderer.height / 2 - 20, ps.centerPrint);
   }
@@ -3989,6 +4031,55 @@ var Draw_Hud = (renderer, ps, client, health, armor, ammo, stats) => {
   renderer.end2D();
 };
 
+// src/hud/messages.ts
+var CENTER_PRINT_DURATION = 3e3;
+var NOTIFY_DURATION = 5e3;
+var MAX_NOTIFY_MESSAGES = 4;
+var MessageSystem = class {
+  constructor() {
+    this.centerPrintMsg = null;
+    this.notifyMessages = [];
+  }
+  addCenterPrint(text, now) {
+    this.centerPrintMsg = {
+      text,
+      startTime: now,
+      duration: CENTER_PRINT_DURATION
+    };
+  }
+  addNotify(text, now) {
+    this.notifyMessages.push({
+      text,
+      startTime: now,
+      duration: NOTIFY_DURATION
+    });
+    if (this.notifyMessages.length > MAX_NOTIFY_MESSAGES) {
+      this.notifyMessages.shift();
+    }
+  }
+  drawCenterPrint(renderer, now) {
+    if (!this.centerPrintMsg) return;
+    if (now > this.centerPrintMsg.startTime + this.centerPrintMsg.duration) {
+      this.centerPrintMsg = null;
+      return;
+    }
+    const width = this.centerPrintMsg.text.length * 8;
+    const x = (renderer.width - width) / 2;
+    const y = HUD_LAYOUT.CENTER_PRINT_Y;
+    renderer.drawString(x, y, this.centerPrintMsg.text);
+  }
+  drawNotifications(renderer, now) {
+    while (this.notifyMessages.length > 0 && now > this.notifyMessages[0].startTime + this.notifyMessages[0].duration) {
+      this.notifyMessages.shift();
+    }
+    let y = 10;
+    for (const msg of this.notifyMessages) {
+      renderer.drawString(10, y, msg.text);
+      y += 10;
+    }
+  }
+};
+
 // src/demo/handler.ts
 var MAX_CONFIGSTRINGS3 = 2048;
 var ClientNetworkHandler = class {
@@ -4633,6 +4724,7 @@ var InputCommandBuffer = class {
 function createClient(imports) {
   const prediction = new ClientPrediction(imports.engine.trace);
   const view = new ViewEffects();
+  const messageSystem = new MessageSystem();
   const demoPlayback = new DemoPlaybackController();
   const demoHandler = new ClientNetworkHandler();
   demoPlayback.setHandler(demoHandler);
@@ -4698,7 +4790,18 @@ function createClient(imports) {
           damageAlpha: 0,
           damageIndicators: []
         };
-        Draw_Hud(imports.engine.renderer, playerState, lastRendered.client, lastRendered.health, lastRendered.armor, lastRendered.ammo, stats);
+        const timeMs = sample.latest?.timeMs ?? 0;
+        Draw_Hud(
+          imports.engine.renderer,
+          playerState,
+          lastRendered.client,
+          lastRendered.health,
+          lastRendered.armor,
+          lastRendered.ammo,
+          stats,
+          messageSystem,
+          timeMs
+        );
       }
       void imports;
       void sample;
@@ -4724,6 +4827,14 @@ function createClient(imports) {
       return camera;
     },
     demoPlayback,
+    ParseCenterPrint(msg) {
+      const timeMs = latestFrame?.timeMs ?? 0;
+      messageSystem.addCenterPrint(msg, timeMs);
+    },
+    ParseNotify(msg) {
+      const timeMs = latestFrame?.timeMs ?? 0;
+      messageSystem.addNotify(msg, timeMs);
+    },
     demoHandler
   };
 }