quake2ts 0.0.186 → 0.0.188

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

@@ -2208,15 +2208,16 @@ function checkTriggers(ent, system) {
   if (ent.movetype === 0 /* None */) {
     return;
   }
-  system.forEachEntity((other) => {
-    if (other === ent) return;
-    if (other.solid !== 1 /* Trigger */) return;
-    if (!other.touch) return;
-    if (ent.absmax.x < other.absmin.x || ent.absmin.x > other.absmax.x) return;
-    if (ent.absmax.y < other.absmin.y || ent.absmin.y > other.absmax.y) return;
-    if (ent.absmax.z < other.absmin.z || ent.absmin.z > other.absmax.z) return;
+  const candidates = system.findInBox(ent.absmin, ent.absmax);
+  for (const other of candidates) {
+    if (other === ent) continue;
+    if (other.solid !== 1 /* Trigger */) continue;
+    if (!other.touch) continue;
+    if (ent.absmax.x < other.absmin.x || ent.absmin.x > other.absmax.x) continue;
+    if (ent.absmax.y < other.absmin.y || ent.absmin.y > other.absmax.y) continue;
+    if (ent.absmax.z < other.absmin.z || ent.absmin.z > other.absmax.z) continue;
     other.touch(other, ent);
-  });
+  }
 }
 
 // src/physics/movement.ts
@@ -2536,6 +2537,9 @@ var EntityPool = class {
     }
     return count;
   }
