quake2ts 0.0.174 → 0.0.176

package/packages/game/dist/cjs/index.cjs

@@ -1367,7 +1367,8 @@ function pickupArmor(inventory, item, time) {
   }
   return false;
 }
-function pickupPowerup(inventory, item, time) {
+function pickupPowerup(client, item, time) {
+  const inventory = client.inventory;
   let powerupId = null;
   let icon = "";
   switch (item.id) {
@@ -1391,13 +1392,19 @@ function pickupPowerup(inventory, item, time) {
       powerupId = "enviro_suit" /* EnviroSuit */;
       icon = "p_envirosuit";
       break;
+    case "item_double":
+      powerupId = "double_damage" /* DoubleDamage */;
+      icon = "p_double";
+      break;
   }
   if (powerupId) {
     const expiresAt = inventory.powerups.get(powerupId);
-    if (expiresAt && expiresAt > time) {
-      inventory.powerups.set(powerupId, expiresAt + item.timer);
-    } else {
-      inventory.powerups.set(powerupId, time + item.timer);
+    const newExpiresAt = expiresAt && expiresAt > time ? expiresAt + item.timer * 1e3 : time + item.timer * 1e3;
+    inventory.powerups.set(powerupId, newExpiresAt);
+    if (powerupId === "quad" /* QuadDamage */) {
+      client.quad_time = newExpiresAt / 1e3;
+    } else if (powerupId === "double_damage" /* DoubleDamage */) {
+      client.double_time = newExpiresAt / 1e3;
     }
     setPickup(inventory, icon, time);
     return true;
@@ -4392,7 +4399,7 @@ function createPowerupPickupEntity(game, powerupItem) {
       if (!other || !other.client) {
         return;
       }
-      if (pickupPowerup(other.client.inventory, powerupItem, game.time * 1e3)) {
+      if (pickupPowerup(other.client, powerupItem, game.time * 1e3)) {
         game.sound?.(other, 0, "items/pkup.wav", 1, 1, 0);
         game.centerprintf?.(other, `You got the ${powerupItem.name}`);
         self.solid = 0 /* Not */;
@@ -4894,6 +4901,23 @@ var EntityDamageFlags = /* @__PURE__ */ ((EntityDamageFlags2) => {
   EntityDamageFlags2[EntityDamageFlags2["NO_DAMAGE_EFFECTS"] = 8] = "NO_DAMAGE_EFFECTS";
   return EntityDamageFlags2;
 })(EntityDamageFlags || {});
+function getDamageModifier(attacker, time) {
+  if (!attacker) {
+    return 1;
+  }
+  const client = attacker.client;
+  if (!client) {
+    return 1;
+  }
+  let modifier = 1;
+  if (client.quad_time && client.quad_time > time) {
+    modifier *= 4;
+  }
+  if (client.double_time && client.double_time > time) {
+    modifier *= 2;
+  }
+  return modifier;
+}
 function applyKnockback(targ, attacker, dir, knockback, dflags) {
   const hasNoKnockback = hasAnyDamageFlag(dflags, 8 /* NO_KNOCKBACK */) || ((targ.flags ?? 0) & 4 /* NO_KNOCKBACK */) !== 0;
   if (hasNoKnockback || knockback === 0) {
@@ -4936,22 +4960,25 @@ function targetCenter(ent) {
   }
   return ent.origin;
 }
-function T_Damage(targ, inflictor, attacker, dir, point, normal, damage, knockback, dflags, mod, multicast) {
-  if (!targ.takedamage || damage <= 0) {
+function T_Damage(targ, inflictor, attacker, dir, point, normal, damage, knockback, dflags, mod, time, multicast) {
+  if (!targ.takedamage) {
     return null;
   }
-  const protectedByGod = !hasAnyDamageFlag(dflags, 32 /* NO_PROTECTION */) && ((targ.flags ?? 0) & 1 /* GODMODE */) !== 0;
+  const modifier = getDamageModifier(attacker, time);
+  const modifiedDamage = damage * modifier;
+  const modifiedKnockback = knockback * modifier;
+  const protectedByGod = !hasAnyDamageFlag(dflags, 32 /* NO_PROTECTION */) && ((targ.flags ?? 0) & 1 /* GODMODE */) !== 0 && modifiedDamage > 0;
   if (protectedByGod) {
     return {
       take: 0,
       psave: 0,
-      asave: damage,
+      asave: modifiedDamage,
       knocked: { x: 0, y: 0, z: 0 },
       killed: false
     };
   }
-  const knocked = applyKnockback(targ, attacker, dir, knockback, dflags);
-  const [take, psave, asave, remainingCells, remainingArmor] = applyProtection(targ, point, normal, damage, dflags);
+  const knocked = applyKnockback(targ, attacker, dir, modifiedKnockback, dflags);
+  const [take, psave, asave, remainingCells, remainingArmor] = applyProtection(targ, point, normal, modifiedDamage, dflags);
   if (targ.powerArmor && remainingCells !== void 0) {
     targ.powerArmor.cellCount = remainingCells;
   }
@@ -4980,7 +5007,7 @@ function T_Damage(targ, inflictor, attacker, dir, point, normal, damage, knockba
   }
   return { take: actualTake, psave, asave, knocked, killed, remainingCells, remainingArmor };
 }
-function T_RadiusDamage(entities, inflictor, attacker, damage, ignore, radius, dflags, mod, options = {}, multicast) {
+function T_RadiusDamage(entities, inflictor, attacker, damage, ignore, radius, dflags, mod, time, options = {}, multicast) {
   const hits = [];
   const inflictorCenter = targetCenter(inflictor);
   const canDamage = options.canDamage ?? (() => true);
@@ -5000,7 +5027,7 @@ function T_RadiusDamage(entities, inflictor, attacker, damage, ignore, radius, d
     }
     const adjustedDamage = ent === attacker ? points * 0.5 : points;
     const dir = normalizeVec3(subtractVec3(ent.origin, inflictorCenter));
-    const result = T_Damage(ent, inflictor, attacker, dir, entCenter, dir, adjustedDamage, adjustedDamage, dflags | 1 /* RADIUS */, mod, multicast);
+    const result = T_Damage(ent, inflictor, attacker, dir, entCenter, dir, adjustedDamage, adjustedDamage, dflags | 1 /* RADIUS */, mod, time, multicast);
     hits.push({ target: ent, result, appliedDamage: adjustedDamage });
   }
   return hits;
@@ -5349,6 +5376,7 @@ function fire_hit(self, aim, damage, kick, context) {
     kick,
     0 /* NONE */,
     0 /* UNKNOWN */,
+    context.timeSeconds,
     context.multicast.bind(context)
   );
   return true;
@@ -5431,7 +5459,7 @@ function berserk_attack_slam(self, context) {
     const points = Math.max(1, damage * amount * amount);
     const k = kick * amount * amount;
     const dir = normalizeVec3(subtractVec3(ent.origin, tr.endpos));
-    T_Damage(ent, self, self, dir, ent.origin, dir, points, k, 1 /* RADIUS */, 0 /* UNKNOWN */, context.multicast.bind(context));
+    T_Damage(ent, self, self, dir, ent.origin, dir, points, k, 1 /* RADIUS */, 0 /* UNKNOWN */, context.timeSeconds, context.multicast.bind(context));
     if (ent.client) {
       const currentVel = { ...ent.velocity };
       currentVel.z = Math.max(270, currentVel.z);
@@ -5708,11 +5736,12 @@ function createRocket(sys, owner, start, dir, damage, radiusDamage, speed, flash
         0,
         0 /* NONE */,
         8 /* ROCKET */,
+        sys.timeSeconds,
         sys.multicast.bind(sys)
       );
     }
     const entities = sys.findByRadius(self.origin, 120);
-    T_RadiusDamage(entities, self, self.owner, radiusDamage, self.owner, 120, 0 /* NONE */, 9 /* R_SPLASH */, {}, sys.multicast.bind(sys));
+    T_RadiusDamage(entities, self, self.owner, radiusDamage, self.owner, 120, 0 /* NONE */, 9 /* R_SPLASH */, sys.timeSeconds, {}, sys.multicast.bind(sys));
     sys.multicast(self.origin, 2 /* Phs */, ServerCommand.temp_entity, TempEntity.ROCKET_EXPLOSION, self.origin);
     sys.free(self);
   };
@@ -5732,7 +5761,7 @@ function createGrenade(sys, owner, start, dir, damage, speed) {
   grenade.maxs = { x: 4, y: 4, z: 4 };
   const explode = (self) => {
     const entities = sys.findByRadius(self.origin, 120);
-    T_RadiusDamage(entities, self, self.owner, damage, self.owner, 120, 0 /* NONE */, 6 /* GRENADE */, {}, sys.multicast.bind(sys));
+    T_RadiusDamage(entities, self, self.owner, damage, self.owner, 120, 0 /* NONE */, 6 /* GRENADE */, sys.timeSeconds, {}, sys.multicast.bind(sys));
     sys.multicast(self.origin, 2 /* Phs */, ServerCommand.temp_entity, TempEntity.GRENADE_EXPLOSION, self.origin);
     sys.free(self);
   };
@@ -5778,6 +5807,7 @@ function createBlasterBolt(sys, owner, start, dir, damage, speed, mod) {
         // Kick
         0 /* NONE */,
         mod,
+        sys.timeSeconds,
         sys.multicast.bind(sys)
       );
     } else {
@@ -5832,6 +5862,7 @@ function fireBfgPiercingLaser(sys, bfg, target, damage) {
           // kick
           4 /* ENERGY */,
           12 /* BFG_LASER */,
+          sys.timeSeconds,
           sys.multicast.bind(sys)
         );
       }
@@ -5917,6 +5948,7 @@ function bfgExplode(self, sys) {
           0,
           4 /* ENERGY */,
           14 /* BFG_EFFECT */,
+          sys.timeSeconds,
           sys.multicast.bind(sys)
         );
       }
@@ -5960,6 +5992,7 @@ function createBfgBall(sys, owner, start, dir, damage, speed, damageRadius) {
         0,
         4 /* ENERGY */,
         13 /* BFG_BLAST */,
+        sys.timeSeconds,
         sys.multicast.bind(sys)
       );
     }
@@ -5973,6 +6006,7 @@ function createBfgBall(sys, owner, start, dir, damage, speed, damageRadius) {
       100,
       4 /* ENERGY */,
       13 /* BFG_BLAST */,
+      sys.timeSeconds,
       {},
       sys.multicast.bind(sys)
     );
@@ -6030,7 +6064,8 @@ function monster_fire_bullet_v2(self, start, dir, damage, kick, hspread, vspread
     damage,
     kick,
     16 /* BULLET */ | 2 /* NO_ARMOR */,
-    mod
+    mod,
+    context.timeSeconds
   );
 }
 var monster_fire_bullet = monster_fire_bullet_v2;
@@ -6066,7 +6101,8 @@ function monster_fire_railgun(self, start, aim, damage, kick, flashtype, context
       damage,
       kick,
       4 /* ENERGY */ | 2 /* NO_ARMOR */,
-      11 /* RAILGUN */
+      11 /* RAILGUN */,
+      context.timeSeconds
     );
   }
 }
@@ -6090,7 +6126,8 @@ function monster_fire_hit(self, aim, damage, kick, context) {
       damage,
       kick,
       0,
-      0 /* UNKNOWN */
+      0 /* UNKNOWN */,
+      context.timeSeconds
     );
     return true;
   }
@@ -6104,7 +6141,7 @@ function dabeam_update(self, context) {
   const end = addVec3(start, scaleVec3(self.movedir, 2048));
   const tr = context.trace(start, end, ZERO_VEC3, ZERO_VEC3, self, CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_PLAYER | CONTENTS_DEADMONSTER);
   if (self.dmg > 0 && tr.ent && tr.ent.takedamage && tr.ent !== self.owner) {
-    T_Damage(tr.ent, self, self.owner, self.movedir, tr.endpos, ZERO_VEC3, self.dmg, 0, 4 /* ENERGY */, 31 /* TARGET_LASER */);
+    T_Damage(tr.ent, self, self.owner, self.movedir, tr.endpos, ZERO_VEC3, self.dmg, 0, 4 /* ENERGY */, 31 /* TARGET_LASER */, context.timeSeconds);
   }
   if (tr.ent && tr.ent.solid === 3 /* Bsp */) {
     context.multicast(tr.endpos, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.LASER_SPARKS, 10, tr.endpos, tr.plane?.normal || ZERO_VEC3, self.skin);
@@ -6457,7 +6494,7 @@ function brain_tounge_attack(self, context) {
   context.engine.sound?.(self, 0, "brain/brnatck3.wav", 1, 1, 0);
   context.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.PARASITE_ATTACK, self, start, end);
   const dir = subtractVec3(start, end);
-  T_Damage(self.enemy, self, self, dir, self.enemy.origin, ZERO_VEC3, 5, 0, 0, 37 /* BRAINTENTACLE */);
+  T_Damage(self.enemy, self, self, dir, self.enemy.origin, ZERO_VEC3, 5, 0, 0, 37 /* BRAINTENTACLE */, context.timeSeconds);
   self.origin = { ...self.origin, z: self.origin.z + 1 };
   const forward = angleVectors(self.angles).forward;
   self.enemy.velocity = scaleVec3(forward, -1200);
@@ -7688,7 +7725,8 @@ function flyer_slash(self, context) {
       damage,
       5,
       2 /* NO_ARMOR */,
-      0 /* UNKNOWN */
+      0 /* UNKNOWN */,
+      context.timeSeconds
     );
   }
 }
@@ -7868,7 +7906,7 @@ function gladiator_melee(self, context) {
     z: self.origin.z + (self.viewheight || 0)
   };
   const dir = normalizeVec3(subtractVec3(self.enemy.origin, start));
-  T_Damage(self.enemy, self, self, dir, self.origin, { x: 0, y: 0, z: 0 }, 20, 10, 0, 0 /* UNKNOWN */);
+  T_Damage(self.enemy, self, self, dir, self.origin, { x: 0, y: 0, z: 0 }, 20, 10, 0, 0 /* UNKNOWN */, context.timeSeconds);
 }
 function gladiator_fire_railgun(self, context) {
   if (!self.enemy) return;
@@ -9393,7 +9431,8 @@ function mutant_swing(self, damage, context) {
     damage,
     0,
     0,
-    0 /* UNKNOWN */
+    0 /* UNKNOWN */,
+    context.timeSeconds
   );
 }
 function mutant_hit_right(self, context) {
@@ -9430,7 +9469,8 @@ function mutant_jump_touch(self, other, plane, surf) {
       50,
       0,
       0,
-      0 /* UNKNOWN */
+      0 /* UNKNOWN */,
+      0
     );
   }
   if (!other || !other.takedamage && other.solid !== 0 /* Not */) {
@@ -9865,7 +9905,8 @@ function parasite_drain_attack(self, context) {
     damage,
     0,
     8 /* NO_KNOCKBACK */,
-    0 /* UNKNOWN */
+    0 /* UNKNOWN */,
+    context.timeSeconds
   );
   if (self.health < self.max_health) {
     self.health += damage;
@@ -12526,8 +12567,8 @@ var EnvironmentalFlags = /* @__PURE__ */ ((EnvironmentalFlags2) => {
   EnvironmentalFlags2[EnvironmentalFlags2["IMMUNE_SLIME"] = 4] = "IMMUNE_SLIME";
   return EnvironmentalFlags2;
 })(EnvironmentalFlags || {});
-function applyDamageEvent(target, amount, mod) {
-  return T_Damage(target, null, null, ZERO2, target.origin, ZERO2, amount, 0, 2 /* NO_ARMOR */, mod);
+function applyDamageEvent(target, amount, mod, time) {
+  return T_Damage(target, null, null, ZERO2, target.origin, ZERO2, amount, 0, 2 /* NO_ARMOR */, mod, time);
 }
 function applyEnvironmentalDamage(target, nowMs) {
   const events = [];
@@ -12542,7 +12583,7 @@ function applyEnvironmentalDamage(target, nowMs) {
     if (target.airFinished < nowMs && target.painDebounceTime <= nowMs) {
       const elapsedSeconds = Math.floor((nowMs - target.airFinished) / 1e3);
       const amount = Math.min(15, 2 + 2 * elapsedSeconds);
-      const result = applyDamageEvent(target, amount, 17 /* WATER */);
+      const result = applyDamageEvent(target, amount, 17 /* WATER */, nowMs / 1e3);
       target.painDebounceTime = nowMs + 1e3;
       events.push({ mod: 17 /* WATER */, amount, result });
     }
@@ -12556,12 +12597,12 @@ function applyEnvironmentalDamage(target, nowMs) {
     if (target.damageDebounceTime <= nowMs) {
       if ((target.watertype & CONTENTS_LAVA) !== 0 && (flags & 2 /* IMMUNE_LAVA */) === 0) {
         const amount = 10 * target.waterlevel;
-        const result = applyDamageEvent(target, amount, 19 /* LAVA */);
+        const result = applyDamageEvent(target, amount, 19 /* LAVA */, nowMs / 1e3);
         target.damageDebounceTime = nowMs + 100;
         events.push({ mod: 19 /* LAVA */, amount, result });
       } else if ((target.watertype & CONTENTS_SLIME) !== 0 && (flags & 4 /* IMMUNE_SLIME */) === 0) {
         const amount = 4 * target.waterlevel;
-        const result = applyDamageEvent(target, amount, 18 /* SLIME */);
+        const result = applyDamageEvent(target, amount, 18 /* SLIME */, nowMs / 1e3);
         target.damageDebounceTime = nowMs + 100;
         events.push({ mod: 18 /* SLIME */, amount, result });
       }
@@ -12629,7 +12670,8 @@ function applyFallingDamage(target, context) {
       result.damage,
       0,
       2 /* NO_ARMOR */,
-      23 /* FALLING */
+      23 /* FALLING */,
+      0
     );
   }
   return result;
@@ -12639,7 +12681,7 @@ function applyCrushDamage(crusher, target, options = {}) {
   const gibDamage = options.gibDamage ?? 100;
   const baseDamage = options.baseDamage ?? crusher.dmg ?? 10;
   const amount = !target.isMonster && !target.isClient ? nonLivingDamage : target.health < 1 ? gibDamage : baseDamage;
-  const result = T_Damage(target, crusher, crusher, ZERO2, target.origin, ZERO2, amount, 1, 0 /* NONE */, 20 /* CRUSH */);
+  const result = T_Damage(target, crusher, crusher, ZERO2, target.origin, ZERO2, amount, 1, 0 /* NONE */, 20 /* CRUSH */, 0);
   return { amount, result };
 }
 function absoluteBounds(ent) {
@@ -12669,7 +12711,7 @@ function killBox(teleporter, targets, options = {}) {
     if (!boxesIntersect(teleBounds, absoluteBounds(target))) {
       continue;
     }
-    const result = T_Damage(target, teleporter, teleporter, ZERO2, target.origin, ZERO2, 1e5, 0, 32 /* NO_PROTECTION */, mod);
+    const result = T_Damage(target, teleporter, teleporter, ZERO2, target.origin, ZERO2, 1e5, 0, 32 /* NO_PROTECTION */, mod, 0);
     events.push({ target, result });
     if (!result || !result.killed || target.health > 0) {
       cleared = false;
@@ -12916,6 +12958,45 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
     entities.beginFrame(startTimeMs / 1e3);
     entities.runFrame();
   };
+  const runPlayerMove = (player, command) => {
+    const pcmd = {
+      forwardmove: command.forwardmove,
+      sidemove: command.sidemove,
+      upmove: command.upmove,
+      buttons: command.buttons,
+      msec: command.msec,
+      angles: command.angles
+    };
+    const playerState = {
+      origin: player.origin,
+      velocity: player.velocity,
+      onGround: false,
+      // This will be calculated by pmove
+      waterLevel: player.waterlevel,
+      // Pass waterlevel
+      mins: player.mins,
+      maxs: player.maxs,
+      damageAlpha: 0,
+      damageIndicators: [],
+      viewAngles: player.angles,
+      blend: [0, 0, 0, 0]
+    };
+    const traceAdapter = (start, end) => {
+      const result = trace(start, player.mins, player.maxs, end, player, 268435457);
+      return {
+        fraction: result.fraction,
+        endpos: result.endpos,
+        allsolid: result.allsolid,
+        startsolid: result.startsolid,
+        planeNormal: result.plane?.normal
+      };
+    };
+    const pointContentsAdapter = (point) => pointcontents(point);
+    const newState = applyPmove(playerState, pcmd, traceAdapter, pointContentsAdapter);
+    player.origin = newState.origin;
+    player.velocity = newState.velocity;
+    player.angles = newState.viewAngles;
+  };
   return {
     init(startTimeMs) {
       resetState(startTimeMs);
@@ -12955,45 +13036,14 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
       origin = { ...player.origin };
       return player;
     },
+    clientThink(ent, cmd) {
+      runPlayerMove(ent, cmd);
+    },
     frame(step, command) {
       const context = frameLoop.advance(step);
       const player = entities.find((e) => e.classname === "player");
       if (command && player) {
-        const pcmd = {
-          forwardmove: command.forwardmove,
-          sidemove: command.sidemove,
-          upmove: command.upmove,
-          buttons: command.buttons,
-          msec: command.msec,
-          angles: command.angles
-        };
-        const playerState = {
-          origin: player.origin,
-          velocity: player.velocity,
-          onGround: false,
-          waterLevel: 0,
-          mins: player.mins,
-          maxs: player.maxs,
-          damageAlpha: 0,
-          damageIndicators: [],
-          viewAngles: player.angles,
-          blend: [0, 0, 0, 0]
-        };
-        const traceAdapter = (start, end) => {
-          const result = trace(start, player.mins, player.maxs, end, player, 268435457);
-          return {
-            fraction: result.fraction,
-            endpos: result.endpos,
-            allsolid: result.allsolid,
-            startsolid: result.startsolid,
-            planeNormal: result.plane?.normal
-          };
-        };
-        const pointContentsAdapter = (point) => pointcontents(point);
-        const newState = applyPmove(playerState, pcmd, traceAdapter, pointContentsAdapter);
-        player.origin = newState.origin;
-        player.velocity = newState.velocity;
-        player.angles = newState.viewAngles;
+        runPlayerMove(player, command);
       }
       return snapshot(context.frame);
     },