quake2ts 0.0.446 → 0.0.449

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

@@ -3323,6 +3323,24 @@ function classifyClientVisibility(self, other, level, trace) {
   }
   return true;
 }
+function AI_GetSightClient(self, context, trace) {
+  if ((self.monsterinfo.aiflags & 1024 /* NoStep */) !== 0) {
+    return null;
+  }
+  for (let i = 1; i <= context.maxClients; i++) {
+    const ent = context.entities[i];
+    if (!ent || !ent.inUse || ent.health <= 0) {
+      continue;
+    }
+    if ((ent.flags & FL_NOTARGET) !== 0) {
+      continue;
+    }
+    if (visible(self, ent, trace, { throughGlass: false })) {
+      return ent;
+    }
+  }
+  return null;
+}
 function updateSoundChase(self, client, level, hearability, trace) {
   if ((self.spawnflags & SPAWNFLAG_MONSTER_AMBUSH) !== 0) {
     if (!visible(self, client, trace)) return false;
@@ -4775,6 +4793,18 @@ var EntitySystem = class {
   get game() {
     return this._game;
   }
+  get maxClients() {
+    return 32;
+  }
+  get entities() {
+    const arr = new Array(this.pool.capacity + 1).fill(null);
+    for (const ent of this.pool) {
+      if (ent.index >= 0 && ent.index < arr.length) {
+        arr[ent.index] = ent;
+      }
+    }
+    return arr;
+  }
   get world() {
     return this.pool.world;
   }
@@ -9855,11 +9885,35 @@ var FLAG_ITEMS = {
   }
 };
 
-// src/entities/items/weapons.ts
-function createWeaponPickupEntity(game, weaponItem) {
-  const respawn = (self) => {
+// src/entities/items/common.ts
+init_esm();
+function handleItemPickup(game, self, other, respawnTime = 30) {
+  if (!game.deathmatch) {
+    game.entities.free(self);
+    return;
+  }
+  self.solid = 0 /* Not */;
+  self.modelindex = 0;
+  self.svflags |= 1 /* NoClient */;
+  self.nextthink = game.time + respawnTime;
+  game.entities.scheduleThink(self, self.nextthink);
+}
+function createItemRespawnFunction(game, originalModel) {
+  let cachedIndex = 0;
+  return (self) => {
+    if (!cachedIndex) {
+      cachedIndex = game.entities.modelIndex(originalModel);
+    }
     self.solid = 1 /* Trigger */;
+    self.modelindex = cachedIndex;
+    self.svflags &= ~1 /* NoClient */;
+    game.multicast(self.origin, 1 /* Pvs */, ServerCommand.sound, 0, "items/respawn.wav", 1, 0, 0);
   };
+}
+
+// src/entities/items/weapons.ts
+function createWeaponPickupEntity(game, weaponItem) {
+  const modelName = `models/items/${weaponItem.id.replace("weapon_", "")}/tris.md2`;
   return {
     classname: weaponItem.id,
     solid: 1 /* Trigger */,
@@ -9870,22 +9924,16 @@ function createWeaponPickupEntity(game, weaponItem) {
       if (pickupWeapon(other.client.inventory, weaponItem, game.time * 1e3)) {
         game.sound?.(other, 0, "items/pkup.wav", 1, 1, 0);
         game.centerprintf?.(other, `You got the ${weaponItem.name}`);
-        self.solid = 0 /* Not */;
-        if (game.deathmatch) {
-          self.nextthink = game.time + 30;
-          game.entities.scheduleThink(self, self.nextthink);
-        }
+        handleItemPickup(game, self, other);
       }
     },
-    think: respawn
+    think: createItemRespawnFunction(game, modelName)
   };
 }
 
 // src/entities/items/health.ts
 function createHealthPickupEntity(game, healthItem) {
-  const respawn = (self) => {
-    self.solid = 1 /* Trigger */;
-  };
+  const modelName = `models/items/healing/${healthItem.id.replace("item_health_", "")}/tris.md2`;
   return {
     classname: healthItem.id,
     solid: 1 /* Trigger */,
@@ -9900,22 +9948,16 @@ function createHealthPickupEntity(game, healthItem) {
         }
         game.sound?.(other, 0, "items/pkup.wav", 1, 1, 0);
         game.centerprintf?.(other, `You got the ${healthItem.name}`);
-        self.solid = 0 /* Not */;
-        if (game.deathmatch) {
-          self.nextthink = game.time + 30;
-          game.entities.scheduleThink(self, self.nextthink);
-        }
+        handleItemPickup(game, self, other);
       }
     },
-    think: respawn
+    think: createItemRespawnFunction(game, modelName)
   };
 }
 
 // src/entities/items/armor.ts
 function createArmorPickupEntity(game, armorItem) {
-  const respawn = (self) => {
-    self.solid = 1 /* Trigger */;
-  };
+  const modelName = `models/items/armor/${armorItem.id.replace("item_armor_", "")}/tris.md2`;
   return {
     classname: armorItem.id,
     solid: 1 /* Trigger */,
@@ -9926,22 +9968,17 @@ function createArmorPickupEntity(game, armorItem) {
       if (pickupArmor(other.client.inventory, armorItem, game.time * 1e3)) {
         game.sound?.(other, 0, "items/pkup.wav", 1, 1, 0);
         game.centerprintf?.(other, `You got the ${armorItem.name}`);
-        self.solid = 0 /* Not */;
-        if (game.deathmatch) {
-          self.nextthink = game.time + 30;
-          game.entities.scheduleThink(self, self.nextthink);
-        }
+        handleItemPickup(game, self, other);
       }
     },
-    think: respawn
+    think: createItemRespawnFunction(game, modelName)
   };
 }
 
 // src/entities/items/powerups.ts
 function createPowerupPickupEntity(game, powerupItem) {
-  const respawn = (self) => {
-    self.solid = 1 /* Trigger */;
-  };
+  const respawnTime = powerupItem.id === "item_quad" || powerupItem.id === "item_invulnerability" ? 60 : 30;
+  const modelName = `models/items/powerups/${powerupItem.id.replace("item_", "")}/tris.md2`;
   return {
     classname: powerupItem.id,
     solid: 1 /* Trigger */,
@@ -9952,14 +9989,10 @@ function createPowerupPickupEntity(game, powerupItem) {
       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 */;
-        if (game.deathmatch) {
-          self.nextthink = game.time + 30;
-          game.entities.scheduleThink(self, self.nextthink);
-        }
+        handleItemPickup(game, self, other, respawnTime);
       }
     },
-    think: respawn
+    think: createItemRespawnFunction(game, modelName)
   };
 }
 
@@ -10005,9 +10038,7 @@ var AMMO_DISPLAY_NAMES = {
 };
 function createAmmoPickupEntity(game, itemId) {
   const def = getAmmoItemDefinition(itemId);
-  const respawn = (self) => {
-    self.solid = 1 /* Trigger */;
-  };
+  const modelName = `models/items/ammo/${itemId.replace("ammo_", "")}/tris.md2`;
   return {
     classname: itemId,
     solid: 1 /* Trigger */,
@@ -10020,14 +10051,10 @@ function createAmmoPickupEntity(game, itemId) {
         game.sound?.(other, 0, "items/pkup.wav", 1, 1, 0);
         const name = AMMO_DISPLAY_NAMES[itemId] || itemId.replace("ammo_", "");
         game.centerprintf?.(other, `You got ${def.quantity} ${name}`);
-        self.solid = 0 /* Not */;
-        if (game.deathmatch) {
-          self.nextthink = game.time + 30;
-          game.entities.scheduleThink(self, self.nextthink);
-        }
+        handleItemPickup(game, self, other);
       }
     },
-    think: respawn
+    think: createItemRespawnFunction(game, modelName)
   };
 }
 
