quake2ts 0.0.201 → 0.0.202

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

@@ -710,6 +710,78 @@ var TempEntity = /* @__PURE__ */ ((TempEntity2) => {
   TempEntity2[TempEntity2["EXPLOSION2_NL"] = 63] = "EXPLOSION2_NL";
   return TempEntity2;
 })(TempEntity || {});
+function toSigned16(val) {
+  return val << 16 >> 16;
+}
+function readUint16LE(stats, startIndex, byteOffset) {
+  const elementIndex = Math.floor(byteOffset / 2);
+  const isOdd = byteOffset % 2 !== 0;
+  const index = startIndex + elementIndex;
+  const val0 = stats[index] || 0;
+  if (!isOdd) {
+    return val0 & 65535;
+  } else {
+    const val1 = stats[index + 1] || 0;
+    const low = val0 >>> 8 & 255;
+    const high = val1 & 255;
+    return high << 8 | low;
+  }
+}
+function writeUint16LE(stats, startIndex, byteOffset, value) {
+  const elementIndex = Math.floor(byteOffset / 2);
+  const isOdd = byteOffset % 2 !== 0;
+  const index = startIndex + elementIndex;
+  if (stats[index] === void 0) stats[index] = 0;
+  if (!isOdd) {
+    stats[index] = toSigned16(value);
+  } else {
+    if (stats[index + 1] === void 0) stats[index + 1] = 0;
+    const val0 = stats[index];
+    const val1 = stats[index + 1];
+    const newHigh0 = value & 255;
+    const newVal0 = val0 & 255 | newHigh0 << 8;
+    stats[index] = toSigned16(newVal0);
+    const newLow1 = value >>> 8 & 255;
+    const newVal1 = newLow1 | val1 & 65280;
+    stats[index + 1] = toSigned16(newVal1);
+  }
+}
+function setCompressedInteger(stats, startIndex, id, count, bitsPerValue) {
+  const bitOffset = bitsPerValue * id;
+  const byteOffset = Math.floor(bitOffset / 8);
+  const bitShift = bitOffset % 8;
+  const mask = (1 << bitsPerValue) - 1 << bitShift;
+  let base = readUint16LE(stats, startIndex, byteOffset);
+  const valueToWrite = base & ~mask | count << bitShift & mask;
+  writeUint16LE(stats, startIndex, byteOffset, valueToWrite & 65535);
+}
+var PowerupId = /* @__PURE__ */ ((PowerupId22) => {
+  PowerupId22["QuadDamage"] = "quad";
+  PowerupId22["Invulnerability"] = "invulnerability";
+  PowerupId22["EnviroSuit"] = "enviro_suit";
+  PowerupId22["Rebreather"] = "rebreather";
+  PowerupId22["Silencer"] = "silencer";
+  PowerupId22["PowerScreen"] = "power_screen";
+  PowerupId22["PowerShield"] = "power_shield";
+  PowerupId22["QuadFire"] = "quad_fire";
+  PowerupId22["Invisibility"] = "invisibility";
+  PowerupId22["Bandolier"] = "bandolier";
+  PowerupId22["AmmoPack"] = "ammo_pack";
+  PowerupId22["IRGoggles"] = "ir_goggles";
+  PowerupId22["DoubleDamage"] = "double_damage";
+  PowerupId22["SphereVengeance"] = "sphere_vengeance";
+  PowerupId22["SphereHunter"] = "sphere_hunter";
+  PowerupId22["SphereDefender"] = "sphere_defender";
+  PowerupId22["Doppelganger"] = "doppelganger";
+  PowerupId22["TagToken"] = "tag_token";
+  PowerupId22["TechResistance"] = "tech_resistance";
+  PowerupId22["TechStrength"] = "tech_strength";
+  PowerupId22["TechHaste"] = "tech_haste";
+  PowerupId22["TechRegeneration"] = "tech_regeneration";
+  PowerupId22["Flashlight"] = "flashlight";
+  PowerupId22["Compass"] = "compass";
+  return PowerupId22;
+})(PowerupId || {});
 var PlayerStat = /* @__PURE__ */ ((PlayerStat2) => {
   PlayerStat2[PlayerStat2["STAT_HEALTH_ICON"] = 0] = "STAT_HEALTH_ICON";
   PlayerStat2[PlayerStat2["STAT_HEALTH"] = 1] = "STAT_HEALTH";
@@ -729,15 +801,150 @@ var PlayerStat = /* @__PURE__ */ ((PlayerStat2) => {
   PlayerStat2[PlayerStat2["STAT_FLASHES"] = 15] = "STAT_FLASHES";
   PlayerStat2[PlayerStat2["STAT_CHASE"] = 16] = "STAT_CHASE";
   PlayerStat2[PlayerStat2["STAT_SPECTATOR"] = 17] = "STAT_SPECTATOR";
-  PlayerStat2[PlayerStat2["STAT_WEAPONS_OWNED_1"] = 18] = "STAT_WEAPONS_OWNED_1";
-  PlayerStat2[PlayerStat2["STAT_WEAPONS_OWNED_2"] = 19] = "STAT_WEAPONS_OWNED_2";
-  PlayerStat2[PlayerStat2["STAT_AMMO_INFO_START"] = 20] = "STAT_AMMO_INFO_START";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM1_PIC"] = 18] = "STAT_CTF_TEAM1_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM1_CAPS"] = 19] = "STAT_CTF_TEAM1_CAPS";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM2_PIC"] = 20] = "STAT_CTF_TEAM2_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM2_CAPS"] = 21] = "STAT_CTF_TEAM2_CAPS";
+  PlayerStat2[PlayerStat2["STAT_CTF_FLAG_PIC"] = 22] = "STAT_CTF_FLAG_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_JOINED_TEAM1_PIC"] = 23] = "STAT_CTF_JOINED_TEAM1_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_JOINED_TEAM2_PIC"] = 24] = "STAT_CTF_JOINED_TEAM2_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM1_HEADER"] = 25] = "STAT_CTF_TEAM1_HEADER";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM2_HEADER"] = 26] = "STAT_CTF_TEAM2_HEADER";
+  PlayerStat2[PlayerStat2["STAT_CTF_TECH"] = 27] = "STAT_CTF_TECH";
+  PlayerStat2[PlayerStat2["STAT_CTF_ID_VIEW"] = 28] = "STAT_CTF_ID_VIEW";
+  PlayerStat2[PlayerStat2["STAT_CTF_MATCH"] = 29] = "STAT_CTF_MATCH";
+  PlayerStat2[PlayerStat2["STAT_CTF_ID_VIEW_COLOR"] = 30] = "STAT_CTF_ID_VIEW_COLOR";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAMINFO"] = 31] = "STAT_CTF_TEAMINFO";
+  PlayerStat2[PlayerStat2["STAT_WEAPONS_OWNED_1"] = 32] = "STAT_WEAPONS_OWNED_1";
+  PlayerStat2[PlayerStat2["STAT_WEAPONS_OWNED_2"] = 33] = "STAT_WEAPONS_OWNED_2";
+  PlayerStat2[PlayerStat2["STAT_AMMO_INFO_START"] = 34] = "STAT_AMMO_INFO_START";
+  PlayerStat2[PlayerStat2["STAT_POWERUP_INFO_START"] = 41] = "STAT_POWERUP_INFO_START";
+  PlayerStat2[PlayerStat2["STAT_KEY_A"] = 44] = "STAT_KEY_A";
+  PlayerStat2[PlayerStat2["STAT_KEY_B"] = 45] = "STAT_KEY_B";
+  PlayerStat2[PlayerStat2["STAT_KEY_C"] = 46] = "STAT_KEY_C";
+  PlayerStat2[PlayerStat2["STAT_ACTIVE_WHEEL_WEAPON"] = 47] = "STAT_ACTIVE_WHEEL_WEAPON";
+  PlayerStat2[PlayerStat2["STAT_COOP_RESPAWN"] = 48] = "STAT_COOP_RESPAWN";
+  PlayerStat2[PlayerStat2["STAT_LIVES"] = 49] = "STAT_LIVES";
+  PlayerStat2[PlayerStat2["STAT_HIT_MARKER"] = 50] = "STAT_HIT_MARKER";
+  PlayerStat2[PlayerStat2["STAT_SELECTED_ITEM_NAME"] = 51] = "STAT_SELECTED_ITEM_NAME";
+  PlayerStat2[PlayerStat2["STAT_HEALTH_BARS"] = 52] = "STAT_HEALTH_BARS";
+  PlayerStat2[PlayerStat2["STAT_ACTIVE_WEAPON"] = 53] = "STAT_ACTIVE_WEAPON";
+  PlayerStat2[PlayerStat2["STAT_LAST"] = 54] = "STAT_LAST";
   return PlayerStat2;
 })(PlayerStat || {});
