quake2ts 0.0.183 → 0.0.184

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

@@ -3011,6 +3011,12 @@ var EntitySystem = class {
   get rng() {
     return this.random;
   }
+  setSpawnRegistry(registry) {
+    this.spawnRegistry = registry;
+  }
+  getSpawnFunction(classname) {
+    return this.spawnRegistry?.get(classname);
+  }
   get trace() {
     return this.imports.trace;
   }
@@ -9240,18 +9246,79 @@ function medic_fire_blaster(self, context) {
   const forward = normalizeVec3(subtractVec3(self.enemy.origin, start));
   monster_fire_blaster(self, start, forward, 2, 1e3, 0, 0, context, 10 /* HYPERBLASTER */);
 }
-function medic_heal(self, context) {
+function medic_cable_attack(self, context) {
+  if (!self.enemy || self.enemy.deadflag !== 2 /* Dead */) {
+    return;
+  }
+  const dist = rangeTo(self, self.enemy);
+  if (dist > 400) {
+    self.monsterinfo.current_move = run_move13;
+    return;
+  }
+  const vectors = angleVectors(self.angles);
+  const f = vectors.forward;
+  const r = vectors.right;
+  const u = vectors.up;
+  const offset = { x: 24, y: 0, z: 6 };
+  const start = addVec3(
+    self.origin,
+    addVec3(
+      scaleVec3(f, offset.x),
+      addVec3(scaleVec3(r, offset.y), scaleVec3(u, offset.z))
+    )
+  );
+  const end = self.enemy.origin;
+  context.multicast(self.origin, 1 /* Pvs */, ServerCommand.temp_entity, {
+    te: TempEntity.MEDIC_CABLE_ATTACK,
+    entId: self.index,
+    targetId: self.enemy.index,
+    // Assuming targetId for the beam target
+    start,
+    end
+  });
+}
+function medic_hook_launch(self, context) {
+  context.engine.sound?.(self, 0, "medic/medatck2.wav", 1, 1, 0);
+  medic_cable_attack(self, context);
+}
+function medic_hook_retract(self, context) {
   if (!self.enemy || self.enemy.deadflag !== 2 /* Dead */) {
     return;
   }
   const ent = self.enemy;
-  ent.deadflag = 0 /* Alive */;
-  ent.health = ent.max_health;
-  ent.takedamage = true;
-  ent.solid = 2 /* BoundingBox */;
-  ent.nextthink = context.timeSeconds + 0.1;
-  if (ent.monsterinfo && ent.monsterinfo.stand) {
-    ent.monsterinfo.stand(ent, context);
+  const spawnFunc = context.getSpawnFunction(ent.classname);
+  if (rangeTo(self, ent) > 400) {
+    self.enemy = null;
+    return;
+  }
+  if (!spawnFunc) {
+    ent.deadflag = 0 /* Alive */;
+    ent.health = ent.max_health;
+    ent.takedamage = true;
+    ent.solid = 2 /* BoundingBox */;
+    ent.nextthink = context.timeSeconds + 0.1;
+    if (ent.monsterinfo && ent.monsterinfo.stand) {
+      ent.monsterinfo.stand(ent, context);
+    }
+  } else {
+    const spawnContext = {
+      entities: context,
+      keyValues: { classname: ent.classname },
+      // Minimal keyvalues
+      warn: (msg) => {
+      },
+      // Suppress warnings
+      free: (e) => context.free(e)
+    };
+    const origin = { ...ent.origin };
+    const angles = { ...ent.angles };
+    spawnFunc(ent, spawnContext);
+    ent.origin = origin;
+    ent.angles = angles;
+    context.linkentity(ent);
+    ent.deadflag = 0 /* Alive */;
+    ent.takedamage = true;
+    context.finalizeSpawn(ent);
   }
   self.enemy = null;
 }
@@ -9274,6 +9341,7 @@ function medic_find_dead(self, context) {
     if (ent.deadflag !== 2 /* Dead */) return;
     if (!ent.monsterinfo) return;
     if (ent.classname === "monster_medic") return;
+    if (ent.bad_medic === self) return;
     if (!visible(self, ent, traceWrapper)) return;
     const dist = rangeTo(self, ent);
     if (dist < bestDist) {
@@ -9335,15 +9403,22 @@ attack_hyper_move = {
   frames: attack_hyper_frames,
   endfunc: medic_run
 };
-var attack_cable_frames = Array.from({ length: 10 }, (_, i) => ({
-  ai: monster_ai_charge15,
-  dist: 0,
-  think: i === 5 ? medic_heal : null
-}));
+var attack_cable_frames = [
+  { ai: monster_ai_charge15, dist: 0, think: medic_hook_launch },
+  { ai: monster_ai_charge15, dist: 0, think: medic_cable_attack },
+  { ai: monster_ai_charge15, dist: 0, think: medic_cable_attack },
+  { ai: monster_ai_charge15, dist: 0, think: medic_cable_attack },
+  { ai: monster_ai_charge15, dist: 0, think: medic_cable_attack },
+  { ai: monster_ai_charge15, dist: 0, think: medic_cable_attack },
+  { ai: monster_ai_charge15, dist: 0, think: medic_cable_attack },
+  { ai: monster_ai_charge15, dist: 0, think: medic_cable_attack },
+  { ai: monster_ai_charge15, dist: 0, think: medic_hook_retract }
+];
 attack_cable_move = {
   firstframe: 106,
-  // Assume frames come after hyper attack
-  lastframe: 115,
+  // 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
 };
@@ -13036,7 +13111,7 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
     player.velocity = newState.velocity;
     player.angles = newState.viewAngles;
   };
-  return {
+  const gameExports = {
     init(startTimeMs) {
       resetState(startTimeMs);
       return snapshot(0);
@@ -13130,6 +13205,9 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
       frameLoop.reset(save.level.timeSeconds * 1e3);
     }
   };
+  const spawnRegistry = createDefaultSpawnRegistry(gameExports);
+  entities.setSpawnRegistry(spawnRegistry);
+  return gameExports;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {