quake2ts 0.0.505 → 0.0.506

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

@@ -8736,12 +8736,12 @@ function registerTriggerSpawns(registry) {
 }
 
 // src/combat/weapons/state.ts
-var WeaponStateEnum = /* @__PURE__ */ ((WeaponStateEnum2) => {
-  WeaponStateEnum2[WeaponStateEnum2["WEAPON_READY"] = 0] = "WEAPON_READY";
-  WeaponStateEnum2[WeaponStateEnum2["WEAPON_ACTIVATING"] = 1] = "WEAPON_ACTIVATING";
-  WeaponStateEnum2[WeaponStateEnum2["WEAPON_DROPPING"] = 2] = "WEAPON_DROPPING";
-  WeaponStateEnum2[WeaponStateEnum2["WEAPON_FIRING"] = 3] = "WEAPON_FIRING";
-  return WeaponStateEnum2;
+var WeaponStateEnum = /* @__PURE__ */ ((WeaponStateEnum3) => {
+  WeaponStateEnum3[WeaponStateEnum3["WEAPON_READY"] = 0] = "WEAPON_READY";
+  WeaponStateEnum3[WeaponStateEnum3["WEAPON_ACTIVATING"] = 1] = "WEAPON_ACTIVATING";
+  WeaponStateEnum3[WeaponStateEnum3["WEAPON_DROPPING"] = 2] = "WEAPON_DROPPING";
+  WeaponStateEnum3[WeaponStateEnum3["WEAPON_FIRING"] = 3] = "WEAPON_FIRING";
+  return WeaponStateEnum3;
 })(WeaponStateEnum || {});
 function createPlayerWeaponStates() {
   return {
@@ -8846,6 +8846,106 @@ var ANIM_ATTACK = 1;
 var ANIM_PAIN = 2;
 var ANIM_DEATH = 3;
 
+// src/combat/weapons/switching.ts
+var instantSwitch = false;
+function getWeaponIdleLastFrame(weaponId) {
+  switch (weaponId) {
+    case WeaponId.HandGrenade:
+      return FRAME_GRENADE_IDLE_LAST;
+    case WeaponId.Shotgun:
+      return FRAME_SHOTGUN_IDLE_LAST;
+    case WeaponId.SuperShotgun:
+      return FRAME_SSHOTGUN_IDLE_LAST;
+    case WeaponId.Machinegun:
+      return FRAME_MACHINEGUN_IDLE_LAST;
+    case WeaponId.Chaingun:
+      return FRAME_CHAINGUN_IDLE_LAST;
+    case WeaponId.Railgun:
+      return FRAME_RAILGUN_IDLE_LAST;
+    case WeaponId.RocketLauncher:
+      return FRAME_ROCKET_IDLE_LAST;
+    case WeaponId.HyperBlaster:
+      return FRAME_HYPERBLASTER_IDLE_LAST;
+    case WeaponId.BFG10K:
+      return FRAME_BFG_IDLE_LAST;
+    case WeaponId.GrenadeLauncher:
+      return FRAME_GRENADELAUNCHER_IDLE_LAST;
+    case WeaponId.Blaster:
+      return FRAME_BLASTER_IDLE_LAST;
+    default:
+      return 0;
+  }
+}
+function ChangeWeapon(ent, weaponId) {
+  if (!ent.client) return;
+  const client = ent.client;
+  if (weaponId) {
+    if (client.weaponstate === 2 /* WEAPON_DROPPING */) {
+      client.newWeapon = weaponId;
+      return;
+    }
+    if (client.weaponstate === 0 /* WEAPON_READY */ || client.weaponstate === 3 /* WEAPON_FIRING */) {
+      client.newWeapon = weaponId;
+      client.weaponstate = 2 /* WEAPON_DROPPING */;
+      if (client.inventory.currentWeapon) {
+        client.gun_frame = getWeaponIdleLastFrame(client.inventory.currentWeapon) + 1;
+      } else {
+        client.gun_frame = 0;
+      }
+      if (instantSwitch) {
+        selectWeapon(client.inventory, weaponId);
+        client.weaponstate = 0 /* WEAPON_READY */;
+        client.weapon_think_time = 0;
+        client.newWeapon = void 0;
+      }
+      return;
+    }
+    client.newWeapon = weaponId;
+    return;
+  }
+  if (client.newWeapon) {
+    selectWeapon(client.inventory, client.newWeapon);
+    client.weaponstate = 1 /* WEAPON_ACTIVATING */;
+    client.gun_frame = 0;
+    client.weapon_think_time = 0;
+    client.newWeapon = void 0;
+  }
+}
+function NoAmmoWeaponChange(ent) {
+  if (!ent.client) return;
+  const bestWeapon = getBestWeapon(ent);
+  if (bestWeapon && bestWeapon !== ent.client.inventory.currentWeapon) {
+    ChangeWeapon(ent, bestWeapon);
+  }
+}
+function getBestWeapon(player) {
+  if (!player.client) {
+    return null;
+  }
+  const inventory = player.client.inventory;
+  if (inventory.ownedWeapons.has(WeaponId.BFG10K) && inventory.ammo.counts[AmmoType.Cells] >= 50) {
+    return WeaponId.BFG10K;
+  } else if (inventory.ownedWeapons.has(WeaponId.RocketLauncher) && inventory.ammo.counts[AmmoType.Rockets] >= 1) {
+    return WeaponId.RocketLauncher;
+  } else if (inventory.ownedWeapons.has(WeaponId.HyperBlaster) && inventory.ammo.counts[AmmoType.Cells] >= 1) {
+    return WeaponId.HyperBlaster;
+  } else if (inventory.ownedWeapons.has(WeaponId.Railgun) && inventory.ammo.counts[AmmoType.Slugs] >= 1) {
+    return WeaponId.Railgun;
+  } else if (inventory.ownedWeapons.has(WeaponId.Chaingun) && inventory.ammo.counts[AmmoType.Bullets] >= 1) {
+    return WeaponId.Chaingun;
+  } else if (inventory.ownedWeapons.has(WeaponId.GrenadeLauncher) && inventory.ammo.counts[AmmoType.Grenades] >= 1) {
+    return WeaponId.GrenadeLauncher;
+  } else if (inventory.ownedWeapons.has(WeaponId.SuperShotgun) && inventory.ammo.counts[AmmoType.Shells] >= 2) {
+    return WeaponId.SuperShotgun;
+  } else if (inventory.ownedWeapons.has(WeaponId.Machinegun) && inventory.ammo.counts[AmmoType.Bullets] >= 1) {
+    return WeaponId.Machinegun;
+  } else if (inventory.ownedWeapons.has(WeaponId.Shotgun) && inventory.ammo.counts[AmmoType.Shells] >= 1) {
+    return WeaponId.Shotgun;
+  } else {
+    return WeaponId.Blaster;
+  }
+}
+
 // src/combat/weapons/firing.ts
 var random3 = createRandomGenerator();
 var DEFAULT_SHOTGUN_HSPREAD = 500;
@@ -8874,6 +8974,15 @@ function setPlayerAttackAnim(player) {
     player.client.anim_end = FRAME_attack8;
   }
 }
+function checkAmmo(game, player, ammoType, count) {
+  if (!player.client) return false;
+  if (player.client.inventory.ammo.counts[ammoType] < count) {
+    game.sound(player, 0, "weapons/noammo.wav", 1, ATTN_NORM, 0);
+    NoAmmoWeaponChange(player);
+    return false;
+  }
+  return true;
+}
 function fireHitscan(game, player, start, forward, damage, knockback, mod) {
   const end = { x: start.x + forward.x * 8192, y: start.y + forward.y * 8192, z: start.z + forward.z * 8192 };
   if (game.setLagCompensation && player.client) {
@@ -9008,9 +9117,7 @@ function fireRailgun(game, player, start, forward, damage, knockback) {
 function fireShotgun(game, player) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Shells] < 1) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Shells, 1)) return;
   inventory.ammo.counts[AmmoType.Shells]--;
   game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_SHOTGUN);
   applyKick(player, -2, 0, -2);
@@ -9023,9 +9130,7 @@ function fireShotgun(game, player) {
 function fireSuperShotgun(game, player) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Shells] < 2) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Shells, 2)) return;
   const isPrecision = (player.client.buttons & BUTTON_ATTACK2) !== 0;
   inventory.ammo.counts[AmmoType.Shells] -= 2;
   game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_SSHOTGUN);
