quake2ts 0.0.416 → 0.0.418

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

@@ -13973,6 +13973,33 @@ var ClientEffectSystem = class {
   }
 };
 
+// src/blend.ts
+var createBlendState = () => ({
+  damageAlpha: 0,
+  bonusAlpha: 0,
+  lastFlashes: 0
+});
+var updateBlend = (state, ps, dt, damageIntensity = 0) => {
+  state.damageAlpha -= dt;
+  if (state.damageAlpha < 0) state.damageAlpha = 0;
+  if (damageIntensity > 0) {
+    state.damageAlpha = damageIntensity;
+  }
+  state.bonusAlpha -= dt;
+  if (state.bonusAlpha < 0) state.bonusAlpha = 0;
+  const flashes = ps.stats ? ps.stats[PlayerStat.STAT_FLASHES] ?? 0 : 0;
+  if (flashes !== state.lastFlashes) {
+    state.bonusAlpha = 0.6;
+    state.lastFlashes = flashes;
+  }
+  if (state.bonusAlpha > 0) {
+    return [1, 1, 0, state.bonusAlpha * 0.3];
+  } else if (state.damageAlpha > 0) {
+    return [1, 0, 0, state.damageAlpha * 0.5];
+  }
+  return [0, 0, 0, 0];
+};
+
 // src/input/bindings.ts
 var DEFAULT_BINDINGS = [
   { code: "KeyW", command: "+forward" },
@@ -14667,6 +14694,9 @@ function createClient(imports) {
   let pauseMenuFactory;
   let optionsFactory;
   const configStrings = new ClientConfigStrings();
+  const blendState = createBlendState();
+  let currentBlend = [0, 0, 0, 0];
+  let pendingDamage = 0;
   let latestFrame;
   let lastRenderTime = 0;
   let clientInAutoDemo = false;
@@ -14738,6 +14768,9 @@ function createClient(imports) {
       if (pos) {
         effectSystem.onTempEntity(type, pos, time);
       }
+    },
+    onDamage: (indicators) => {
+      pendingDamage = 0.5;
     }
   });
   demoPlayback.setHandler(demoHandler);
@@ -15048,7 +15081,16 @@ function createClient(imports) {
         }
       }
       const frameTimeMs = sample.latest && sample.previous ? Math.max(0, sample.latest.timeMs - sample.previous.timeMs) : 0;
+      if (frameTimeMs > 0) {
+        prediction.decayError(frameTimeMs / 1e3);
+      }
       lastView = view.sample(lastRendered, frameTimeMs);
+      if (lastRendered) {
+        currentBlend = updateBlend(blendState, lastRendered, frameTimeMs / 1e3, pendingDamage);
+        pendingDamage = 0;
+      } else {
+        currentBlend = [0, 0, 0, 0];
+      }
       const command = {};
       const timeSeconds = sample.nowMs / 1e3;
       dlightManager.update(timeSeconds);
@@ -15143,7 +15185,7 @@ function createClient(imports) {
           maxs: { x: 16, y: 16, z: 32 },
           damageAlpha: lastRendered.damageAlpha ?? 0,
           damageIndicators: lastRendered.damageIndicators ?? [],
-          blend: lastRendered.blend ?? [0, 0, 0, 0],
+          blend: currentBlend,
           pickupIcon: lastRendered.pickupIcon,
           centerPrint: void 0,
           // Handled by CGame MessageSystem now