quake2ts 0.0.484 → 0.0.486

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

@@ -153,6 +153,7 @@ __export(index_exports, {
   getAmmoItemDefinition: () => getAmmoItemDefinition,
   getWeaponState: () => getWeaponState,
   giveAmmoItem: () => giveAmmoItem,
+  giveItem: () => giveItem,
   giveWeapon: () => giveWeapon,
   hasAnyDamageFlag: () => hasAnyDamageFlag,
   hasItem: () => hasItem,
@@ -2077,6 +2078,13 @@ var DamageFlags = /* @__PURE__ */ ((DamageFlags2) => {
   DamageFlags2[DamageFlags2["NO_DAMAGE_EFFECTS"] = 1024] = "NO_DAMAGE_EFFECTS";
   return DamageFlags2;
 })(DamageFlags || {});
+var EntityDamageFlags = /* @__PURE__ */ ((EntityDamageFlags2) => {
+  EntityDamageFlags2[EntityDamageFlags2["GODMODE"] = 1] = "GODMODE";
+  EntityDamageFlags2[EntityDamageFlags2["IMMORTAL"] = 2] = "IMMORTAL";
+  EntityDamageFlags2[EntityDamageFlags2["NO_KNOCKBACK"] = 4] = "NO_KNOCKBACK";
+  EntityDamageFlags2[EntityDamageFlags2["NO_DAMAGE_EFFECTS"] = 8] = "NO_DAMAGE_EFFECTS";
+  return EntityDamageFlags2;
+})(EntityDamageFlags || {});
 function hasAnyDamageFlag(flags, mask) {
   return (flags & mask) !== 0;
 }
@@ -4063,13 +4071,6 @@ var MulticastType = /* @__PURE__ */ ((MulticastType2) => {
 })(MulticastType || {});
 
 // src/combat/damage.ts
-var EntityDamageFlags = /* @__PURE__ */ ((EntityDamageFlags2) => {
-  EntityDamageFlags2[EntityDamageFlags2["GODMODE"] = 1] = "GODMODE";
-  EntityDamageFlags2[EntityDamageFlags2["IMMORTAL"] = 2] = "IMMORTAL";
-  EntityDamageFlags2[EntityDamageFlags2["NO_KNOCKBACK"] = 4] = "NO_KNOCKBACK";
-  EntityDamageFlags2[EntityDamageFlags2["NO_DAMAGE_EFFECTS"] = 8] = "NO_DAMAGE_EFFECTS";
-  return EntityDamageFlags2;
-})(EntityDamageFlags || {});
 function getDamageModifier(attacker, time) {
   if (!attacker) {
     return 1;
@@ -4133,6 +4134,18 @@ function T_Damage(targ, inflictor, attacker, dir, point, normal, damage, knockba
   if (!targ.takedamage) {
     return null;
   }
+  const client = targ.client;
+  if (client && client.enviro_time && client.enviro_time > time) {
+    if (mod === 18 /* SLIME */ || mod === 19 /* LAVA */) {
+      return {
+        take: 0,
+        psave: 0,
+        asave: 0,
+        knocked: { x: 0, y: 0, z: 0 },
+        killed: false
+      };
+    }
+  }
   const modifier = getDamageModifier(attacker, time);
   const modifiedDamage = damage * modifier;
   const modifiedKnockback = knockback * modifier;
@@ -5314,8 +5327,14 @@ var EntitySystem = class {
   linkentity(ent) {
     this.imports.linkentity(ent);
   }
-  multicast(origin, type, event, ...args) {
-    this.imports.multicast(origin, type, event, ...args);
+  link(ent) {
+    this.linkentity(ent);
+  }
+  unlink(ent) {
+    this.spatialGrid.remove(ent);
+  }
+  multicast(origin, type, ServerCommand6, ...args) {
+    this.imports.multicast(origin, type, ServerCommand6, ...args);
   }
   unicast(ent, reliable, event, ...args) {
     this.imports.unicast(ent, reliable, event, ...args);
@@ -9037,12 +9056,49 @@ function fireHyperBlaster(game, player) {
 }
 function fireBlaster(game, player) {
   if (!player.client) return;
-  game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_BLASTER);
-  applyKick(player, -0.5, 0, 0);
-  setPlayerAttackAnim(player);
-  const { forward, right, up } = angleVectors(player.angles);
-  const source = P_ProjectSource(game, player, { x: 8, y: 8, z: -8 }, forward, right, up);
-  createBlasterBolt(game.entities, player, source, forward, 15, 1500, 1 /* BLASTER */);
+  if (player.client.buttons & 32) {
+    game.sound(player, 0, "weapons/swing.wav", 1, ATTN_NORM, 0);
+    applyKick(player, -2, 0, 0);
+    setPlayerAttackAnim(player);
+    const { forward, right, up } = angleVectors(player.angles);
+    const source = P_ProjectSource(game, player, { x: 8, y: 8, z: -8 }, forward, right, up);
+    const range = 64;
+    const damage = 50;
+    const kick = 100;
+    const end = { x: source.x + forward.x * range, y: source.y + forward.y * range, z: source.z + forward.z * range };
+    const trace = game.trace(source, null, null, end, player, MASK_SHOT);
+    if (trace.fraction < 1) {
+      if (trace.ent && trace.ent.takedamage) {
+        T_Damage(
+          trace.ent,
+          player,
+          player,
+          forward,
+          trace.endpos,
+          trace.plane ? trace.plane.normal : ZERO_VEC3,
+          damage,
+          kick,
+          0,
+          1 /* BLASTER */,
+          game.time,
+          game.multicast
+        );
+        game.sound(player, 0, "weapons/tink1.wav", 1, ATTN_NORM, 0);
+      } else {
+        game.sound(player, 0, "weapons/hithard.wav", 1, ATTN_NORM, 0);
+        if (trace.plane) {
+          game.multicast(trace.endpos, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.GUNSHOT, trace.endpos, trace.plane.normal);
+        }
+      }
+    }
+  } else {
+    game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_BLASTER);
+    applyKick(player, -0.5, 0, 0);
+    setPlayerAttackAnim(player);
+    const { forward, right, up } = angleVectors(player.angles);
+    const source = P_ProjectSource(game, player, { x: 8, y: 8, z: -8 }, forward, right, up);
+    createBlasterBolt(game.entities, player, source, forward, 15, 1500, 1 /* BLASTER */);
+  }
 }
 function fireRocket(game, player) {
   if (!player.client) return;
@@ -9265,7 +9321,7 @@ function Weapon_Generic(ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST, FRAME_IDLE_LA
     return;
   }
   if (client.weaponstate === 0 /* WEAPON_READY */) {
-    if (client.buttons & 1) {
+    if (client.buttons & 1 || client.buttons & 32) {
       client.weaponstate = 3 /* WEAPON_FIRING */;
       client.gun_frame = FRAME_ACTIVATE_LAST + 1;
       return;
@@ -10254,6 +10310,64 @@ var FLAG_ITEMS = {
   }
 };
 
+// src/inventory/give.ts
+function giveItem(entity, classname) {
+  if (!entity.client) return false;
+  const client = entity.client;
+  const inventory = client.inventory;
+  const time = 0;
+  const weapon = WEAPON_ITEMS[classname];
+  if (weapon) {
+    return pickupWeapon(inventory, weapon, time);
+  }
+  const isAmmo = Object.values(AmmoItemId).includes(classname);
+  if (isAmmo) {
+    const res = giveAmmoItem(inventory, classname);
+    return res.pickedUp;
+  }
+  const healthItem = HEALTH_ITEMS[classname];
+  if (healthItem) {
+    if (canPickupHealth(inventory, entity.health, healthItem)) {
+      const count = healthItem.amount;
+      const max = healthItem.max;
+      if (entity.health < max) {
+        entity.health += count;
+        if (entity.health > max) entity.health = max;
+        return true;
+      }
+      if (classname === "item_health_mega") {
+        if (entity.health < max) {
+          entity.health += count;
+          return true;
+        }
+        return false;
+      }
+    }
+    return false;
+  }
+  const armorItem = ARMOR_ITEMS[classname];
+  if (armorItem) {
+    return pickupArmor(inventory, armorItem, time);
+  }
+  const powerupItem = POWERUP_ITEMS[classname];
+  if (powerupItem) {
+    return pickupPowerup(client, powerupItem, time);
+  }
+  const powerArmorItem = POWER_ARMOR_ITEMS[classname];
+  if (powerArmorItem) {
+    return pickupPowerArmor(inventory, powerArmorItem, time);
+  }
+  const keyItem = KEY_ITEMS[classname];
+  if (keyItem) {
+    return pickupKey(inventory, keyItem, time);
+  }
+  const flagItem = FLAG_ITEMS[classname];
+  if (flagItem) {
+    return pickupFlag(client, flagItem, time);
+  }
+  return false;
+}
+
 // src/entities/items/common.ts
 function handleItemPickup(game, self, other, respawnTime = 30) {
   if (!game.deathmatch) {
@@ -26010,6 +26124,11 @@ function player_think(self, sys) {
     return;
   }
   const nowMs = sys.timeSeconds * 1e3;
+  if (self.client.invincible_time && self.client.invincible_time > sys.timeSeconds) {
+    self.flags = (self.flags || 0) | 1 /* GODMODE */;
+  } else {
+    self.flags = (self.flags || 0) & ~1 /* GODMODE */;
+  }
   const quadTime = self.client.quad_time || 0;
   const doubleTime = self.client.double_time || 0;
   const soundTime = self.client.quadsound_time || 0;
@@ -26114,106 +26233,6 @@ function populatePlayerStats(player, timeSeconds) {
   return statArray;
 }
 
-// src/save/adapter.ts
-function createSerializedGameState(context) {
-  const { entitySystem, levelClock, random: random5 } = context;
-  const player = entitySystem.find((e) => e.classname === "player");
-  const sysSnapshot = entitySystem.createSnapshot();
-  const playerState = {
-    origin: player ? { ...player.origin } : { x: 0, y: 0, z: 0 },
-    velocity: player ? { ...player.velocity } : { x: 0, y: 0, z: 0 },
-    viewAngles: player ? { ...player.angles } : { x: 0, y: 0, z: 0 },
-    onGround: player ? player.groundentity !== null : false,
-    waterLevel: player ? player.waterlevel : 0,
-    mins: player ? { ...player.mins } : { x: -16, y: -16, z: -24 },
-    maxs: player ? { ...player.maxs } : { x: 16, y: 16, z: 32 },
-    damageAlpha: player?.client?.damage_alpha ?? 0,
-    damageIndicators: [],
-    // Transient
-    blend: [0, 0, 0, 0],
-    // Transient
-    stats: player ? populatePlayerStats(player, levelClock.current.timeSeconds) : [],
-    kick_angles: player?.client?.kick_angles ?? { x: 0, y: 0, z: 0 },
-    kick_origin: player?.client?.kick_origin ?? { x: 0, y: 0, z: 0 },
-    gunoffset: { x: 0, y: 0, z: 0 },
-    gunangles: { x: 0, y: 0, z: 0 },
-    gunindex: 0,
-    // Q2 Network Compatibility
-    pm_type: player?.client?.pm_type ?? 0,
-    pm_time: player?.client?.pm_time ?? 0,
-    pm_flags: player?.client?.pm_flags ?? 0,
-    gun_frame: player?.client?.gun_frame ?? 0,
-    rdflags: player?.client?.rdflags ?? 0,
-    fov: player?.client?.fov ?? 90,
-    renderfx: player?.renderfx ?? 0
-  };
-  return {
-    mapName: entitySystem.level.mapname || "unknown",
-    playerState,
-    entities: sysSnapshot.entities,
-    levelState: sysSnapshot.level,
-    time: levelClock.current.timeSeconds,
-    playerInventory: player?.client?.inventory ? serializePlayerInventory(player.client.inventory) : void 0,
-    rngState: random5?.getState(),
-    _internalSnapshot: sysSnapshot
-  };
-}
-function applySerializedGameState(state, context) {
-  const { entitySystem, levelClock, random: random5 } = context;
-  levelClock.restore({
-    frameNumber: 0,
-    // Unknown in this format, reset to 0
-    timeSeconds: state.time,
-    previousTimeSeconds: state.time,
-    deltaSeconds: 0
-  });
-  if (random5 && state.rngState) {
-    random5.setState(state.rngState);
-  }
-  if (state._internalSnapshot) {
-    entitySystem.restore(state._internalSnapshot);
-  } else {
-    console.warn("Restoring from partial SerializedGameState. Thinks and Pool state may be lost.");
-    const partialSnapshot = {
-      timeSeconds: state.time,
-      pool: {
-        capacity: state.entities.length + 32,
-        // Estimate
-        activeOrder: state.entities.map((e) => e.index),
-        // Naive
-        freeList: [],
-        // Assume none
-        pendingFree: []
-      },
-      entities: state.entities,
-      thinks: [],
-      // LOST
-      awareness: {
-        frameNumber: 0,
-        sightEntityIndex: null,
-        sightEntityFrame: 0,
-        soundEntityIndex: null,
-        soundEntityFrame: 0,
-        sound2EntityIndex: null,
-        sound2EntityFrame: 0,
-        sightClientIndex: null
-      },
-      crossLevelFlags: 0,
-      crossUnitFlags: 0,
-      level: state.levelState
-    };
-    entitySystem.restore(partialSnapshot);
-  }
-  const player = entitySystem.find((e) => e.classname === "player");
-  if (player && state.playerInventory) {
-    const inventory = deserializePlayerInventory(state.playerInventory);
-    player.client = player.client || {};
-    if (player.client) {
-      player.client.inventory = inventory;
-    }
-  }
-}
-
 // src/combat/weapon.ts
 var WeaponType = /* @__PURE__ */ ((WeaponType2) => {
   WeaponType2[WeaponType2["BLASTER"] = 0] = "BLASTER";
@@ -26321,6 +26340,106 @@ var WEAPONS = {
   }
 };
 
+// src/save/adapter.ts
+function createSerializedGameState(context) {
+  const { entitySystem, levelClock, random: random5 } = context;
+  const player = entitySystem.find((e) => e.classname === "player");
+  const sysSnapshot = entitySystem.createSnapshot();
+  const playerState = {
+    origin: player ? { ...player.origin } : { x: 0, y: 0, z: 0 },
+    velocity: player ? { ...player.velocity } : { x: 0, y: 0, z: 0 },
+    viewAngles: player ? { ...player.angles } : { x: 0, y: 0, z: 0 },
+    onGround: player ? player.groundentity !== null : false,
+    waterLevel: player ? player.waterlevel : 0,
+    mins: player ? { ...player.mins } : { x: -16, y: -16, z: -24 },
+    maxs: player ? { ...player.maxs } : { x: 16, y: 16, z: 32 },
+    damageAlpha: player?.client?.damage_alpha ?? 0,
+    damageIndicators: [],
+    // Transient
+    blend: [0, 0, 0, 0],
+    // Transient
+    stats: player ? populatePlayerStats(player, levelClock.current.timeSeconds) : [],
+    kick_angles: player?.client?.kick_angles ?? { x: 0, y: 0, z: 0 },
+    kick_origin: player?.client?.kick_origin ?? { x: 0, y: 0, z: 0 },
+    gunoffset: { x: 0, y: 0, z: 0 },
+    gunangles: { x: 0, y: 0, z: 0 },
+    gunindex: 0,
+    // Q2 Network Compatibility
+    pm_type: player?.client?.pm_type ?? 0,
+    pm_time: player?.client?.pm_time ?? 0,
+    pm_flags: player?.client?.pm_flags ?? 0,
+    gun_frame: player?.client?.gun_frame ?? 0,
+    rdflags: player?.client?.rdflags ?? 0,
+    fov: player?.client?.fov ?? 90,
+    renderfx: player?.renderfx ?? 0
+  };
+  return {
+    mapName: entitySystem.level.mapname || "unknown",
+    playerState,
+    entities: sysSnapshot.entities,
+    levelState: sysSnapshot.level,
+    time: levelClock.current.timeSeconds,
+    playerInventory: player?.client?.inventory ? serializePlayerInventory(player.client.inventory) : void 0,
+    rngState: random5?.getState(),
+    _internalSnapshot: sysSnapshot
+  };
+}
+function applySerializedGameState(state, context) {
+  const { entitySystem, levelClock, random: random5 } = context;
+  levelClock.restore({
+    frameNumber: 0,
+    // Unknown in this format, reset to 0
+    timeSeconds: state.time,
+    previousTimeSeconds: state.time,
+    deltaSeconds: 0
+  });
+  if (random5 && state.rngState) {
+    random5.setState(state.rngState);
+  }
+  if (state._internalSnapshot) {
+    entitySystem.restore(state._internalSnapshot);
+  } else {
+    console.warn("Restoring from partial SerializedGameState. Thinks and Pool state may be lost.");
+    const partialSnapshot = {
+      timeSeconds: state.time,
+      pool: {
+        capacity: state.entities.length + 32,
+        // Estimate
+        activeOrder: state.entities.map((e) => e.index),
+        // Naive
+        freeList: [],
+        // Assume none
+        pendingFree: []
+      },
+      entities: state.entities,
+      thinks: [],
+      // LOST
+      awareness: {
+        frameNumber: 0,
+        sightEntityIndex: null,
+        sightEntityFrame: 0,
+        soundEntityIndex: null,
+        soundEntityFrame: 0,
+        sound2EntityIndex: null,
+        sound2EntityFrame: 0,
+        sightClientIndex: null
+      },
+      crossLevelFlags: 0,
+      crossUnitFlags: 0,
+      level: state.levelState
+    };
+    entitySystem.restore(partialSnapshot);
+  }
+  const player = entitySystem.find((e) => e.classname === "player");
+  if (player && state.playerInventory) {
+    const inventory = deserializePlayerInventory(state.playerInventory);
+    player.client = player.client || {};
+    if (player.client) {
+      player.client.inventory = inventory;
+    }
+  }
+}
+
 // src/index.ts
 var ZERO_VEC312 = { x: 0, y: 0, z: 0 };
 function createGame(imports, engine, options) {
@@ -26781,6 +26900,57 @@ function createGame(imports, engine, options) {
         velocity = { ...ZERO_VEC312 };
       }
       frameLoop.reset(state.time * 1e3);
+    },
+    setGodMode(enabled) {
+      const player = entities.find((e) => e.classname === "player");
+      if (player) {
+        if (enabled) {
+          player.flags |= 16 /* GodMode */;
+        } else {
+          player.flags &= ~16 /* GodMode */;
+        }
+      }
+    },
+    setNoclip(enabled) {
+      const player = entities.find((e) => e.classname === "player");
+      if (player) {
+        if (enabled) {
+          player.movetype = 1 /* Noclip */;
+        } else {
+          player.movetype = 4 /* Walk */;
+        }
+      }
+    },
+    setNotarget(enabled) {
+      const player = entities.find((e) => e.classname === "player");
+      if (player) {
+        if (enabled) {
+          player.flags |= 32 /* NoTarget */;
+        } else {
+          player.flags &= ~32 /* NoTarget */;
+        }
+      }
+    },
+    giveItem(itemClassname) {
+      const player = entities.find((e) => e.classname === "player");
+      if (player) {
+        giveItem(player, itemClassname);
+      }
+    },
+    damage(amount) {
+      const player = entities.find((e) => e.classname === "player");
+      if (player) {
+        T_Damage(player, null, null, ZERO_VEC312, player.origin, ZERO_VEC312, amount, 0, 0 /* NONE */, 0 /* UNKNOWN */, levelClock.current.timeSeconds);
+      }
+    },
+    teleport(origin2) {
+      const player = entities.find((e) => e.classname === "player");
+      if (player) {
+        entities.unlink(player);
+        player.origin = { ...origin2 };
+        player.velocity = { ...ZERO_VEC312 };
+        entities.link(player);
+      }
     }
   };
   registerDefaultSpawns(spawnRegistry, gameExports);
@@ -26923,6 +27093,7 @@ function createGame(imports, engine, options) {
   getAmmoItemDefinition,
   getWeaponState,
   giveAmmoItem,
+  giveItem,
   giveWeapon,
   hasAnyDamageFlag,
   hasItem,