+  getByIndex(index) {
+    return this.entities[index];
+  }
   [Symbol.iterator]() {
     let current = this.activeHead;
     return {
@@ -2797,7 +2801,7 @@ var EntitySystem = class {
     this.thinkScheduler = new ThinkScheduler();
     this.engine = engine;
     this.deathmatch = deathmatch ?? false;
-    this.imports = imports || {
+    const defaultImports = {
       trace: () => ({
         allsolid: false,
         startsolid: false,
@@ -2821,11 +2825,14 @@ var EntitySystem = class {
           z: ent.origin.z + ent.maxs.z
         };
       },
+      areaEdicts: () => null,
+      // Default to null to signal fallback
       multicast: () => {
       },
       unicast: () => {
       }
     };
+    this.imports = { ...defaultImports, ...imports };
     this.gravity = gravity || { x: 0, y: 0, z: 0 };
     this.callbackToName = /* @__PURE__ */ new Map();
     if (callbackRegistry) {
@@ -2943,14 +2950,37 @@ var EntitySystem = class {
     }
     return Array.from(matches).filter((entity) => entity.inUse && !entity.freePending);
   }
+  findInBox(mins, maxs) {
+    const indices = this.imports.areaEdicts(mins, maxs);
+    if (indices === null) {
+      const results2 = [];
+      const bounds = { min: mins, max: maxs };
+      for (const entity of this.pool) {
+        if (!entity.inUse || entity.freePending || entity.solid === 0 /* Not */) continue;
+        if (boundsIntersect(bounds, computeBounds(entity))) {
+          results2.push(entity);
+        }
+      }
+      return results2;
+    }
+    const results = [];
+    for (const index of indices) {
+      const entity = this.pool.getByIndex(index);
+      if (entity && entity.inUse && !entity.freePending) {
+        results.push(entity);
+      }
+    }
+    return results;
+  }
   findByRadius(origin, radius) {
+    const mins = { x: origin.x - radius, y: origin.y - radius, z: origin.z - radius };
+    const maxs = { x: origin.x + radius, y: origin.y + radius, z: origin.z + radius };
+    const candidates = this.findInBox(mins, maxs);
     const matches = [];
-    for (const entity of this.pool) {
-      if (entity.inUse && !entity.freePending) {
-        const distance2 = lengthVec3(subtractVec3(origin, entity.origin));
-        if (distance2 <= radius) {
-          matches.push(entity);
-        }
+    for (const entity of candidates) {
+      const distance2 = lengthVec3(subtractVec3(origin, entity.origin));
+      if (distance2 <= radius) {
+        matches.push(entity);
       }
     }
     return matches;
@@ -3160,35 +3190,19 @@ var EntitySystem = class {
     const world = this.pool.world;
     const activeEntities = [];
     for (const entity of this.pool) {
-      if (entity === world) {
-        continue;
-      }
-      if (!entity.inUse || entity.freePending || entity.solid === 0 /* Not */) {
-        continue;
-      }
+      if (entity === world) continue;
+      if (!entity.inUse || entity.freePending || entity.solid === 0 /* Not */) continue;
       activeEntities.push(entity);
     }
-    for (let i = 0; i < activeEntities.length; i += 1) {
-      const first = activeEntities[i];
-      let firstBounds = null;
-      for (let j = i + 1; j < activeEntities.length; j += 1) {
-        const second = activeEntities[j];
-        if (!first.touch && !second.touch) {
-          continue;
-        }
-        if (!firstBounds) {
-          firstBounds = computeBounds(first);
-        }
+    for (const first of activeEntities) {
+      const candidates = this.findInBox(first.absmin, first.absmax);
+      const firstBounds = computeBounds(first);
+      for (const second of candidates) {
+        if (first === second) continue;
+        if (!first.touch) continue;
         const secondBounds = computeBounds(second);
-        if (!boundsIntersect(firstBounds, secondBounds)) {
-          continue;
-        }
-        if (first.touch) {
-          first.touch(first, second);
-        }
-        if (second.touch) {
-          second.touch(second, first);
-        }
+        if (!boundsIntersect(firstBounds, secondBounds)) continue;
+        first.touch(first, second);
       }
     }
   }
@@ -9017,9 +9031,11 @@ function registerMakronSpawns(registry) {
 // src/entities/monsters/medic.ts
 var MONSTER_TICK15 = 0.1;
 function monster_ai_stand15(self, dist, context) {
-  if (medic_find_dead(self, context)) {
-    self.monsterinfo.current_move = run_move13;
-    return;
+  if (self.classname === "monster_medic") {
+    if (medic_find_dead(self, context)) {
+      self.monsterinfo.current_move = run_move13;
+      return;
+    }
   }
   ai_stand(self, MONSTER_TICK15, context);
 }
@@ -9027,8 +9043,12 @@ function monster_ai_walk15(self, dist, context) {
   ai_walk(self, dist, MONSTER_TICK15, context);
 }
 function monster_ai_run14(self, dist, context) {
-  if (medic_find_dead(self, context)) {
-    self.monsterinfo.current_move = run_move13;
+  if (self.classname === "monster_medic") {
+    if (medic_find_dead(self, context)) {
+      self.monsterinfo.current_move = run_move13;
+    } else {
+      ai_run(self, dist, MONSTER_TICK15, context);
+    }
   } else {
     ai_run(self, dist, MONSTER_TICK15, context);
   }
@@ -9044,6 +9064,7 @@ var walk_move13;
 var run_move13;
 var attack_hyper_move;
 var attack_cable_move;
+var spawn_move;
 var pain_move8;
 var death_move12;
 function medic_stand(self) {
@@ -9053,11 +9074,13 @@ function medic_walk(self) {
   self.monsterinfo.current_move = walk_move13;
 }
 function medic_run(self) {
-  if (self.enemy && self.enemy.deadflag === 2 /* Dead */) {
-    const dist = rangeTo(self, self.enemy);
-    if (dist < 80) {
-      self.monsterinfo.current_move = attack_cable_move;
-      return;
+  if (self.classname === "monster_medic") {
+    if (self.enemy && self.enemy.deadflag === 2 /* Dead */) {
+      const dist = rangeTo(self, self.enemy);
+      if (dist < 80) {
+        self.monsterinfo.current_move = attack_cable_move;
+        return;
+      }
     }
   }
   if (self.enemy && self.enemy.health > 0) {
@@ -9067,10 +9090,16 @@ function medic_run(self) {
   }
 }
 function medic_attack(self) {
-  if (self.enemy && self.enemy.deadflag === 2 /* Dead */) {
+  if (self.classname === "monster_medic" && self.enemy && self.enemy.deadflag === 2 /* Dead */) {
     self.monsterinfo.current_move = attack_cable_move;
     return;
   }
+  if (self.classname === "monster_medic_commander") {
+    if (Math.random() < 0.2) {
+      self.monsterinfo.current_move = spawn_move;
+      return;
+    }
+  }
   self.monsterinfo.current_move = attack_hyper_move;
 }
 function medic_fire_blaster(self, context) {
@@ -9109,7 +9138,6 @@ function medic_cable_attack(self, context) {
     te: TempEntity.MEDIC_CABLE_ATTACK,
     entId: self.index,
     targetId: self.enemy.index,
-    // Assuming targetId for the beam target
     start,
     end
   });
@@ -9137,14 +9165,13 @@ function medic_hook_retract(self, context) {
     if (ent.monsterinfo && ent.monsterinfo.stand) {
       ent.monsterinfo.stand(ent, context);
     }
+    ent.bad_medic = self;
   } else {
     const spawnContext = {
       entities: context,
       keyValues: { classname: ent.classname },
-      // Minimal keyvalues
       warn: (msg) => {
       },
-      // Suppress warnings
       free: (e) => context.free(e)
     };
     const origin = { ...ent.origin };
@@ -9192,6 +9219,44 @@ function medic_find_dead(self, context) {
   }
   return false;
 }
+function medic_call_reinforcements(self, context) {
+  const r = Math.random();
+  let chosenClass = "monster_soldier_light";
+  if (r > 0.8) {
+    chosenClass = "monster_soldier_ssg";
+  } else if (r > 0.5) {
+    chosenClass = "monster_soldier";
+  }
+  const spawnFunc = context.getSpawnFunction(chosenClass);
+  if (spawnFunc) {
+    const vectors = angleVectors(self.angles);
+    const forwardDist = scaleVec3(vectors.forward, 64);
+    const spawnOrigin = addVec3(self.origin, forwardDist);
+    const adjustedOrigin = { ...spawnOrigin, z: spawnOrigin.z + 8 };
+    const tr = context.trace(self.origin, { x: -16, y: -16, z: -24 }, { x: 16, y: 16, z: 32 }, adjustedOrigin, self, CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_DEADMONSTER);
+    if (tr.fraction < 1 || tr.startsolid || tr.allsolid) {
+      return;
+    }
+    const ent = context.spawn();
+    ent.origin = adjustedOrigin;
+    ent.angles = { ...self.angles };
+    const spawnContext = {
+      entities: context,
+      keyValues: { classname: chosenClass },
+      warn: () => {
+      },
+      free: (e) => context.free(e)
+    };
+    spawnFunc(ent, spawnContext);
+    ent.enemy = self.enemy;
+    context.multicast(adjustedOrigin, 1 /* Pvs */, ServerCommand.muzzleflash, {
+      entId: ent.index,
+      flash_number: 0
+      // generic flash
+    });
+    context.engine.sound?.(self, 0, "medic/medatck2.wav", 1, 1, 0);
+  }
+}
 function medic_die(self) {
   self.monsterinfo.current_move = death_move12;
 }
@@ -9253,8 +9318,6 @@ var attack_cable_frames = [
 ];
 attack_cable_move = {
   firstframe: 106,
-  // FRAME_attack42 (starts at 0+30+40+20+16 = 106) ... wait, check original counts.
-  // stand=30, walk=40, run=20, hyper=16. 30+40+20+16 = 106. Correct.
   lastframe: 114,
   frames: attack_cable_frames,
   endfunc: medic_run
@@ -9269,13 +9332,25 @@ pain_move8 = {
   frames: pain_frames8,
   endfunc: medic_run
 };
-var death_frames12 = Array.from({ length: 10 }, () => ({
+var spawn_frames = Array.from({ length: 23 }, (_, i) => ({
+  ai: monster_ai_move15,
+  dist: 0,
+  think: i === 11 ? medic_call_reinforcements : null
+  // Trigger halfway
+}));
+spawn_move = {
+  firstframe: 122,
+  lastframe: 144,
+  frames: spawn_frames,
+  endfunc: medic_run
+};
+var death_frames12 = Array.from({ length: 30 }, () => ({
   ai: monster_ai_move15,
   dist: 0
 }));
 death_move12 = {
-  firstframe: 122,
-  lastframe: 131,
+  firstframe: 161,
+  lastframe: 190,
   frames: death_frames12,
   endfunc: medic_dead
 };
@@ -9293,6 +9368,10 @@ function SP_monster_medic(self, context) {
   self.pain = (self2, other, kick, damage) => {
     if (self2.health < self2.max_health / 2) {
       self2.monsterinfo.current_move = pain_move8;
+      if (Math.random() < 0.5) {
+        const sound = self2.classname === "monster_medic_commander" ? "medic/medpain2.wav" : "medic/medpain1.wav";
+        context.entities.sound?.(self2, 0, sound, 1, 1, 0);
+      }
     }
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
@@ -9313,8 +9392,16 @@ function SP_monster_medic(self, context) {
   medic_stand(self);
   self.nextthink = self.timestamp + MONSTER_TICK15;
 }
+function SP_monster_medic_commander(self, context) {
+  SP_monster_medic(self, context);
+  self.classname = "monster_medic_commander";
+  self.health = 600;
+  self.max_health = 600;
+  self.skin = 1;
+}
 function registerMedicSpawns(registry) {
   registry.register("monster_medic", SP_monster_medic);
+  registry.register("monster_medic_commander", SP_monster_medic_commander);
 }
 
 // src/entities/monsters/mutant.ts
@@ -12780,13 +12867,29 @@ var WEAPONS = {
 
 // src/index.ts
 var ZERO_VEC38 = { x: 0, y: 0, z: 0 };
-function createGame({ trace, pointcontents, multicast, unicast }, engine, options) {
+function createGame(imports, engine, options) {
   const gravity = options.gravity;
   const deathmatch = options.deathmatch ?? false;
   const levelClock = new LevelClock();
   const frameLoop = new GameFrameLoop();
   const rng = options.random ?? new RandomGenerator();
-  const linkentity = (ent) => {
+  const trace = imports.trace || (() => ({
+    allsolid: false,
+    startsolid: false,
+    fraction: 1,
+    endpos: { x: 0, y: 0, z: 0 },
+    plane: null,
+    surfaceFlags: 0,
+    contents: 0,
+    ent: null
+  }));
+  const pointcontents = imports.pointcontents || (() => 0);
+  const multicast = imports.multicast || (() => {
+  });
+  const unicast = imports.unicast || (() => {
+  });
+  const linkentity = imports.linkentity;
+  const wrappedLinkEntity = (ent) => {
     ent.absmin = {
       x: ent.origin.x + ent.mins.x,
       y: ent.origin.y + ent.mins.y,
@@ -12797,8 +12900,19 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
       y: ent.origin.y + ent.maxs.y,
       z: ent.origin.z + ent.maxs.z
     };
+    if (linkentity) {
+      linkentity(ent);
+    }
+  };
+  const systemImports = {
+    ...imports,
+    trace,
+    pointcontents,
+    linkentity: wrappedLinkEntity,
+    multicast,
+    unicast
   };
-  const entities = new EntitySystem(engine, { trace, pointcontents, linkentity, multicast, unicast }, gravity, void 0, void 0, deathmatch);
+  const entities = new EntitySystem(engine, systemImports, gravity, void 0, void 0, deathmatch);
   frameLoop.addStage("prep", (context) => {
     levelClock.tick(context);
     entities.beginFrame(levelClock.current.timeSeconds);