-function G_SetAmmoStat(val) {
-  if (val > 511) return 511;
-  if (val < 0) return 0;
-  return val;
+var AMMO_MAX = 12;
+var NUM_BITS_FOR_AMMO = 9;
+var NUM_AMMO_STATS = Math.ceil(AMMO_MAX * NUM_BITS_FOR_AMMO / 16);
+var POWERUP_MAX = 23;
+var NUM_BITS_FOR_POWERUP = 2;
+var NUM_POWERUP_STATS = Math.ceil(POWERUP_MAX * NUM_BITS_FOR_POWERUP / 16);
+var POWERUP_STAT_MAP = {
+  [
+    "power_screen"
+    /* PowerScreen */
+  ]: 0,
+  [
+    "power_shield"
+    /* PowerShield */
+  ]: 1,
+  // 2 is POWERUP_AM_BOMB (not in PowerupId?)
+  [
+    "quad"
+    /* QuadDamage */
+  ]: 3,
+  [
+    "quad_fire"
+    /* QuadFire */
+  ]: 4,
+  [
+    "invulnerability"
+    /* Invulnerability */
+  ]: 5,
+  [
+    "invisibility"
+    /* Invisibility */
+  ]: 6,
+  [
+    "silencer"
+    /* Silencer */
+  ]: 7,
+  [
+    "rebreather"
+    /* Rebreather */
+  ]: 8,
+  [
+    "enviro_suit"
+    /* EnviroSuit */
+  ]: 9,
+  // 10 is POWERUP_ADRENALINE (not in PowerupId?)
+  [
+    "ir_goggles"
+    /* IRGoggles */
+  ]: 11,
+  [
+    "double_damage"
+    /* DoubleDamage */
+  ]: 12,
+  [
+    "sphere_vengeance"
+    /* SphereVengeance */
+  ]: 13,
+  [
+    "sphere_hunter"
+    /* SphereHunter */
+  ]: 14,
+  [
+    "sphere_defender"
+    /* SphereDefender */
+  ]: 15,
+  [
+    "doppelganger"
+    /* Doppelganger */
+  ]: 16,
+  [
+    "flashlight"
+    /* Flashlight */
+  ]: 17,
+  [
+    "compass"
+    /* Compass */
+  ]: 18,
+  [
+    "tech_resistance"
+    /* TechResistance */
+  ]: 19,
+  [
+    "tech_strength"
+    /* TechStrength */
+  ]: 20,
+  [
+    "tech_haste"
+    /* TechHaste */
+  ]: 21,
+  [
+    "tech_regeneration"
+    /* TechRegeneration */
+  ]: 22
+};
+function G_SetAmmoStat(stats, ammoId, count) {
+  if (ammoId < 0 || ammoId >= AMMO_MAX) return;
+  let val = count;
+  if (val > 511) val = 511;
+  if (val < 0) val = 0;
+  setCompressedInteger(stats, 34, ammoId, val, NUM_BITS_FOR_AMMO);
+}
+function G_SetPowerupStat(stats, powerupId, val) {
+  let index;
+  if (typeof powerupId === "number") {
+    index = powerupId;
+  } else {
+    index = POWERUP_STAT_MAP[powerupId];
+  }
+  if (index === void 0 || index < 0 || index >= POWERUP_MAX) return;
+  let safeVal = val;
+  if (safeVal > 3) safeVal = 3;
+  if (safeVal < 0) safeVal = 0;
+  setCompressedInteger(stats, 41, index, safeVal, NUM_BITS_FOR_POWERUP);
 }
 var entityFlags_exports = {};
 __export(entityFlags_exports, {
@@ -874,13 +1081,14 @@ var AmmoType = /* @__PURE__ */ ((AmmoType22) => {
   AmmoType22[AmmoType22["Grenades"] = 3] = "Grenades";
   AmmoType22[AmmoType22["Cells"] = 4] = "Cells";
   AmmoType22[AmmoType22["Slugs"] = 5] = "Slugs";
-  AmmoType22[AmmoType22["Trap"] = 6] = "Trap";
-  AmmoType22[AmmoType22["Tesla"] = 7] = "Tesla";
-  AmmoType22[AmmoType22["MagSlugs"] = 8] = "MagSlugs";
-  AmmoType22[AmmoType22["Flechettes"] = 9] = "Flechettes";
-  AmmoType22[AmmoType22["Prox"] = 10] = "Prox";
-  AmmoType22[AmmoType22["Nuke"] = 11] = "Nuke";
-  AmmoType22[AmmoType22["Rounds"] = 12] = "Rounds";
+  AmmoType22[AmmoType22["MagSlugs"] = 6] = "MagSlugs";
+  AmmoType22[AmmoType22["Trap"] = 7] = "Trap";
+  AmmoType22[AmmoType22["Flechettes"] = 8] = "Flechettes";
+  AmmoType22[AmmoType22["Tesla"] = 9] = "Tesla";
+  AmmoType22[AmmoType22["Disruptor"] = 10] = "Disruptor";
+  AmmoType22[AmmoType22["Prox"] = 11] = "Prox";
+  AmmoType22[AmmoType22["Nuke"] = 12] = "Nuke";
+  AmmoType22[AmmoType22["Rounds"] = 13] = "Rounds";
   return AmmoType22;
 })(AmmoType || {});
 var AMMO_TYPE_COUNT = Object.keys(AmmoType).length / 2;
@@ -893,33 +1101,6 @@ var AmmoItemId = /* @__PURE__ */ ((AmmoItemId22) => {
   AmmoItemId22["Slugs"] = "ammo_slugs";
   return AmmoItemId22;
 })(AmmoItemId || {});
-var PowerupId = /* @__PURE__ */ ((PowerupId22) => {
-  PowerupId22["QuadDamage"] = "quad";
-  PowerupId22["Invulnerability"] = "invulnerability";
-  PowerupId22["EnviroSuit"] = "enviro_suit";
-  PowerupId22["Rebreather"] = "rebreather";
-  PowerupId22["Silencer"] = "silencer";
-  PowerupId22["PowerScreen"] = "power_screen";
-  PowerupId22["PowerShield"] = "power_shield";
-  PowerupId22["QuadFire"] = "quad_fire";
-  PowerupId22["Invisibility"] = "invisibility";
-  PowerupId22["Bandolier"] = "bandolier";
-  PowerupId22["AmmoPack"] = "ammo_pack";
-  PowerupId22["IRGoggles"] = "ir_goggles";
-  PowerupId22["DoubleDamage"] = "double_damage";
-  PowerupId22["SphereVengeance"] = "sphere_vengeance";
-  PowerupId22["SphereHunter"] = "sphere_hunter";
-  PowerupId22["SphereDefender"] = "sphere_defender";
-  PowerupId22["Doppelganger"] = "doppelganger";
-  PowerupId22["TagToken"] = "tag_token";
-  PowerupId22["TechResistance"] = "tech_resistance";
-  PowerupId22["TechStrength"] = "tech_strength";
-  PowerupId22["TechHaste"] = "tech_haste";
-  PowerupId22["TechRegeneration"] = "tech_regeneration";
-  PowerupId22["Flashlight"] = "flashlight";
-  PowerupId22["Compass"] = "compass";
-  return PowerupId22;
-})(PowerupId || {});
 
 // src/combat/damageFlags.ts
 var DamageFlags = /* @__PURE__ */ ((DamageFlags2) => {
@@ -12659,13 +12840,6 @@ var WEAPON_WHEEL_ORDER = [
   WeaponId.Railgun,
   WeaponId.BFG10K
 ];
-var AMMO_WHEEL_ORDER = [
-  AmmoType.Shells,
-  AmmoType.Bullets,
-  AmmoType.Cells,
-  AmmoType.Rockets,
-  AmmoType.Slugs
-];
 var POWERUP_TIMERS = [
   { id: PowerupId.QuadDamage, priority: 1 },
   { id: PowerupId.Invulnerability, priority: 2 },
@@ -12676,7 +12850,7 @@ var POWERUP_TIMERS = [
 function populatePlayerStats(player, timeSeconds) {
   if (!player.client) return [];
   const inventory = player.client.inventory;
-  const statArray = new Array(32).fill(0);
+  const statArray = new Array(64).fill(0);
   statArray[PlayerStat.STAT_HEALTH] = player.health;
   if (inventory.armor) {
     statArray[PlayerStat.STAT_ARMOR] = inventory.armor.armorCount;
@@ -12693,18 +12867,22 @@ function populatePlayerStats(player, timeSeconds) {
   statArray[PlayerStat.STAT_AMMO] = 0;
   if (inventory.currentWeapon) {
     const weaponItem = Object.values(WEAPON_ITEMS).find((item) => item.weaponId === inventory.currentWeapon);
-    if (weaponItem && weaponItem.ammoType) {
+    if (weaponItem && weaponItem.ammoType !== null && weaponItem.ammoType !== void 0) {
       statArray[PlayerStat.STAT_AMMO] = inventory.ammo.counts[weaponItem.ammoType] || 0;
     }
   }
-  for (let i = 0; i < AMMO_WHEEL_ORDER.length; i++) {
-    const ammoType = AMMO_WHEEL_ORDER[i];
-    const count = inventory.ammo.counts[ammoType] || 0;
-    statArray[PlayerStat.STAT_AMMO_INFO_START + i] = G_SetAmmoStat(count);
+  for (let i = 0; i < AMMO_MAX; i++) {
+    const count = inventory.ammo.counts[i] || 0;
+    G_SetAmmoStat(statArray, i, count);
+  }
+  const nowMs = timeSeconds * 1e3;
+  for (const [id, expiresAt] of inventory.powerups) {
+    if (expiresAt && expiresAt > nowMs) {
+      G_SetPowerupStat(statArray, id, 1);
+    }
   }
   let bestTime = Infinity;
   let bestPowerup = null;
-  const nowMs = timeSeconds * 1e3;
   for (const { id } of POWERUP_TIMERS) {
     const expiresAt = inventory.powerups.get(id);
     if (expiresAt && expiresAt > nowMs) {