@@ -23846,6 +23873,21 @@ function spawnEntitiesFromText(text, options) {
   }
   return spawned;
 }
+function SelectDeathmatchSpawnPoint(entities) {
+  const spots = entities.findByClassname("info_player_deathmatch");
+  if (spots.length === 0) {
+    return void 0;
+  }
+  const index = Math.floor(entities.rng.frandom() * spots.length);
+  return spots[index];
+}
+function SelectSpawnPoint(entities) {
+  if (entities.deathmatch) {
+    const spot = SelectDeathmatchSpawnPoint(entities);
+    if (spot) return spot;
+  }
+  return findPlayerStart(entities);
+}
 function findPlayerStart(entities) {
   return entities.find(
     (entity) => entity.classname === "info_player_start"
@@ -25013,26 +25055,37 @@ function ClientObituary(self, inflictor, attacker, mod, sys) {
   }
   if (mod === 24 /* SUICIDE */) {
     message = `${friendlyName} suicides.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 23 /* FALLING */) {
     message = `${friendlyName} cratered.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 20 /* CRUSH */) {
     message = `${friendlyName} was squished.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 17 /* WATER */) {
     message = `${friendlyName} sank like a rock.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 18 /* SLIME */) {
     message = `${friendlyName} melted.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 19 /* LAVA */) {
     message = `${friendlyName} does a back flip into the lava.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 26 /* EXPLOSIVE */) {
     message = `${friendlyName} blew up.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 31 /* TARGET_LASER */) {
     message = `${friendlyName} saw the light.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 34 /* TARGET_BLASTER */) {
     message = `${friendlyName} got blasted.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (mod === 28 /* BOMB */) {
     message = `${friendlyName} was bombed.`;
+    if (self.client) self.client.score = (self.client.score || 0) - 1;
   } else if (attacker && attacker.classname === "player") {
     if (self === attacker) {
+      if (self.client) self.client.score = (self.client.score || 0) - 1;
       switch (mod) {
         case 6 /* GRENADE */:
         case 7 /* G_SPLASH */:
@@ -25061,6 +25114,9 @@ function ClientObituary(self, inflictor, attacker, mod, sys) {
           break;
       }
     } else {
+      if (attacker.client) {
+        attacker.client.score = (attacker.client.score || 0) + 1;
+      }
       const attackerName = "Enemy";
       switch (mod) {
         case 1 /* BLASTER */:
@@ -25293,6 +25349,18 @@ function player_die(self, inflictor, attacker, damage, point, mod, sys) {
 }
 function player_think(self, sys) {
   if (!self.client) return;
+  if (self.deadflag) {
+    if (self.client.buttons) {
+      if (sys.game && sys.game.respawn) {
+        sys.game.respawn(self);
+        return;
+      }
+    }
+    P_PlayerThink(self, sys);
+    self.nextthink = sys.timeSeconds + 0.1;
+    sys.scheduleThink(self, self.nextthink);
+    return;
+  }
   const nowMs = sys.timeSeconds * 1e3;
   const quadTime = self.client.quad_time || 0;
   const doubleTime = self.client.double_time || 0;
@@ -25963,17 +26031,9 @@ function createGame(imports, engine, options) {
       return true;
     },
     clientBegin(client) {
-      const playerStart = findPlayerStart(entities);
       const player = entities.spawn();
-      player.classname = "player";
-      player.origin = playerStart ? { ...playerStart.origin } : { x: 0, y: 0, z: 0 };
-      player.angles = playerStart ? { ...playerStart.angles } : { x: 0, y: 0, z: 0 };
-      player.health = 100;
-      player.takedamage = true;
-      player.movetype = 7 /* Toss */;
-      player.mins = { x: -16, y: -16, z: -24 };
-      player.maxs = { x: 16, y: 16, z: 32 };
       player.client = client;
+      this.respawn(player);
       player.die = (self, inflictor, attacker, damage, point, mod) => {
         player_die(self, inflictor, attacker, damage, point, mod, entities);
       };
@@ -25985,10 +26045,37 @@ function createGame(imports, engine, options) {
       };
       player.nextthink = entities.timeSeconds + 0.1;
       entities.scheduleThink(player, player.nextthink);
-      entities.finalizeSpawn(player);
-      origin = { ...player.origin };
       return player;
     },
+    respawn(ent) {
+      if (!ent.client) return;
+      const spawnPoint = SelectSpawnPoint(entities);
+      ent.classname = "player";
+      ent.origin = spawnPoint ? { ...spawnPoint.origin } : { x: 0, y: 0, z: 0 };
+      ent.angles = spawnPoint ? { ...spawnPoint.angles } : { x: 0, y: 0, z: 0 };
+      ent.health = 100;
+      ent.takedamage = true;
+      ent.movetype = 7 /* Toss */;
+      ent.mins = { x: -16, y: -16, z: -24 };
+      ent.maxs = { x: 16, y: 16, z: 32 };
+      ent.solid = 2 /* BoundingBox */;
+      ent.deadflag = 0;
+      ent.modelindex = engine.modelIndex?.("players/male/tris.md2") || 0;
+      ent.client.damage_alpha = 0;
+      ent.client.damage_blend = [0, 0, 0];
+      ent.client.anim_priority = 0;
+      ent.client.anim_end = 0;
+      ent.frame = 0;
+      if (deathmatch) {
+        ent.client.inventory = createPlayerInventory({
+          weapons: [WeaponId.Blaster],
+          currentWeapon: WeaponId.Blaster
+        });
+      } else {
+      }
+      entities.finalizeSpawn(ent);
+      origin = { ...ent.origin };
+    },
     clientDisconnect(ent) {
       if (ent && ent.inUse) {
         entities.free(ent);
@@ -26086,6 +26173,7 @@ function createGame(imports, engine, options) {
 }
 export {
   AIFlags,
+  AI_GetSightClient,
   AMMO_TYPE_COUNT,
   ARMOR_INFO,
   ARMOR_ITEMS,