@@ -9050,9 +9155,7 @@ function fireSuperShotgun(game, player) {
 function fireMachinegun(game, player) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Bullets] < 1) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Bullets, 1)) return;
   inventory.ammo.counts[AmmoType.Bullets]--;
   game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_MACHINEGUN);
   applyKick(player, -1, random3.crandom() * 0.5, 0);
@@ -9088,6 +9191,7 @@ function fireChaingun(game, player) {
     shots = inventory.ammo.counts[AmmoType.Bullets];
   }
   if (shots === 0) {
+    if (!checkAmmo(game, player, AmmoType.Bullets, 1)) return;
     return;
   }
   inventory.ammo.counts[AmmoType.Bullets] -= shots;
@@ -9112,9 +9216,7 @@ function fireChaingun(game, player) {
 function fireRailgunShot(game, player) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Slugs] < 1) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Slugs, 1)) return;
   inventory.ammo.counts[AmmoType.Slugs]--;
   game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_RAILGUN);
   applyKick(player, -3, 0, -3);
@@ -9128,9 +9230,7 @@ function fireRailgunShot(game, player) {
 function fireHyperBlaster(game, player) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Cells] < 1) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Cells, 1)) return;
   inventory.ammo.counts[AmmoType.Cells]--;
   game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_HYPERBLASTER);
   applyKick(player, -0.5, 0, 0);
@@ -9189,9 +9289,7 @@ function fireBlaster(game, player) {
 function fireRocket(game, player) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Rockets] < 1) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Rockets, 1)) return;
   inventory.ammo.counts[AmmoType.Rockets]--;
   game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_ROCKET);
   applyKick(player, -2, 0, -2);
