quake2ts 0.0.240 → 0.0.242

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

@@ -1277,6 +1277,11 @@ var AmmoItemId = /* @__PURE__ */ ((AmmoItemId22) => {
   AmmoItemId22["Grenades"] = "ammo_grenades";
   AmmoItemId22["Cells"] = "ammo_cells";
   AmmoItemId22["Slugs"] = "ammo_slugs";
+  AmmoItemId22["MagSlugs"] = "ammo_magslug";
+  AmmoItemId22["Flechettes"] = "ammo_flechettes";
+  AmmoItemId22["Disruptor"] = "ammo_disruptor";
+  AmmoItemId22["Tesla"] = "ammo_tesla";
+  AmmoItemId22["Trap"] = "ammo_trap";
   return AmmoItemId22;
 })(AmmoItemId || {});
 
@@ -1398,7 +1403,12 @@ var AMMO_ITEM_DEFINITIONS = {
   [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.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 }
 };
 function getAmmoItemDefinition(id) {
   return AMMO_ITEM_DEFINITIONS[id];
@@ -1417,6 +1427,11 @@ function createBaseAmmoCaps() {
   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;
   return caps;
 }
 function clampAmmoCounts(counts, caps) {
@@ -2664,7 +2679,7 @@ function runGravity(ent, gravity, frametime) {
     }
   }
 }
