quake2ts 0.0.216 → 0.0.217

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

@@ -1557,6 +1557,7 @@ var MoveType = /* @__PURE__ */ ((MoveType3) => {
   MoveType3[MoveType3["Toss"] = 7] = "Toss";
   MoveType3[MoveType3["FlyMissile"] = 8] = "FlyMissile";
   MoveType3[MoveType3["Bounce"] = 9] = "Bounce";
+  MoveType3[MoveType3["WallBounce"] = 10] = "WallBounce";
   return MoveType3;
 })(MoveType || {});
 var Solid = /* @__PURE__ */ ((Solid3) => {
@@ -2434,7 +2435,7 @@ function checkTriggers(ent, system) {
 
 // src/physics/movement.ts
 function runGravity(ent, gravity, frametime) {
-  if (ent.movetype === 7 /* Toss */) {
+  if (ent.movetype === 7 /* Toss */ || ent.movetype === 9 /* Bounce */ || ent.movetype === 10 /* WallBounce */) {
     if (!ent.velocity) ent.velocity = { x: 0, y: 0, z: 0 };
     if (!ent.origin) ent.origin = { x: 0, y: 0, z: 0 };
     if (ent.waterlevel > 1) {
@@ -2457,7 +2458,7 @@ function runGravity(ent, gravity, frametime) {
   }
 }
 function runBouncing(ent, imports, frametime) {
-  if (ent.movetype !== 9 /* Bounce */) {
+  if (ent.movetype !== 9 /* Bounce */ && ent.movetype !== 10 /* WallBounce */) {
     return;
   }
   if (!ent.velocity) ent.velocity = { x: 0, y: 0, z: 0 };
@@ -2468,8 +2469,17 @@ function runBouncing(ent, imports, frametime) {
     ent.origin = traceResult.endpos;
   }
   if (traceResult.fraction > 0 && traceResult.fraction < 1 && traceResult.plane) {
-    const clipped = clipVelocityVec3(ent.velocity, traceResult.plane.normal, 1.01);
-    ent.velocity = scaleVec3(clipped, ent.bounce);
+    let overbounce = 1.01;
+    if (ent.movetype === 10 /* WallBounce */) {
+      overbounce = 2;
+    } else {
+      overbounce = 1.6;
+    }
+    const clipped = clipVelocityVec3(ent.velocity, traceResult.plane.normal, overbounce);
+    ent.velocity = clipped;
+    if (ent.movetype === 10 /* WallBounce */) {
+      ent.angles = vectorToAngles(ent.velocity);
+    }
   }
 }
 function runStep(ent, system, imports, gravity, frametime) {
@@ -5881,7 +5891,15 @@ function createGrenade(sys, owner, start, dir, damage, speed) {
 }
 function createBlasterBolt(sys, owner, start, dir, damage, speed, mod) {
   const bolt = sys.spawn();
-  bolt.classname = mod === 10 /* HYPERBLASTER */ ? "hyperblaster_bolt" : "blaster_bolt";
+  if (mod === 10 /* HYPERBLASTER */) {
+    bolt.classname = "hyperblaster_bolt";
+  } else if (mod === 58 /* BLUEBLASTER */) {
+    bolt.classname = "blueblaster_bolt";
+    bolt.modelindex = sys.modelIndex("models/objects/laser/tris.md2");
+    bolt.skin = 1;
+  } else {
+    bolt.classname = "blaster_bolt";
+  }
   bolt.owner = owner;
   bolt.origin = { ...start };
   bolt.velocity = { x: dir.x * speed, y: dir.y * speed, z: dir.z * speed };
@@ -5911,13 +5929,61 @@ function createBlasterBolt(sys, owner, start, dir, damage, speed, mod) {
       );
     } else {
       if (plane) {
-        sys.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.BLASTER, self.origin, plane.normal);
+        let impactEffect = TempEntity.BLASTER;
+        if (mod === 58 /* BLUEBLASTER */) {
+          impactEffect = TempEntity.BLUEHYPERBLASTER;
+        }
+        sys.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, impactEffect, self.origin, plane.normal);
       }
     }
     sys.free(self);
   };
   sys.finalizeSpawn(bolt);
 }
+function createIonRipper(sys, owner, start, dir, damage, speed) {
+  const ion = sys.spawn();
+  ion.classname = "ionripper";
+  ion.owner = owner;
+  ion.origin = { ...start };
+  ion.velocity = { x: dir.x * speed, y: dir.y * speed, z: dir.z * speed };
+  ion.movetype = 10 /* WallBounce */;
+  ion.solid = 2 /* BoundingBox */;
+  ion.modelindex = sys.modelIndex("models/objects/boomrang/tris.md2");
+  ion.mins = { x: -2, y: -2, z: -2 };
+  ion.maxs = { x: 2, y: 2, z: 2 };
+  ion.touch = (self, other, plane, surf) => {
+    if (other === self.owner) {
+      return;
+    }
+    if (other && other.takedamage) {
+      T_Damage(
+        other,
+        self,
+        self.owner,
+        self.velocity,
+        self.origin,
+        plane ? plane.normal : ZERO_VEC3,
+        damage,
+        1,
+        4 /* ENERGY */,
+        35 /* RIPPER */,
+        sys.timeSeconds,
+        sys.multicast.bind(sys)
+      );
+      sys.free(self);
+      return;
+    }
+  };
+  ion.think = (self) => {
+    sys.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.WELDING_SPARKS, self.origin, ZERO_VEC3, 228);
+    sys.free(self);
+  };
+  sys.scheduleThink(ion, sys.timeSeconds + 3);
+  sys.finalizeSpawn(ion);
+}
+function createBlueBlaster(sys, owner, start, dir, damage, speed) {
+  createBlasterBolt(sys, owner, start, dir, damage, speed, 58 /* BLUEBLASTER */);
+}
 function fireBfgPiercingLaser(sys, bfg, target, damage) {
   const start = { ...bfg.origin };
   const targetCenter2 = {
@@ -6176,6 +6242,12 @@ function monster_fire_shotgun(self, start, aimdir, damage, kick, hspread, vsprea
 function monster_fire_blaster(self, start, dir, damage, speed, flashtype, effect, context, mod = 1 /* BLASTER */) {
   createBlasterBolt(context, self, start, dir, damage, speed, mod);
 }
+function monster_fire_blueblaster(self, start, dir, damage, speed, flashtype, effect, context) {
+  createBlueBlaster(context, self, start, dir, damage, speed);
+}
+function monster_fire_ionripper(self, start, dir, damage, speed, flashtype, effect, context) {
+  createIonRipper(context, self, start, dir, damage, speed);
+}
 function monster_fire_grenade(self, start, aim, damage, speed, flashtype, context) {
   createGrenade(context, self, start, aim, damage, speed);
 }
@@ -6238,12 +6310,36 @@ function monster_fire_heat(self, start, dir, damage, speed, flashtype, turn_frac
 function dabeam_update(self, context) {
   const start = { ...self.origin };
   const end = addVec3(start, scaleVec3(self.movedir, 2048));
-  const tr = context.trace(start, end, ZERO_VEC3, ZERO_VEC3, self, CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_PLAYER | CONTENTS_DEADMONSTER);
-  if (self.dmg > 0 && tr.ent && tr.ent.takedamage && tr.ent !== self.owner) {
-    T_Damage(tr.ent, self, self.owner, self.movedir, tr.endpos, ZERO_VEC3, self.dmg, 0, 4 /* ENERGY */, 31 /* TARGET_LASER */, context.timeSeconds);
-  }
-  if (tr.ent && tr.ent.solid === 3 /* Bsp */) {
-    context.multicast(tr.endpos, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.LASER_SPARKS, 10, tr.endpos, tr.plane?.normal || ZERO_VEC3, self.skin);
+  let currentStart = { ...start };
+  const MAX_PIERCE = 16;
+  const pierced = [];
+  const piercedSolidities = [];
+  try {
+    for (let i = 0; i < MAX_PIERCE; i++) {
+      const tr = context.trace(currentStart, end, ZERO_VEC3, ZERO_VEC3, self, CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_PLAYER | CONTENTS_DEADMONSTER);
+      if (!tr.ent || tr.fraction >= 1) {
+        break;
+      }
+      if (self.dmg > 0 && tr.ent.takedamage && tr.ent !== self.owner) {
+        T_Damage(tr.ent, self, self.owner, self.movedir, tr.endpos, ZERO_VEC3, self.dmg, 0, 4 /* ENERGY */, 31 /* TARGET_LASER */, context.timeSeconds);
+      }
+      if (tr.ent && tr.ent.solid === 3 /* Bsp */) {
+        context.multicast(tr.endpos, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.LASER_SPARKS, 10, tr.endpos, tr.plane?.normal || ZERO_VEC3, self.skin);
+        break;
+      }
+      if (tr.ent && (tr.ent.takedamage || tr.ent.client)) {
+        pierced.push(tr.ent);
+        piercedSolidities.push(tr.ent.solid);
+        tr.ent.solid = 0 /* Not */;
+        currentStart = { ...tr.endpos };
+        continue;
+      }
+      break;
+    }
+  } finally {
+    for (let i = 0; i < pierced.length; i++) {
+      pierced[i].solid = piercedSolidities[i];
+    }
   }
   context.linkentity(self);
 }
@@ -6266,11 +6362,7 @@ function monster_fire_dabeam(self, damage, secondary, update_func, context) {
     beam.owner = self;
     beam.dmg = damage;
     beam.frame = 2;
-    if (self.monsterinfo.aiflags & 64) {
-      beam.skin = 4092850673;
-    } else {
-      beam.skin = 4076007664;
-    }
+    beam.skin = 4076007664;
     beam.think = (ent, ctx) => {
       if (ent.postthink) {
         ent.postthink(ent, ctx);
@@ -10468,6 +10560,8 @@ function soldier_run(self) {
 function soldier_attack(self) {
   if (self.spawnflags & SOLDIER_MACHINEGUN) {
     self.monsterinfo.current_move = attack_move_mg;
+  } else if (self.style === 1 && self.count >= 4) {
+    self.monsterinfo.current_move = attack_move_mg;
   } else {
     self.monsterinfo.current_move = attack_move8;
   }
@@ -10526,9 +10620,59 @@ function soldier_fire_machinegun(self, context) {
   context.engine.sound?.(self, 0, "soldier/solatck3.wav", 1, 1, 0);
   monster_fire_bullet(self, start, forward, damage, kick, hspread, vspread, 0, context, 4 /* MACHINEGUN */);
 }
+function soldierh_laser_update(beam, context) {
+  const self = beam.owner;
+  if (!self || !self.enemy) return;
+  const { forward, right, up } = angleVectors(self.angles);
+  let start = { ...self.origin };
+  start = addVec3(start, scaleVec3(forward, 16));
+  start.z += self.viewheight;
+  const enemyCenter = { ...self.enemy.origin };
+  enemyCenter.z += self.enemy.viewheight || 0;
+  const dir = normalizeVec3(subtractVec3(enemyCenter, start));
+  beam.origin = start;
+  beam.movedir = dir;
+  context.linkentity(beam);
+}
+function soldier_fire_ripper(self, context) {
+  if (!self.enemy) return;
+  const start = get_fire_start(self);
+  const forward = get_fire_dir(self, start);
+  const damage = 5;
+  const speed = 600;
+  monster_fire_ionripper(self, start, forward, damage, speed, 0, 0, context);
+}
+function soldier_fire_hypergun(self, context) {
+  if (!self.enemy) return;
+  const start = get_fire_start(self);
+  const forward = get_fire_dir(self, start);
+  const damage = 1;
+  const speed = 600;
+  context.engine.sound?.(self, 0, "weapons/hyprbl1a.wav", 1, 1, 0);
+  monster_fire_blueblaster(self, start, forward, damage, speed, 0, 0, context);
+}
+function soldier_fire_laser(self, context) {
+  if (!self.enemy) return;
+  monster_fire_dabeam(self, 1, false, soldierh_laser_update, context);
+}
+function soldier_fire_xatrix(self, context) {
+  if (self.count < 2) {
+    soldier_fire_ripper(self, context);
+  } else if (self.count < 4) {
+    soldier_fire_hypergun(self, context);
+  } else {
+    soldier_fire_laser(self, context);
+  }
+}
 function soldier_fire(self, context) {
+  if (self.style === 1) {
+    soldier_fire_xatrix(self, context);
+    return;
+  }
   if (self.spawnflags & SOLDIER_SSG) {
     soldier_fire_ssg(self, context);
+  } else if (self.spawnflags & SOLDIER_MACHINEGUN) {
+    soldier_fire_machinegun(self, context);
   } else {
     soldier_fire_blaster(self, context);
   }
@@ -10578,7 +10722,10 @@ var attack_frames_mg = Array.from({ length: 10 }, (_, i) => ({
   ai: monster_ai_charge18,
   dist: 0,
   // Fire on frames 4, 5, 6, 7, 8
-  think: i >= 4 && i <= 8 ? soldier_fire_machinegun : null
+  // Note: Laser soldier fires continuously?
+  // C++: soldierh_hyperripper8 called on frames 11, 13, 18?
+  // Actually laser soldier (machinegun equivalent) fires on frames 4-8.
+  think: i >= 4 && i <= 8 ? soldier_fire : null
 }));
 attack_move_mg = {
   firstframe: 90,
@@ -10679,10 +10826,33 @@ function SP_monster_soldier_ssg(self, context) {
   self.spawnflags |= SOLDIER_SSG;
   SP_monster_soldier(self, context);
 }
+function SP_monster_soldier_x(self, context, skin, health) {
+  SP_monster_soldier(self, context);
+  self.style = 1;
+  self.skin = skin;
+  self.count = skin - 6;
+  self.health = health;
+  self.max_health = health;
+}
+function SP_monster_soldier_ripper(self, context) {
+  SP_monster_soldier_x(self, context, 6, 50);
+  self.model = "models/monsters/soldier/tris.md2";
+}
+function SP_monster_soldier_hypergun(self, context) {
+  SP_monster_soldier_x(self, context, 8, 60);
+  self.model = "models/monsters/soldier/tris.md2";
+}
+function SP_monster_soldier_lasergun(self, context) {
+  SP_monster_soldier_x(self, context, 10, 70);
+  self.model = "models/monsters/soldier/tris.md2";
+}
 function registerMonsterSpawns(registry) {
   registry.register("monster_soldier", SP_monster_soldier);
   registry.register("monster_soldier_light", SP_monster_soldier_light);
   registry.register("monster_soldier_ssg", SP_monster_soldier_ssg);
+  registry.register("monster_soldier_ripper", SP_monster_soldier_ripper);
+  registry.register("monster_soldier_hypergun", SP_monster_soldier_hypergun);
+  registry.register("monster_soldier_lasergun", SP_monster_soldier_lasergun);
 }
 
 // src/entities/monsters/supertank.ts