@@ -9209,9 +9307,7 @@ function fireRocket(game, player) {
 function fireGrenadeLauncher(game, player, timer) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Grenades] < 1) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Grenades, 1)) return;
   inventory.ammo.counts[AmmoType.Grenades]--;
   game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_GRENADE);
   applyKick(player, -2, 0, -2);
@@ -9223,9 +9319,7 @@ function fireGrenadeLauncher(game, player, timer) {
 function fireHyperBlasterBeam(game, player, weaponState) {
   if (!player.client) return;
   const inventory = player.client.inventory;
-  if (inventory.ammo.counts[AmmoType.Cells] < 2) {
-    return;
-  }
+  if (!checkAmmo(game, player, AmmoType.Cells, 2)) return;
   if ((weaponState.heat || 0) > 20) {
     game.sound(player, 0, "weapons/lashit.wav", 1, 1, 0);
     return;
@@ -9273,9 +9367,7 @@ function fireBFG(game, player) {
   const isPrimeFrame = gun_frame === 9 || gun_frame === 0 || gun_frame === void 0;
   const isFireFrame = gun_frame === 22 || gun_frame === 0 || gun_frame === void 0;
   if (isPrimeFrame) {
-    if (inventory.ammo.counts[AmmoType.Cells] < 50) {
-      return;
-    }
+    if (!checkAmmo(game, player, AmmoType.Cells, 50)) return;
     inventory.ammo.counts[AmmoType.Cells] -= 50;
     game.sound(player, 0, "weapons/bfg__f1y.wav", 1, 0, 0);
   }
@@ -9291,72 +9383,6 @@ function fireBFG(game, player) {
   }
 }
 
-// src/combat/weapons/switching.ts
-var instantSwitch = false;
-function getWeaponIdleLastFrame(weaponId) {
-  switch (weaponId) {
-    case WeaponId.HandGrenade:
-      return FRAME_GRENADE_IDLE_LAST;
-    case WeaponId.Shotgun:
-      return FRAME_SHOTGUN_IDLE_LAST;
-    case WeaponId.SuperShotgun:
-      return FRAME_SSHOTGUN_IDLE_LAST;
-    case WeaponId.Machinegun:
-      return FRAME_MACHINEGUN_IDLE_LAST;
-    case WeaponId.Chaingun:
-      return FRAME_CHAINGUN_IDLE_LAST;
-    case WeaponId.Railgun:
-      return FRAME_RAILGUN_IDLE_LAST;
-    case WeaponId.RocketLauncher:
-      return FRAME_ROCKET_IDLE_LAST;
-    case WeaponId.HyperBlaster:
-      return FRAME_HYPERBLASTER_IDLE_LAST;
-    case WeaponId.BFG10K:
-      return FRAME_BFG_IDLE_LAST;
-    case WeaponId.GrenadeLauncher:
-      return FRAME_GRENADELAUNCHER_IDLE_LAST;
-    case WeaponId.Blaster:
-      return FRAME_BLASTER_IDLE_LAST;
-    default:
-      return 0;
-  }
-}
-function ChangeWeapon(ent, weaponId) {
-  if (!ent.client) return;
-  const client = ent.client;
-  if (weaponId) {
-    if (client.weaponstate === 2 /* WEAPON_DROPPING */) {
-      client.newWeapon = weaponId;
-      return;
-    }
-    if (client.weaponstate === 0 /* WEAPON_READY */ || client.weaponstate === 3 /* WEAPON_FIRING */) {
-      client.newWeapon = weaponId;
-      client.weaponstate = 2 /* WEAPON_DROPPING */;
-      if (client.inventory.currentWeapon) {
-        client.gun_frame = getWeaponIdleLastFrame(client.inventory.currentWeapon) + 1;
-      } else {
-        client.gun_frame = 0;
-      }
-      if (instantSwitch) {
-        selectWeapon(client.inventory, weaponId);
-        client.weaponstate = 0 /* WEAPON_READY */;
-        client.weapon_think_time = 0;
-        client.newWeapon = void 0;
-      }
-      return;
-    }
-    client.newWeapon = weaponId;
-    return;
-  }
-  if (client.newWeapon) {
-    selectWeapon(client.inventory, client.newWeapon);
-    client.weaponstate = 1 /* WEAPON_ACTIVATING */;
-    client.gun_frame = 0;
-    client.weapon_think_time = 0;
-    client.newWeapon = void 0;
-  }
-}
-
 // src/combat/weapons/common.ts
 function applyKick2(player, pitch, yaw = 0, kickOrigin = 0) {
   if (player.client) {
@@ -10588,6 +10614,7 @@ function createItemRespawnFunction(game, originalModel) {
     self.modelindex = cachedIndex;
     self.svflags &= ~1 /* NoClient */;
     game.multicast(self.origin, 1 /* Pvs */, ServerCommand.sound, 0, "items/respawn.wav", 1, 0, 0);
+    game.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.TELEPORT_EFFECT, self.origin);
   };
 }