-function runBouncing(ent, imports, frametime) {
+function runBouncing(ent, system, imports, frametime) {
   if (ent.movetype !== 9 /* Bounce */ && ent.movetype !== 10 /* WallBounce */) {
     return;
   }
@@ -2674,6 +2689,13 @@ function runBouncing(ent, imports, frametime) {
   const traceResult = imports.trace(ent.origin, ent.mins, ent.maxs, end, ent, ent.clipmask);
   if (traceResult.fraction < 1) {
     ent.origin = traceResult.endpos;
+    if (traceResult.ent) {
+      resolveImpact(ent, traceResult, system);
+    } else {
+      if (ent.touch) {
+        ent.touch(ent, system.world, traceResult.plane, void 0);
+      }
+    }
   }
   if (traceResult.fraction > 0 && traceResult.fraction < 1 && traceResult.plane) {
     let overbounce = 1.01;
@@ -3479,11 +3501,11 @@ var EntitySystem = class {
       switch (ent.movetype) {
         case 7 /* Toss */:
           runGravity(ent, this.gravity, frametime);
-          runBouncing(ent, this.imports, frametime);
+          runBouncing(ent, this, this.imports, frametime);
           ent.timestamp = this.currentTimeSeconds;
           break;
         case 9 /* Bounce */:
-          runBouncing(ent, this.imports, frametime);
+          runBouncing(ent, this, this.imports, frametime);
           ent.timestamp = this.currentTimeSeconds;
           break;
         case 8 /* FlyMissile */:
@@ -4541,7 +4563,40 @@ var WEAPON_ITEMS = {
     initialAmmo: 50,
     pickupAmmo: 50,
     fireRate: 1
+  },
+  // Rogue Weapons
+  "weapon_boomer": {
+    type: "weapon",
+    id: "weapon_boomer",
+    // Ion Ripper
+    name: "Ion Ripper",
+    weaponId: WeaponId.IonRipper,
+    ammoType: AmmoType.Cells,
+    initialAmmo: 50,
+    pickupAmmo: 50,
+    fireRate: 0.1
+  },
+  "weapon_phalanx": {
+    type: "weapon",
+    id: "weapon_phalanx",
+    name: "Phalanx",
+    weaponId: WeaponId.Phalanx,
+    ammoType: AmmoType.MagSlugs,
+    initialAmmo: 50,
+    pickupAmmo: 50,
+    fireRate: 1
+  },
+  "weapon_beam": {
+    type: "weapon",
+    id: "weapon_beam",
+    name: "Plasma Beam",
+    weaponId: WeaponId.PlasmaBeam,
+    ammoType: AmmoType.Cells,
+    initialAmmo: 50,
+    pickupAmmo: 50,
+    fireRate: 0.1
   }
+  // ... add others as we implement them
 };
 var HEALTH_ITEMS = {
   "item_health_small": {
@@ -4929,37 +4984,53 @@ function move_calc(ent, dest, context, done) {
     context.scheduleThink(ent, context.timeSeconds + dt);
   }
 }
-function door_blocked(self, other) {
-  if (other && other.takedamage) {
-    const damage = self.dmg || 2;
-    other.health -= damage;
-  }
-  if (self.state === 1 /* Opening */) {
-    self.state = 3 /* Closing */;
-    self.think = door_go_down;
-  } else if (self.state === 3 /* Closing */) {
-    self.state = 1 /* Opening */;
-    self.think = door_go_up;
-  }
+var SPAWNFLAG_DOOR_START_OPEN = 1;
+var SPAWNFLAG_DOOR_CRUSHER = 4;
+var SPAWNFLAG_DOOR_NOMONSTER = 8;
+var SPAWNFLAG_DOOR_ANIMATED = 16;
+var SPAWNFLAG_DOOR_TOGGLE = 32;
+var SPAWNFLAG_DOOR_ANIMATED_FAST = 64;
+var EF_ANIM_ALL = 4;
+var EF_ANIM_ALLFAST = 8;
+function getMoveInfo(ent) {
+  return ent.moveinfo;
 }
 function door_hit_top(ent, context) {
+  const moveinfo = getMoveInfo(ent);
+  if (moveinfo && moveinfo.sound_end) {
+    context.sound(ent, 0, moveinfo.sound_end, 1, 1, 0);
+  }
   ent.state = 0 /* Open */;
-  if (ent.spawnflags & 32) {
+  if (ent.spawnflags & SPAWNFLAG_DOOR_TOGGLE) {
     return;
   }
   if (ent.wait === -1) {
     return;
   }
-  ent.think = door_go_down;
+  ent.think = (e) => door_go_down(e, context);
   context.scheduleThink(ent, context.timeSeconds + ent.wait);
 }
 function door_hit_bottom(ent, context) {
+  const moveinfo = getMoveInfo(ent);
+  if (moveinfo && moveinfo.sound_end) {
+    context.sound(ent, 0, moveinfo.sound_end, 1, 1, 0);
+  }
   ent.state = 2 /* Closed */;
 }
 function door_go_down(door, context) {
+  door.think = (e) => door_go_down(e, context);
+  const moveinfo = getMoveInfo(door);
+  if (moveinfo && moveinfo.sound_start) {
+    context.sound(door, 0, moveinfo.sound_start, 1, 1, 0);
+  }
   move_calc(door, door.pos1, context, door_hit_bottom);
 }
 function door_go_up(door, context) {
+  door.think = (e) => door_go_up(e, context);
+  const moveinfo = getMoveInfo(door);
+  if (moveinfo && moveinfo.sound_start) {
+    context.sound(door, 0, moveinfo.sound_start, 1, 1, 0);
+  }
   move_calc(door, door.pos2, context, door_hit_top);
 }
 var func_door = (entity, context) => {
@@ -4971,15 +5042,51 @@ var func_door = (entity, context) => {
   if (!entity.health) entity.health = 0;
   entity.solid = 3 /* Bsp */;
   entity.movetype = 2 /* Push */;
-  entity.blocked = door_blocked;
+  entity.blocked = (self, other) => {
+    if (other && other.takedamage) {
+      const damage = self.dmg || 2;
+      if (self.spawnflags & SPAWNFLAG_DOOR_CRUSHER) {
+        other.health -= damage;
+      } else {
+        other.health -= damage;
+      }
+    }
+    if (self.spawnflags & SPAWNFLAG_DOOR_CRUSHER) {
+      return;
+    }
+    if (self.state === 1 /* Opening */) {
+      self.state = 3 /* Closing */;
+      door_go_down(self, context.entities);
+    } else if (self.state === 3 /* Closing */) {
+      self.state = 1 /* Opening */;
+      door_go_up(self, context.entities);
+    }
+  };
   entity.state = 2 /* Closed */;
   entity.pos1 = { ...entity.origin };
   const move = entity.movedir.x * (Math.abs(entity.maxs.x - entity.mins.x) - entity.lip) + entity.movedir.y * (Math.abs(entity.maxs.y - entity.mins.y) - entity.lip) + entity.movedir.z * (Math.abs(entity.maxs.z - entity.mins.z) - entity.lip);
   entity.pos2 = addVec3(entity.pos1, scaleVec3(entity.movedir, move));
-  if (entity.spawnflags & 1) {
+  const moveinfo = {
+    sound_start: null,
+    sound_middle: null,
+    sound_end: null
+  };
+  if (entity.sounds !== 1) {
+    moveinfo.sound_start = "doors/dr1_strt.wav";
+    moveinfo.sound_middle = "doors/dr1_mid.wav";
+    moveinfo.sound_end = "doors/dr1_end.wav";
+  }
+  entity.moveinfo = moveinfo;
+  if (entity.spawnflags & SPAWNFLAG_DOOR_START_OPEN) {
     entity.origin = { ...entity.pos2 };
     entity.state = 0 /* Open */;
   }
+  if (entity.spawnflags & SPAWNFLAG_DOOR_ANIMATED) {
+    entity.effects |= EF_ANIM_ALL;
+  }
+  if (entity.spawnflags & SPAWNFLAG_DOOR_ANIMATED_FAST) {
+    entity.effects |= EF_ANIM_ALLFAST;
+  }
   if (entity.health > 0) {
     entity.takedamage = true;
     entity.max_health = entity.health;
@@ -4990,46 +5097,27 @@ var func_door = (entity, context) => {
     };
   }
   entity.use = (self, other, activator) => {
-    if (entity.spawnflags & 32) {
+    if (entity.spawnflags & SPAWNFLAG_DOOR_TOGGLE) {
       if (self.state === 2 /* Closed */) {
         self.state = 1 /* Opening */;
-        self.think = door_go_up;
-        context.entities.scheduleThink(self, context.entities.timeSeconds + 0.1);
+        door_go_up(self, context.entities);
       } else if (self.state === 0 /* Open */) {
         self.state = 3 /* Closing */;
-        self.think = door_go_down;
-        context.entities.scheduleThink(self, context.entities.timeSeconds + 0.1);
+        door_go_down(self, context.entities);
       }
       return;
     }
     if (self.state !== 2 /* Closed */) return;
     self.state = 1 /* Opening */;
-    self.think = door_go_up;
-    context.entities.scheduleThink(self, context.entities.timeSeconds + 0.1);
-    let soundName = "doors/dr1_strt.wav";
-    if (entity.sounds) {
-      switch (entity.sounds) {
-        case 1:
-          soundName = "doors/dr1_strt.wav";
-          break;
-        case 2:
-          soundName = "doors/dr2_strt.wav";
-          break;
-        case 3:
-          soundName = "doors/dr3_strt.wav";
-          break;
-        case 4:
-          soundName = "doors/dr4_strt.wav";
-          break;
-        default:
-          soundName = "doors/dr1_strt.wav";
-      }
-    }
-    context.entities.sound(self, 0, soundName, 1, 1, 0);
+    door_go_up(self, context.entities);
   };
   if (entity.health <= 0 && !entity.targetname) {
     entity.touch = (self, other) => {
-      if (!other || other.classname !== "player") return;
+      if (!other) return;
+      if (self.spawnflags & SPAWNFLAG_DOOR_NOMONSTER) {
+        if (other.svflags & 4 /* Monster */) return;
+      }
+      if (other.classname !== "player" && !(other.svflags & 4 /* Monster */)) return;
       self.use?.(self, other, other);
     };
   }
@@ -6289,6 +6377,16 @@ function createIonRipper(sys, owner, start, dir, damage, speed) {
       sys.free(self);
       return;
     }
+    self.count = (self.count || 0) + 1;
+    if (self.count > 5) {
+      sys.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.WELDING_SPARKS, self.origin, ZERO_VEC3, 228);
+      sys.free(self);
+      return;
+    }
+    sys.sound(self, 0, "weapons/ripphit.wav", 1, 1, 0);
+    if (plane) {
+      sys.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.WELDING_SPARKS, self.origin, plane.normal, 228);
+    }
   };
   ion.think = (self) => {
     sys.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.WELDING_SPARKS, self.origin, ZERO_VEC3, 228);
@@ -14001,6 +14099,8 @@ var ZERO_VEC37 = { x: 0, y: 0, z: 0 };
 function createGame(imports, engine, options) {
   const gravity = options.gravity;
   const deathmatch = options.deathmatch ?? false;
+  const rogue = options.rogue ?? false;
+  const xatrix = options.xatrix ?? false;
   const levelClock = new LevelClock();
   const frameLoop = new GameFrameLoop();
   const rng = options.random ?? new RandomGenerator();
@@ -14288,6 +14388,8 @@ function createGame(imports, engine, options) {
     },
     trace,
     deathmatch,
+    rogue,
+    xatrix,
     multicast(origin2, type, event, ...args) {
       multicast(origin2, type, event, ...args);
     },