quake2ts 0.0.254 → 0.0.257

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

@@ -74,6 +74,7 @@ __export(index_exports, {
   WEAPONS: () => WEAPONS,
   WEAPON_ITEMS: () => WEAPON_ITEMS,
   WeaponId: () => WeaponId,
+  WeaponStateEnum: () => WeaponStateEnum,
   WeaponType: () => WeaponType,
   addAmmo: () => addAmmo,
   addKey: () => addKey,
@@ -124,7 +125,6 @@ __export(index_exports, {
   foundTarget: () => foundTarget,
   getAmmoItemDefinition: () => getAmmoItemDefinition,
   getWeaponState: () => getWeaponState,
-  giveAmmo: () => giveAmmo,
   giveAmmoItem: () => giveAmmoItem,
   giveWeapon: () => giveWeapon,
   hasAnyDamageFlag: () => hasAnyDamageFlag,
@@ -156,7 +156,6 @@ __export(index_exports, {
   serializePlayerInventory: () => serializePlayerInventory,
   serializeRereleaseSave: () => serializeRereleaseSave,
   setMovedir: () => setMovedir,
-  setPickup: () => setPickup,
   spawnEntitiesFromText: () => spawnEntitiesFromText,
   spawnEntityFromDictionary: () => spawnEntityFromDictionary,
   summarizeRereleaseSave: () => summarizeRereleaseSave,
@@ -932,33 +931,6 @@ function setCompressedInteger(stats, startIndex, id, count, bitsPerValue) {
   const valueToWrite = base & ~mask | count << bitShift & mask;
   writeUint16LE(stats, startIndex, byteOffset, valueToWrite & 65535);
 }
-var PowerupId = /* @__PURE__ */ ((PowerupId22) => {
-  PowerupId22["QuadDamage"] = "quad";
-  PowerupId22["Invulnerability"] = "invulnerability";
-  PowerupId22["EnviroSuit"] = "enviro_suit";
-  PowerupId22["Rebreather"] = "rebreather";
-  PowerupId22["Silencer"] = "silencer";
-  PowerupId22["PowerScreen"] = "power_screen";
-  PowerupId22["PowerShield"] = "power_shield";
-  PowerupId22["QuadFire"] = "quad_fire";
-  PowerupId22["Invisibility"] = "invisibility";
-  PowerupId22["Bandolier"] = "bandolier";
-  PowerupId22["AmmoPack"] = "ammo_pack";
-  PowerupId22["IRGoggles"] = "ir_goggles";
-  PowerupId22["DoubleDamage"] = "double_damage";
-  PowerupId22["SphereVengeance"] = "sphere_vengeance";
-  PowerupId22["SphereHunter"] = "sphere_hunter";
-  PowerupId22["SphereDefender"] = "sphere_defender";
-  PowerupId22["Doppelganger"] = "doppelganger";
-  PowerupId22["TagToken"] = "tag_token";
-  PowerupId22["TechResistance"] = "tech_resistance";
-  PowerupId22["TechStrength"] = "tech_strength";
-  PowerupId22["TechHaste"] = "tech_haste";
-  PowerupId22["TechRegeneration"] = "tech_regeneration";
-  PowerupId22["Flashlight"] = "flashlight";
-  PowerupId22["Compass"] = "compass";
-  return PowerupId22;
-})(PowerupId || {});
 var PlayerStat = /* @__PURE__ */ ((PlayerStat2) => {
   PlayerStat2[PlayerStat2["STAT_HEALTH_ICON"] = 0] = "STAT_HEALTH_ICON";
   PlayerStat2[PlayerStat2["STAT_HEALTH"] = 1] = "STAT_HEALTH";
@@ -1053,7 +1025,16 @@ var POWERUP_STAT_MAP = {
     "enviro_suit"
     /* EnviroSuit */
   ]: 9,
-  // 10 is POWERUP_ADRENALINE (not in PowerupId?)
+  [
+    "bandolier"
+    /* Bandolier */
+  ]: 10,
+  // Placeholder/Map mismatch handling?
+  [
+    "ammo_pack"
+    /* AmmoPack */
+  ]: 10,
+  // Original reused indices or had gaps?
   [
     "ir_goggles"
     /* IRGoggles */
@@ -1101,7 +1082,12 @@ var POWERUP_STAT_MAP = {
   [
     "tech_regeneration"
     /* TechRegeneration */
-  ]: 22
+  ]: 22,
+  // Add missing mappings to avoid runtime lookups failing for new types
+  [
+    "tag_token"
+    /* TagToken */
+  ]: -1
 };
 function G_SetAmmoStat(stats, ammoId, count) {
   if (ammoId < 0 || ammoId >= AMMO_MAX) return;
@@ -1230,28 +1216,6 @@ var applyPmove = (state, cmd, trace, pointContents2) => {
     velocity: finalVelocity
   };
 };
-var WeaponId = /* @__PURE__ */ ((WeaponId22) => {
-  WeaponId22["Blaster"] = "blaster";
-  WeaponId22["Shotgun"] = "shotgun";
-  WeaponId22["SuperShotgun"] = "super_shotgun";
-  WeaponId22["Machinegun"] = "machinegun";
-  WeaponId22["Chaingun"] = "chaingun";
-  WeaponId22["HandGrenade"] = "hand_grenade";
-  WeaponId22["GrenadeLauncher"] = "grenade_launcher";
-  WeaponId22["RocketLauncher"] = "rocket_launcher";
-  WeaponId22["HyperBlaster"] = "hyperblaster";
-  WeaponId22["Railgun"] = "railgun";
-  WeaponId22["BFG10K"] = "bfg10k";
-  WeaponId22["Grapple"] = "grapple";
-  WeaponId22["ChainFist"] = "chainfist";
-  WeaponId22["EtfRifle"] = "etf_rifle";
-  WeaponId22["ProxLauncher"] = "prox_launcher";
-  WeaponId22["IonRipper"] = "ionripper";
-  WeaponId22["PlasmaBeam"] = "plasmabeam";
-  WeaponId22["Phalanx"] = "phalanx";
-  WeaponId22["Disruptor"] = "disruptor";
-  return WeaponId22;
-})(WeaponId || {});
 var AmmoType = /* @__PURE__ */ ((AmmoType22) => {
   AmmoType22[AmmoType22["Bullets"] = 0] = "Bullets";
   AmmoType22[AmmoType22["Shells"] = 1] = "Shells";
@@ -1286,6 +1250,75 @@ var AmmoItemId = /* @__PURE__ */ ((AmmoItemId22) => {
   return AmmoItemId22;
 })(AmmoItemId || {});
 
+// src/inventory/ammo.ts
+var AMMO_ITEM_DEFINITIONS = {
+  [AmmoItemId.Shells]: { id: AmmoItemId.Shells, ammoType: AmmoType.Shells, quantity: 10, weaponAmmo: false },
+  [AmmoItemId.Bullets]: { id: AmmoItemId.Bullets, ammoType: AmmoType.Bullets, quantity: 50, weaponAmmo: false },
+  [AmmoItemId.Rockets]: { id: AmmoItemId.Rockets, ammoType: AmmoType.Rockets, quantity: 5, weaponAmmo: false },
+  [AmmoItemId.Grenades]: { id: AmmoItemId.Grenades, ammoType: AmmoType.Grenades, quantity: 5, weaponAmmo: true },
+  [AmmoItemId.Cells]: { id: AmmoItemId.Cells, ammoType: AmmoType.Cells, quantity: 50, weaponAmmo: false },
+  [AmmoItemId.Slugs]: { id: AmmoItemId.Slugs, ammoType: AmmoType.Slugs, quantity: 10, weaponAmmo: false },
+  [AmmoItemId.MagSlugs]: { id: AmmoItemId.MagSlugs, ammoType: AmmoType.MagSlugs, quantity: 10, weaponAmmo: false },
+  [AmmoItemId.Flechettes]: { id: AmmoItemId.Flechettes, ammoType: AmmoType.Flechettes, quantity: 50, weaponAmmo: false },
+  [AmmoItemId.Disruptor]: { id: AmmoItemId.Disruptor, ammoType: AmmoType.Disruptor, quantity: 15, weaponAmmo: false },
+  [AmmoItemId.Tesla]: { id: AmmoItemId.Tesla, ammoType: AmmoType.Tesla, quantity: 5, weaponAmmo: false },
+  [AmmoItemId.Trap]: { id: AmmoItemId.Trap, ammoType: AmmoType.Trap, quantity: 5, weaponAmmo: false },
+  [AmmoItemId.Prox]: { id: AmmoItemId.Prox, ammoType: AmmoType.Prox, quantity: 5, weaponAmmo: false }
+};
+function getAmmoItemDefinition(id) {
+  return AMMO_ITEM_DEFINITIONS[id];
+}
+function createAmmoInventory(caps = createBaseAmmoCaps(), seed) {
+  const counts = Array(AMMO_TYPE_COUNT).fill(0);
+  if (seed) {
+    for (const [ammoType, count] of Object.entries(seed)) {
+      counts[Number(ammoType)] = count;
+    }
+  }
+  return { caps: caps.slice(), counts };
+}
+function createBaseAmmoCaps() {
+  const caps = Array(AMMO_TYPE_COUNT).fill(50);
+  caps[AmmoType.Bullets] = 200;
+  caps[AmmoType.Shells] = 100;
+  caps[AmmoType.Cells] = 200;
+  caps[AmmoType.MagSlugs] = 50;
+  caps[AmmoType.Flechettes] = 200;
+  caps[AmmoType.Disruptor] = 200;
+  caps[AmmoType.Tesla] = 50;
+  caps[AmmoType.Trap] = 50;
+  caps[AmmoType.Prox] = 50;
+  return caps;
+}
+function clampAmmoCounts(counts, caps) {
+  const limit = Math.min(counts.length, caps.length);
+  const clamped = counts.slice(0, limit);
+  for (let i = 0; i < limit; i++) {
+    const cap = caps[i];
+    if (cap !== void 0) {
+      clamped[i] = Math.min(counts[i], cap);
+    }
+  }
+  return clamped;
+}
+function addAmmo(inventory, ammoType, amount) {
+  const cap = inventory.caps[ammoType];
+  const current = inventory.counts[ammoType] ?? 0;
+  if (cap !== void 0 && current >= cap) {
+    return { ammoType, added: 0, newCount: current, capped: cap, pickedUp: false };
+  }
+  const uncapped = current + amount;
+  const newCount = cap === void 0 ? uncapped : Math.min(uncapped, cap);
+  const added = newCount - current;
+  inventory.counts[ammoType] = newCount;
+  return { ammoType, added, newCount, capped: cap ?? Number.POSITIVE_INFINITY, pickedUp: added > 0 };
+}
+function pickupAmmo(inventory, itemId, options = {}) {
+  const def = getAmmoItemDefinition(itemId);
+  const amount = options.countOverride ?? def.quantity;
+  return addAmmo(inventory, def.ammoType, amount);
+}
+
 // src/combat/damageFlags.ts
 var DamageFlags = /* @__PURE__ */ ((DamageFlags2) => {
   DamageFlags2[DamageFlags2["NONE"] = 0] = "NONE";
@@ -1397,119 +1430,103 @@ function applyPowerArmor(damage, flags, hitPoint, _hitNormal, state, options = {
   return { saved, remainingCells };
 }
 
-// src/inventory/ammo.ts
-var AMMO_ITEM_DEFINITIONS = {
-  [AmmoItemId.Shells]: { id: AmmoItemId.Shells, ammoType: AmmoType.Shells, quantity: 10, weaponAmmo: false },
-  [AmmoItemId.Bullets]: { id: AmmoItemId.Bullets, ammoType: AmmoType.Bullets, quantity: 50, weaponAmmo: false },
-  [AmmoItemId.Rockets]: { id: AmmoItemId.Rockets, ammoType: AmmoType.Rockets, quantity: 5, weaponAmmo: false },
-  [AmmoItemId.Grenades]: { id: AmmoItemId.Grenades, ammoType: AmmoType.Grenades, quantity: 5, weaponAmmo: true },
-  [AmmoItemId.Cells]: { id: AmmoItemId.Cells, ammoType: AmmoType.Cells, quantity: 50, weaponAmmo: false },
-  [AmmoItemId.Slugs]: { id: AmmoItemId.Slugs, ammoType: AmmoType.Slugs, quantity: 10, weaponAmmo: false },
-  [AmmoItemId.MagSlugs]: { id: AmmoItemId.MagSlugs, ammoType: AmmoType.MagSlugs, quantity: 10, weaponAmmo: false },
-  [AmmoItemId.Flechettes]: { id: AmmoItemId.Flechettes, ammoType: AmmoType.Flechettes, quantity: 50, weaponAmmo: false },
-  [AmmoItemId.Disruptor]: { id: AmmoItemId.Disruptor, ammoType: AmmoType.Disruptor, quantity: 15, weaponAmmo: false },
-  [AmmoItemId.Tesla]: { id: AmmoItemId.Tesla, ammoType: AmmoType.Tesla, quantity: 5, weaponAmmo: false },
-  [AmmoItemId.Trap]: { id: AmmoItemId.Trap, ammoType: AmmoType.Trap, quantity: 5, weaponAmmo: false },
-  [AmmoItemId.Prox]: { id: AmmoItemId.Prox, ammoType: AmmoType.Prox, quantity: 5, weaponAmmo: false }
-};
-function getAmmoItemDefinition(id) {
-  return AMMO_ITEM_DEFINITIONS[id];
-}
-function createAmmoInventory(caps = createBaseAmmoCaps(), seed) {
-  const counts = Array(AMMO_TYPE_COUNT).fill(0);
-  if (seed) {
-    for (const [ammoType, count] of Object.entries(seed)) {
-      counts[Number(ammoType)] = count;
-    }
-  }
-  return { caps: caps.slice(), counts };
-}
-function createBaseAmmoCaps() {
-  const caps = Array(AMMO_TYPE_COUNT).fill(50);
-  caps[AmmoType.Bullets] = 200;
-  caps[AmmoType.Shells] = 100;
-  caps[AmmoType.Cells] = 200;
-  caps[AmmoType.MagSlugs] = 50;
-  caps[AmmoType.Flechettes] = 200;
-  caps[AmmoType.Disruptor] = 200;
-  caps[AmmoType.Tesla] = 50;
-  caps[AmmoType.Trap] = 50;
-  caps[AmmoType.Prox] = 50;
-  return caps;
-}
-function clampAmmoCounts(counts, caps) {
-  const limit = Math.min(counts.length, caps.length);
-  const clamped = counts.slice(0, limit);
-  for (let i = 0; i < limit; i++) {
-    const cap = caps[i];
-    if (cap !== void 0) {
-      clamped[i] = Math.min(counts[i], cap);
-    }
-  }
-  return clamped;
-}
-function addAmmo(inventory, ammoType, amount) {
-  const cap = inventory.caps[ammoType];
-  const current = inventory.counts[ammoType] ?? 0;
-  if (cap !== void 0 && current >= cap) {
-    return { ammoType, added: 0, newCount: current, capped: cap, pickedUp: false };
-  }
-  const uncapped = current + amount;
-  const newCount = cap === void 0 ? uncapped : Math.min(uncapped, cap);
-  const added = newCount - current;
-  inventory.counts[ammoType] = newCount;
-  return { ammoType, added, newCount, capped: cap ?? Number.POSITIVE_INFINITY, pickedUp: added > 0 };
-}
-function pickupAmmo(inventory, itemId, options = {}) {
-  const def = getAmmoItemDefinition(itemId);
-  const amount = options.countOverride ?? def.quantity;
-  return addAmmo(inventory, def.ammoType, amount);
-}
-
 // src/inventory/playerInventory.ts
+var WeaponId = /* @__PURE__ */ ((WeaponId3) => {
+  WeaponId3["Blaster"] = "blaster";
+  WeaponId3["Shotgun"] = "shotgun";
+  WeaponId3["SuperShotgun"] = "supershotgun";
+  WeaponId3["Machinegun"] = "machinegun";
+  WeaponId3["Chaingun"] = "chaingun";
+  WeaponId3["GrenadeLauncher"] = "grenadelauncher";
+  WeaponId3["RocketLauncher"] = "rocketlauncher";
+  WeaponId3["HyperBlaster"] = "hyperblaster";
+  WeaponId3["Railgun"] = "railgun";
+  WeaponId3["BFG10K"] = "bfg10k";
+  WeaponId3["HandGrenade"] = "grenades";
+  WeaponId3["Grapple"] = "grapple";
+  WeaponId3["IonRipper"] = "ionripper";
+  WeaponId3["Phalanx"] = "phalanx";
+  WeaponId3["Trap"] = "trap";
+  WeaponId3["PlasmaBeam"] = "plasmabeam";
+  WeaponId3["EtfRifle"] = "etfrifle";
+  WeaponId3["ProxLauncher"] = "proxlauncher";
+  WeaponId3["ChainFist"] = "chainfist";
+  WeaponId3["Disruptor"] = "disruptor";
+  return WeaponId3;
+})(WeaponId || {});
+var PowerupId = /* @__PURE__ */ ((PowerupId3) => {
+  PowerupId3["QuadDamage"] = "quad";
+  PowerupId3["Invulnerability"] = "invulnerability";
+  PowerupId3["Silencer"] = "silencer";
+  PowerupId3["Rebreather"] = "rebreather";
+  PowerupId3["EnviroSuit"] = "enviro";
+  PowerupId3["DoubleDamage"] = "double";
+  PowerupId3["QuadFire"] = "quadfire";
+  PowerupId3["Invisibility"] = "invisibility";
+  PowerupId3["Bandolier"] = "bandolier";
+  PowerupId3["AmmoPack"] = "pack";
+  PowerupId3["IRGoggles"] = "goggles";
+  PowerupId3["SphereVengeance"] = "vengeance";
+  PowerupId3["SphereHunter"] = "hunter";
+  PowerupId3["SphereDefender"] = "defender";
+  PowerupId3["Doppelganger"] = "doppelganger";
+  PowerupId3["TagToken"] = "tagtoken";
+  PowerupId3["TechResistance"] = "tech_resistance";
+  PowerupId3["TechStrength"] = "tech_strength";
+  PowerupId3["TechHaste"] = "tech_haste";
+  PowerupId3["TechRegeneration"] = "tech_regeneration";
+  PowerupId3["Flashlight"] = "flashlight";
+  PowerupId3["Compass"] = "compass";
+  return PowerupId3;
+})(PowerupId || {});
 var KeyId = /* @__PURE__ */ ((KeyId2) => {
-  KeyId2["Blue"] = "blue";
-  KeyId2["Red"] = "red";
-  KeyId2["Green"] = "green";
-  KeyId2["Yellow"] = "yellow";
-  KeyId2["DataCD"] = "data_cd";
-  KeyId2["PowerCube"] = "power_cube";
-  KeyId2["ExplosiveCharges"] = "explosive_charges";
-  KeyId2["PowerCore"] = "power_core";
-  KeyId2["Pyramid"] = "pyramid";
-  KeyId2["DataSpinner"] = "data_spinner";
-  KeyId2["Pass"] = "pass";
-  KeyId2["CommanderHead"] = "commander_head";
-  KeyId2["Airstrike"] = "airstrike";
-  KeyId2["NukeContainer"] = "nuke_container";
-  KeyId2["Nuke"] = "nuke";
-  KeyId2["RedFlag"] = "red_flag";
-  KeyId2["BlueFlag"] = "blue_flag";
+  KeyId2["Blue"] = "key_blue";
+  KeyId2["Red"] = "key_red";
+  KeyId2["Green"] = "key_green";
+  KeyId2["Yellow"] = "key_yellow";
+  KeyId2["DataCD"] = "key_data_cd";
+  KeyId2["PowerCube"] = "key_power_cube";
+  KeyId2["ExplosiveCharges"] = "key_explosive_charges";
+  KeyId2["PowerCore"] = "key_power_core";
+  KeyId2["Pyramid"] = "key_pyramid";
+  KeyId2["DataSpinner"] = "key_data_spinner";
+  KeyId2["Pass"] = "key_pass";
+  KeyId2["CommanderHead"] = "key_commander_head";
+  KeyId2["Airstrike"] = "key_airstrike";
+  KeyId2["NukeContainer"] = "key_nuke_container";
+  KeyId2["Nuke"] = "key_nuke";
+  KeyId2["RedFlag"] = "key_red_flag";
+  KeyId2["BlueFlag"] = "key_blue_flag";
   return KeyId2;
 })(KeyId || {});
-function createPlayerInventory(options = {}) {
-  const ammo = createAmmoInventory(options.ammoCaps, options.ammo);
-  const ownedWeapons = new Set(options.weapons ?? []);
-  const powerups = new Map(options.powerups ?? []);
-  const keys = new Set(options.keys ?? []);
-  const items = new Set(options.items ?? []);
-  return {
-    ammo,
-    ownedWeapons,
-    currentWeapon: options.currentWeapon,
-    armor: options.armor ?? null,
-    powerups,
-    keys,
-    items
-  };
+function createPlayerInventory(init = {}) {
+  const ammoCaps = init.ammoCaps;
+  const inv = {
+    ammo: createAmmoInventory(ammoCaps),
+    ownedWeapons: new Set(init.weapons ?? ["blaster" /* Blaster */]),
+    armor: null,
+    powerups: /* @__PURE__ */ new Map(),
+    keys: /* @__PURE__ */ new Set(),
+    items: /* @__PURE__ */ new Set()
+  };
+  if (init.ammo) {
+    for (const [type, count] of Object.entries(init.ammo)) {
+      inv.ammo.counts[Number(type)] = count;
+    }
+  }
+  if (init.currentWeapon) {
+    inv.currentWeapon = init.currentWeapon;
+  } else if (inv.ownedWeapons.size > 0) {
+    if (inv.ownedWeapons.has("blaster" /* Blaster */)) inv.currentWeapon = "blaster" /* Blaster */;
+    else if (inv.ownedWeapons.has("shotgun" /* Shotgun */)) inv.currentWeapon = "shotgun" /* Shotgun */;
+    else inv.currentWeapon = [...inv.ownedWeapons][0];
+  }
+  return inv;
 }
 function setPickup(inventory, item, time) {
   inventory.pickupItem = item;
   inventory.pickupTime = time;
 }
-function giveAmmo(inventory, ammoType, amount) {
-  return addAmmo(inventory.ammo, ammoType, amount);
-}
 function giveAmmoItem(inventory, itemId, options) {
   return pickupAmmo(inventory.ammo, itemId, options);
 }
@@ -1630,27 +1647,27 @@ function pickupPowerup(client, item, time) {
   let icon = "";
   switch (item.id) {
     case "item_quad":
-      powerupId = PowerupId.QuadDamage;
+      powerupId = "quad" /* QuadDamage */;
       icon = "p_quad";
       break;
     case "item_invulnerability":
-      powerupId = PowerupId.Invulnerability;
+      powerupId = "invulnerability" /* Invulnerability */;
       icon = "p_invulnerability";
       break;
     case "item_silencer":
-      powerupId = PowerupId.Silencer;
+      powerupId = "silencer" /* Silencer */;
       icon = "p_silencer";
       break;
     case "item_rebreather":
-      powerupId = PowerupId.Rebreather;
+      powerupId = "rebreather" /* Rebreather */;
       icon = "p_rebreather";
       break;
     case "item_enviro":
-      powerupId = PowerupId.EnviroSuit;
+      powerupId = "enviro" /* EnviroSuit */;
       icon = "p_envirosuit";
       break;
     case "item_double":
-      powerupId = PowerupId.DoubleDamage;
+      powerupId = "double" /* DoubleDamage */;
       icon = "p_double";
       break;
   }
@@ -1658,9 +1675,9 @@ function pickupPowerup(client, item, time) {
     const expiresAt = inventory.powerups.get(powerupId);
     const newExpiresAt = expiresAt && expiresAt > time ? expiresAt + item.timer * 1e3 : time + item.timer * 1e3;
     inventory.powerups.set(powerupId, newExpiresAt);
-    if (powerupId === PowerupId.QuadDamage) {
+    if (powerupId === "quad" /* QuadDamage */) {
       client.quad_time = newExpiresAt / 1e3;
-    } else if (powerupId === PowerupId.DoubleDamage) {
+    } else if (powerupId === "double" /* DoubleDamage */) {
       client.double_time = newExpiresAt / 1e3;
     }
     setPickup(inventory, icon, time);
@@ -1688,19 +1705,19 @@ function pickupKey(inventory, item, time) {
   let icon = "";
   switch (item.id) {
     case "key_blue":
-      keyId = "blue" /* Blue */;
+      keyId = "key_blue" /* Blue */;
       icon = "k_bluekey";
       break;
     case "key_red":
-      keyId = "red" /* Red */;
+      keyId = "key_red" /* Red */;
       icon = "k_redkey";
       break;
     case "key_green":
-      keyId = "green" /* Green */;
+      keyId = "key_green" /* Green */;
       icon = "k_security";
       break;
     case "key_yellow":
-      keyId = "yellow" /* Yellow */;
+      keyId = "key_yellow" /* Yellow */;
       icon = "k_pyramid";
       break;
   }
@@ -4428,6 +4445,13 @@ 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;
+})(WeaponStateEnum || {});
 function createPlayerWeaponStates() {
   return {
     states: /* @__PURE__ */ new Map()
@@ -4450,7 +4474,7 @@ function chaingunThink(player, sys) {
   if (!player.client) {
     return;
   }
-  const weaponState = getWeaponState(player.client.weaponStates, WeaponId.Chaingun);
+  const weaponState = getWeaponState(player.client.weaponStates, "chaingun" /* Chaingun */);
   if (!(player.client.buttons & BUTTON_ATTACK) && weaponState.spinupCount && weaponState.spinupCount > 0) {
     sys.sound(player, 0, "weapons/chngnd1a.wav", 1, 0, 0);
     weaponState.spinupCount = 0;
@@ -4463,7 +4487,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_blaster",
     name: "Blaster",
-    weaponId: WeaponId.Blaster,
+    weaponId: "blaster" /* Blaster */,
     ammoType: null,
     initialAmmo: 0,
     pickupAmmo: 0,
@@ -4473,7 +4497,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_shotgun",
     name: "Shotgun",
-    weaponId: WeaponId.Shotgun,
+    weaponId: "shotgun" /* Shotgun */,
     ammoType: AmmoType.Shells,
     initialAmmo: 10,
     pickupAmmo: 10,
@@ -4483,7 +4507,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_supershotgun",
     name: "Super Shotgun",
-    weaponId: WeaponId.SuperShotgun,
+    weaponId: "supershotgun" /* SuperShotgun */,
     ammoType: AmmoType.Shells,
     initialAmmo: 10,
     pickupAmmo: 10,
@@ -4493,7 +4517,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_machinegun",
     name: "Machinegun",
-    weaponId: WeaponId.Machinegun,
+    weaponId: "machinegun" /* Machinegun */,
     ammoType: AmmoType.Bullets,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4504,7 +4528,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_chaingun",
     name: "Chaingun",
-    weaponId: WeaponId.Chaingun,
+    weaponId: "chaingun" /* Chaingun */,
     ammoType: AmmoType.Bullets,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4514,7 +4538,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_grenades",
     name: "Hand Grenade",
-    weaponId: WeaponId.HandGrenade,
+    weaponId: "grenades" /* HandGrenade */,
     ammoType: AmmoType.Grenades,
     initialAmmo: 5,
     pickupAmmo: 5,
@@ -4524,7 +4548,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_grenadelauncher",
     name: "Grenade Launcher",
-    weaponId: WeaponId.GrenadeLauncher,
+    weaponId: "grenadelauncher" /* GrenadeLauncher */,
     ammoType: AmmoType.Grenades,
     initialAmmo: 10,
     pickupAmmo: 10,
@@ -4534,7 +4558,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_rocketlauncher",
     name: "Rocket Launcher",
-    weaponId: WeaponId.RocketLauncher,
+    weaponId: "rocketlauncher" /* RocketLauncher */,
     ammoType: AmmoType.Rockets,
     initialAmmo: 5,
     pickupAmmo: 5,
@@ -4544,7 +4568,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_hyperblaster",
     name: "HyperBlaster",
-    weaponId: WeaponId.HyperBlaster,
+    weaponId: "hyperblaster" /* HyperBlaster */,
     ammoType: AmmoType.Cells,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4554,7 +4578,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_railgun",
     name: "Railgun",
-    weaponId: WeaponId.Railgun,
+    weaponId: "railgun" /* Railgun */,
     ammoType: AmmoType.Slugs,
     initialAmmo: 10,
     pickupAmmo: 10,
@@ -4564,7 +4588,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_bfg",
     name: "BFG10K",
-    weaponId: WeaponId.BFG10K,
+    weaponId: "bfg10k" /* BFG10K */,
     ammoType: AmmoType.Cells,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4576,7 +4600,7 @@ var WEAPON_ITEMS = {
     id: "weapon_boomer",
     // Ion Ripper
     name: "Ion Ripper",
-    weaponId: WeaponId.IonRipper,
+    weaponId: "ionripper" /* IonRipper */,
     ammoType: AmmoType.Cells,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4586,7 +4610,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_phalanx",
     name: "Phalanx",
-    weaponId: WeaponId.Phalanx,
+    weaponId: "phalanx" /* Phalanx */,
     ammoType: AmmoType.MagSlugs,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4596,7 +4620,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_beam",
     name: "Plasma Beam",
-    weaponId: WeaponId.PlasmaBeam,
+    weaponId: "plasmabeam" /* PlasmaBeam */,
     ammoType: AmmoType.Cells,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4606,7 +4630,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_etf_rifle",
     name: "ETF Rifle",
-    weaponId: WeaponId.EtfRifle,
+    weaponId: "etfrifle" /* EtfRifle */,
     ammoType: AmmoType.Flechettes,
     initialAmmo: 50,
     pickupAmmo: 50,
@@ -4616,7 +4640,7 @@ var WEAPON_ITEMS = {
     type: "weapon",
     id: "weapon_proxlauncher",
     name: "Prox Launcher",
-    weaponId: WeaponId.ProxLauncher,
+    weaponId: "proxlauncher" /* ProxLauncher */,
     ammoType: AmmoType.Prox,
     initialAmmo: 5,
     pickupAmmo: 5,
@@ -13787,24 +13811,24 @@ function player_think(self, sys) {
 
 // src/entities/playerStats.ts
 var WEAPON_WHEEL_ORDER = [
-  WeaponId.Blaster,
-  WeaponId.Shotgun,
-  WeaponId.SuperShotgun,
-  WeaponId.Machinegun,
-  WeaponId.Chaingun,
-  WeaponId.GrenadeLauncher,
-  WeaponId.RocketLauncher,
-  WeaponId.HandGrenade,
-  WeaponId.HyperBlaster,
-  WeaponId.Railgun,
-  WeaponId.BFG10K
+  "blaster" /* Blaster */,
+  "shotgun" /* Shotgun */,
+  "supershotgun" /* SuperShotgun */,
+  "machinegun" /* Machinegun */,
+  "chaingun" /* Chaingun */,
+  "grenadelauncher" /* GrenadeLauncher */,
+  "rocketlauncher" /* RocketLauncher */,
+  "grenades" /* HandGrenade */,
+  "hyperblaster" /* HyperBlaster */,
+  "railgun" /* Railgun */,
+  "bfg10k" /* BFG10K */
 ];
 var POWERUP_TIMERS = [
-  { id: PowerupId.QuadDamage, priority: 1 },
-  { id: PowerupId.Invulnerability, priority: 2 },
-  { id: PowerupId.EnviroSuit, priority: 3 },
-  { id: PowerupId.Rebreather, priority: 4 },
-  { id: PowerupId.Silencer, priority: 5 }
+  { id: "quad" /* QuadDamage */, priority: 1 },
+  { id: "invulnerability" /* Invulnerability */, priority: 2 },
+  { id: "enviro" /* EnviroSuit */, priority: 3 },
+  { id: "rebreather" /* Rebreather */, priority: 4 },
+  { id: "silencer" /* Silencer */, priority: 5 }
 ];
 function populatePlayerStats(player, timeSeconds) {
   if (!player.client) return [];
@@ -14202,20 +14226,20 @@ function createGame(imports, engine, options) {
     const blend = [0, 0, 0, 0];
     if (!player || !player.client) return blend;
     const inventory = player.client.inventory;
-    if (inventory.powerups.has(PowerupId.QuadDamage)) {
+    if (inventory.powerups.has("quad" /* QuadDamage */)) {
       blend[2] = 1;
       blend[3] = 0.08;
     }
-    if (inventory.powerups.has(PowerupId.Invulnerability)) {
+    if (inventory.powerups.has("invulnerability" /* Invulnerability */)) {
       blend[0] = 1;
       blend[1] = 1;
       blend[3] = 0.08;
     }
-    if (inventory.powerups.has(PowerupId.EnviroSuit)) {
+    if (inventory.powerups.has("enviro" /* EnviroSuit */)) {
       blend[1] = 1;
       blend[3] = 0.08;
     }
-    if (inventory.powerups.has(PowerupId.Rebreather)) {
+    if (inventory.powerups.has("rebreather" /* Rebreather */)) {
       blend[0] = 0.4;
       blend[1] = 1;
       blend[2] = 0.4;
@@ -14520,6 +14544,7 @@ function createGame(imports, engine, options) {
   WEAPONS,
   WEAPON_ITEMS,
   WeaponId,
+  WeaponStateEnum,
   WeaponType,
   addAmmo,
   addKey,
@@ -14570,7 +14595,6 @@ function createGame(imports, engine, options) {
   foundTarget,
   getAmmoItemDefinition,
   getWeaponState,
-  giveAmmo,
   giveAmmoItem,
   giveWeapon,
   hasAnyDamageFlag,
@@ -14602,7 +14626,6 @@ function createGame(imports, engine, options) {
   serializePlayerInventory,
   serializeRereleaseSave,
   setMovedir,
-  setPickup,
   spawnEntitiesFromText,
   spawnEntityFromDictionary,
   summarizeRereleaseSave,