quake2ts 0.0.235 → 0.0.237

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

@@ -8188,6 +8188,67 @@ function mouseDeltaToViewDelta(delta, options) {
     z: 0
   };
 }
+var MZ_BLASTER = 0;
+var MZ_MACHINEGUN = 1;
+var MZ_SHOTGUN = 2;
+var MZ_CHAINGUN1 = 3;
+var MZ_CHAINGUN2 = 4;
+var MZ_CHAINGUN3 = 5;
+var MZ_RAILGUN = 6;
+var MZ_ROCKET = 7;
+var MZ_GRENADE = 8;
+var MZ_SSHOTGUN = 11;
+var MZ_BFG = 12;
+var MZ_HYPERBLASTER = 13;
+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 getCompressedInteger(stats, startIndex, id, bitsPerValue) {
+  const bitOffset = bitsPerValue * id;
+  const byteOffset = Math.floor(bitOffset / 8);
+  const bitShift = bitOffset % 8;
+  const mask = (1 << bitsPerValue) - 1 << bitShift;
+  const base = readUint16LE(stats, startIndex, byteOffset);
+  return (base & mask) >>> bitShift;
+}
+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";
@@ -8244,6 +8305,104 @@ var NUM_AMMO_STATS2 = Math.ceil(AMMO_MAX2 * NUM_BITS_FOR_AMMO2 / 16);
 var POWERUP_MAX2 = 23;
 var NUM_BITS_FOR_POWERUP2 = 2;
 var NUM_POWERUP_STATS2 = Math.ceil(POWERUP_MAX2 * NUM_BITS_FOR_POWERUP2 / 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_GetPowerupStat(stats, powerupId) {
+  let index;
+  if (typeof powerupId === "number") {
+    index = powerupId;
+  } else {
+    index = POWERUP_STAT_MAP[powerupId];
+  }
+  if (index === void 0 || index < 0 || index >= POWERUP_MAX2) return 0;
+  return getCompressedInteger(stats, 41, index, NUM_BITS_FOR_POWERUP2);
+}
 var entityFlags_exports2 = {};
 __export3(entityFlags_exports2, {
   U_ANGLE1: () => U_ANGLE13,
@@ -8308,7 +8467,7 @@ var AMMO_TYPE_COUNT2 = Object.keys(AmmoType2).length / 2;
 
 // src/index.ts
 import { ClientPrediction, interpolatePredictionState as interpolatePredictionState2, GetCGameAPI } from "@quake2ts/cgame";
-import { ViewEffects } from "@quake2ts/cgame";
+import { ViewEffects as ViewEffects2 } from "@quake2ts/cgame";
 
 // src/cgameBridge.ts
 function createCGameImport(imports, state) {
@@ -8640,7 +8799,7 @@ var Init_Hud = async (renderer, assets) => {
 import { defaultPredictionState, interpolatePredictionState } from "@quake2ts/cgame";
 
 // src/demo/itemMapping.ts
-import { WeaponId, PowerupId as PowerupId2, KeyId } from "@quake2ts/game";
+import { WeaponId, PowerupId as PowerupId3, KeyId } from "@quake2ts/game";
 import { AmmoType as AmmoType3 } from "@quake2ts/game";
 import { ArmorType } from "@quake2ts/game";
 var DEMO_ITEM_MAPPING = [
@@ -8727,19 +8886,19 @@ var DEMO_ITEM_MAPPING = [
   { type: "ammo", id: AmmoType3.Rounds },
   // IT_AMMO_ROUNDS
   // Items / Powerups
-  { type: "powerup", id: PowerupId2.QuadDamage },
+  { type: "powerup", id: PowerupId3.QuadDamage },
   // IT_ITEM_QUAD
-  { type: "powerup", id: PowerupId2.QuadFire },
+  { type: "powerup", id: PowerupId3.QuadFire },
   // IT_ITEM_QUADFIRE
-  { type: "powerup", id: PowerupId2.Invulnerability },
+  { type: "powerup", id: PowerupId3.Invulnerability },
   // IT_ITEM_INVULNERABILITY
-  { type: "powerup", id: PowerupId2.Invisibility },
+  { type: "powerup", id: PowerupId3.Invisibility },
   // IT_ITEM_INVISIBILITY
-  { type: "powerup", id: PowerupId2.Silencer },
+  { type: "powerup", id: PowerupId3.Silencer },
   // IT_ITEM_SILENCER
-  { type: "powerup", id: PowerupId2.Rebreather },
+  { type: "powerup", id: PowerupId3.Rebreather },
   // IT_ITEM_REBREATHER
-  { type: "powerup", id: PowerupId2.EnviroSuit },
+  { type: "powerup", id: PowerupId3.EnviroSuit },
   // IT_ITEM_ENVIROSUIT
   { type: "health", id: "ancient_head" },
   // IT_ITEM_ANCIENT_HEAD
@@ -8747,23 +8906,23 @@ var DEMO_ITEM_MAPPING = [
   // IT_ITEM_LEGACY_HEAD
   { type: "health", id: "adrenaline" },
   // IT_ITEM_ADRENALINE
-  { type: "powerup", id: PowerupId2.Bandolier },
+  { type: "powerup", id: PowerupId3.Bandolier },
   // IT_ITEM_BANDOLIER
-  { type: "powerup", id: PowerupId2.AmmoPack },
+  { type: "powerup", id: PowerupId3.AmmoPack },
   // IT_ITEM_PACK
-  { type: "powerup", id: PowerupId2.IRGoggles },
+  { type: "powerup", id: PowerupId3.IRGoggles },
   // IT_ITEM_IR_GOGGLES
-  { type: "powerup", id: PowerupId2.DoubleDamage },
+  { type: "powerup", id: PowerupId3.DoubleDamage },
   // IT_ITEM_DOUBLE
-  { type: "powerup", id: PowerupId2.SphereVengeance },
+  { type: "powerup", id: PowerupId3.SphereVengeance },
   // IT_ITEM_SPHERE_VENGEANCE
-  { type: "powerup", id: PowerupId2.SphereHunter },
+  { type: "powerup", id: PowerupId3.SphereHunter },
   // IT_ITEM_SPHERE_HUNTER
-  { type: "powerup", id: PowerupId2.SphereDefender },
+  { type: "powerup", id: PowerupId3.SphereDefender },
   // IT_ITEM_SPHERE_DEFENDER
-  { type: "powerup", id: PowerupId2.Doppelganger },
+  { type: "powerup", id: PowerupId3.Doppelganger },
   // IT_ITEM_DOPPELGANGER
-  { type: "powerup", id: PowerupId2.TagToken },
+  { type: "powerup", id: PowerupId3.TagToken },
   // IT_ITEM_TAG_TOKEN
   // Keys
   { type: "key", id: KeyId.DataCD },
@@ -8811,17 +8970,17 @@ var DEMO_ITEM_MAPPING = [
   { type: "key", id: KeyId.BlueFlag },
   // IT_FLAG2
   // Tech
-  { type: "powerup", id: PowerupId2.TechResistance },
+  { type: "powerup", id: PowerupId3.TechResistance },
   // IT_TECH_RESISTANCE
-  { type: "powerup", id: PowerupId2.TechStrength },
+  { type: "powerup", id: PowerupId3.TechStrength },
   // IT_TECH_STRENGTH
-  { type: "powerup", id: PowerupId2.TechHaste },
+  { type: "powerup", id: PowerupId3.TechHaste },
   // IT_TECH_HASTE
-  { type: "powerup", id: PowerupId2.TechRegeneration },
+  { type: "powerup", id: PowerupId3.TechRegeneration },
   // IT_TECH_REGENERATION
-  { type: "powerup", id: PowerupId2.Flashlight },
+  { type: "powerup", id: PowerupId3.Flashlight },
   // IT_ITEM_FLASHLIGHT
-  { type: "powerup", id: PowerupId2.Compass }
+  { type: "powerup", id: PowerupId3.Compass }
   // IT_ITEM_COMPASS
 ];
 
@@ -8838,6 +8997,7 @@ var ClientNetworkHandler = class {
     // Stats for HUD
     this.stats = new Array(32).fill(0);
     this.inventory = new Array(256).fill(0);
+    this.playerNum = 0;
     this.imports = imports;
     this.callbacks = callbacks;
   }
@@ -8847,12 +9007,16 @@ var ClientNetworkHandler = class {
   setCallbacks(callbacks) {
     this.callbacks = callbacks;
   }
+  setView(view) {
+    this.view = view;
+  }
   onServerData(protocol, serverCount, attractLoop, gameDir, playerNum, levelName) {
     console.log(`Demo: Server Data - Protocol: ${protocol}, Level: ${levelName}`);
     this.configstrings.fill("");
     this.entities.clear();
     this.baselines.clear();
     this.latestFrame = null;
+    this.playerNum = playerNum;
   }
   onConfigString(index, str3) {
     this.configstrings[index] = str3;
@@ -8974,6 +9138,63 @@ var ClientNetworkHandler = class {
   onMuzzleFlash2(ent, weapon) {
   }
   onMuzzleFlash3(ent, weapon) {
+    const isLocalPlayer = ent === this.playerNum + 1;
+    if (isLocalPlayer && this.view) {
+      let pitch = 0;
+      let yaw = 0;
+      let roll = 0;
+      let kickOrigin = ZERO_VEC3;
+      const quad = G_GetPowerupStat(this.stats, PowerupId.QuadDamage);
+      const scale3 = quad ? 4 : 1;
+      switch (weapon) {
+        case MZ_SHOTGUN:
+          pitch = -2;
+          kickOrigin = { x: -2, y: 0, z: 0 };
+          break;
+        case MZ_SSHOTGUN:
+          pitch = -4;
+          kickOrigin = { x: -4, y: 0, z: 0 };
+          break;
+        case MZ_MACHINEGUN:
+          pitch = -1;
+          yaw = Math.random() - 0.5;
+          break;
+        case MZ_CHAINGUN1:
+        case MZ_CHAINGUN2:
+        case MZ_CHAINGUN3:
+          pitch = -0.5;
+          yaw = Math.random() - 0.5;
+          break;
+        case MZ_RAILGUN:
+          pitch = -3;
+          kickOrigin = { x: -3, y: 0, z: 0 };
+          break;
+        case MZ_ROCKET:
+        case MZ_GRENADE:
+          pitch = -2;
+          kickOrigin = { x: -2, y: 0, z: 0 };
+          break;
+        case MZ_BFG:
+          pitch = -5;
+          kickOrigin = { x: -2, y: 0, z: 0 };
+          break;
+        case MZ_HYPERBLASTER:
+        case MZ_BLASTER:
+          pitch = -0.5;
+          break;
+      }
+      if (pitch !== 0 || yaw !== 0 || roll !== 0) {
+        this.view.addKick({
+          pitch: pitch * scale3,
+          roll: roll * scale3,
+          durationMs: 200,
+          origin: kickOrigin
+          // Should origin be scaled? Q2 source P_AddWeaponKick only scales angles.
+          // But we have origin kick logic now. Let's assume origin kick is physical recoil and maybe doesn't scale with quad (magic damage)?
+          // P_AddWeaponKick only scales kick_angles.
+        });
+      }
+    }
     if (this.callbacks?.onMuzzleFlash3) {
       this.callbacks.onMuzzleFlash3(ent, weapon);
     }
@@ -9090,6 +9311,7 @@ var ClientNetworkHandler = class {
       // Stubs
       stats: [...ps.stats],
       kick_angles: ZERO_VEC3,
+      kick_origin: ZERO_VEC3,
       gunoffset: ZERO_VEC3,
       gunangles: ZERO_VEC3,
       gunindex: 0,
@@ -10453,7 +10675,7 @@ import {
   ClientPrediction as ClientPrediction2,
   interpolatePredictionState as interpolatePredictionState3
 } from "@quake2ts/cgame";
-import { ViewEffects as ViewEffects2 } from "@quake2ts/cgame";
+import { ViewEffects as ViewEffects3 } from "@quake2ts/cgame";
 var ZERO_VEC32 = { x: 0, y: 0, z: 0 };
 function lerp2(a, b, t) {
   return a + (b - a) * t;
@@ -10484,11 +10706,20 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
     };
     const frame = ent.frame;
     const prevFrame = prev.frame;
+    const scaleA = prev.scale !== void 0 ? prev.scale : 1;
+    const scaleB = ent.scale !== void 0 ? ent.scale : 1;
+    const scale3 = lerp2(scaleA, scaleB, alpha);
+    const getAlpha = (val) => val === void 0 || val === 0 ? 255 : val;
+    const alphaA = getAlpha(prev.alpha);
+    const alphaB = getAlpha(ent.alpha);
+    const alphaVal = lerp2(alphaA, alphaB, alpha);
+    const normalizedAlpha = alphaVal / 255;
     const mat = mat4_exports.create();
     mat4_exports.translate(mat, mat, [origin.x, origin.y, origin.z]);
     mat4_exports.rotateZ(mat, mat, angles.z * Math.PI / 180);
     mat4_exports.rotateY(mat, mat, angles.y * Math.PI / 180);
     mat4_exports.rotateX(mat, mat, angles.x * Math.PI / 180);
+    mat4_exports.scale(mat, mat, [scale3, scale3, scale3]);
     if (model.header.magic === 844121161) {
       renderables.push({
         type: "md2",
@@ -10500,7 +10731,8 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
           lerp: alpha
         },
         transform: mat,
-        skin: ent.skinNum > 0 ? configStrings.getImageName(ent.skinNum) : void 0
+        skin: ent.skinNum > 0 ? configStrings.getImageName(ent.skinNum) : void 0,
+        alpha: normalizedAlpha
       });
     } else if (model.header.magic === 860898377) {
       renderables.push({
@@ -10511,7 +10743,8 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
           frame1: frame,
           lerp: alpha
         },
-        transform: mat
+        transform: mat,
+        alpha: normalizedAlpha
         // Lighting? Skins?
       });
     }
@@ -10520,9 +10753,10 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
 }
 function createClient(imports) {
   const prediction = new ClientPrediction(imports.engine.trace);
-  const view = new ViewEffects();
+  const view = new ViewEffects2();
   const demoPlayback = new DemoPlaybackController();
   const demoHandler = new ClientNetworkHandler(imports);
+  demoHandler.setView(view);
   const menuSystem = new MenuSystem();
   const loadingScreen = new LoadingScreen();
   const errorDialog = new ErrorDialog();
@@ -10848,6 +11082,7 @@ function createClient(imports) {
           // Ensure stats are safely initialized
           stats: lastRendered.stats ? [...lastRendered.stats] : new Array(32).fill(0),
           kick_angles: ZERO_VEC32,
+          kick_origin: ZERO_VEC32,
           gunoffset: ZERO_VEC32,
           gunangles: ZERO_VEC32,
           gunindex: 0,
@@ -10946,7 +11181,7 @@ export {
   InputBindings,
   InputCommandBuffer,
   InputController,
-  ViewEffects2 as ViewEffects,
+  ViewEffects3 as ViewEffects,
   createClient,
   createDefaultBindings,
   interpolatePredictionState3 as interpolatePredictionState,