quake2ts 0.0.263 → 0.0.268

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

@@ -128,15 +128,15 @@ function rotatePointAroundVector(dir, point, degrees) {
   const vf = normalizeVec3(dir);
   const vr = perpendicularVec3(vf);
   const vup = crossVec3(vr, vf);
-  const m2 = [
+  const m3 = [
     [vr.x, vup.x, vf.x],
     [vr.y, vup.y, vf.y],
     [vr.z, vup.z, vf.z]
   ];
   const im = [
-    [m2[0][0], m2[1][0], m2[2][0]],
-    [m2[0][1], m2[1][1], m2[2][1]],
-    [m2[0][2], m2[1][2], m2[2][2]]
+    [m3[0][0], m3[1][0], m3[2][0]],
+    [m3[0][1], m3[1][1], m3[2][1]],
+    [m3[0][2], m3[1][2], m3[2][2]]
   ];
   const radians = degrees * DEG_TO_RAD;
   const cos = Math.cos(radians);
@@ -146,7 +146,7 @@ function rotatePointAroundVector(dir, point, degrees) {
     [-sin, cos, 0],
     [0, 0, 1]
   ];
-  const rot = concatRotationMatrices(concatRotationMatrices(m2, zrot), im);
+  const rot = concatRotationMatrices(concatRotationMatrices(m3, zrot), im);
   return {
     x: rot[0][0] * point.x + rot[0][1] * point.y + rot[0][2] * point.z,
     y: rot[1][0] * point.x + rot[1][1] * point.y + rot[1][2] * point.z,
@@ -512,12 +512,12 @@ function addReplayFrame(session, cmd, serverFrame, startTime) {
     timestamp: Date.now() - startTime
   });
 }
-var WaterLevel = /* @__PURE__ */ ((WaterLevel3) => {
-  WaterLevel3[WaterLevel3["None"] = 0] = "None";
-  WaterLevel3[WaterLevel3["Feet"] = 1] = "Feet";
-  WaterLevel3[WaterLevel3["Waist"] = 2] = "Waist";
-  WaterLevel3[WaterLevel3["Under"] = 3] = "Under";
-  return WaterLevel3;
+var WaterLevel = /* @__PURE__ */ ((WaterLevel4) => {
+  WaterLevel4[WaterLevel4["None"] = 0] = "None";
+  WaterLevel4[WaterLevel4["Feet"] = 1] = "Feet";
+  WaterLevel4[WaterLevel4["Waist"] = 2] = "Waist";
+  WaterLevel4[WaterLevel4["Under"] = 3] = "Under";
+  return WaterLevel4;
 })(WaterLevel || {});
 function applyPmoveFriction(params) {
   const {
@@ -594,12 +594,14 @@ function buildWaterWish(params) {
   let wishvel = {
     x: forward.x * cmd.forwardmove + right.x * cmd.sidemove,
     y: forward.y * cmd.forwardmove + right.y * cmd.sidemove,
-    z: 0
+    z: forward.z * cmd.forwardmove + right.z * cmd.sidemove
   };
   if (cmd.upmove > 10) {
     wishvel = addVec3(wishvel, { x: 0, y: 0, z: cmd.upmove });
   } else if (cmd.upmove < -10) {
     wishvel = addVec3(wishvel, { x: 0, y: 0, z: cmd.upmove });
+  } else if (Math.abs(cmd.forwardmove) < 10 && Math.abs(cmd.sidemove) < 10) {
+    wishvel = addVec3(wishvel, { x: 0, y: 0, z: -60 });
   } else {
     wishvel = addVec3(wishvel, { x: 0, y: 0, z: 10 });
   }
@@ -987,6 +989,13 @@ var U_MODEL3 = 1 << 1;
 var U_MODEL4 = 1 << 2;
 var U_REMOVE = 32768;
 var FRAMETIME = 0.025;
+var MASK_WATER2 = 33554432;
+var WaterLevel3 = {
+  None: 0,
+  Feet: 1,
+  Waist: 2,
+  Under: 3
+};
 var categorizePosition2 = (state, trace) => {
   const point = { ...state.origin };
   point.z -= 0.25;
@@ -998,12 +1007,26 @@ var categorizePosition2 = (state, trace) => {
 };
 var checkWater = (state, pointContents2) => {
   const point = { ...state.origin };
-  point.z += state.mins.z + 1;
+  const { mins, maxs } = state;
+  point.z = state.origin.z + mins.z + 1;
   const contents = pointContents2(point);
-  if (contents & 33554432) {
-    return { ...state, waterLevel: 1 };
-  }
-  return { ...state, waterLevel: 0 };
+  if (!(contents & MASK_WATER2)) {
+    return { ...state, waterLevel: WaterLevel3.None };
+  }
+  let waterLevel = WaterLevel3.Feet;
+  const waist = state.origin.z + (mins.z + maxs.z) * 0.5;
+  point.z = waist;
+  const waistContents = pointContents2(point);
+  if (waistContents & MASK_WATER2) {
+    waterLevel = WaterLevel3.Waist;
+    const head = state.origin.z + 22;
+    point.z = head;
+    const headContents = pointContents2(point);
+    if (headContents & MASK_WATER2) {
+      waterLevel = WaterLevel3.Under;
+    }
+  }
+  return { ...state, waterLevel };
 };
 var applyPmove = (state, cmd, trace, pointContents2) => {
   let newState = { ...state };
@@ -1043,7 +1066,8 @@ var applyPmove = (state, cmd, trace, pointContents2) => {
     velocity: frictionedVelocity,
     wishdir: wish.wishdir,
     wishspeed: wish.wishspeed,
-    accel: onGround ? 10 : 1,
+    // Water movement uses ground acceleration (10), not air acceleration (1)
+    accel: onGround || waterLevel >= 2 ? 10 : 1,
     frametime: FRAMETIME
   });
   const traceResult = trace(origin, {
@@ -4434,6 +4458,131 @@ function useTargetBlaster(self, other, activator, context) {
   }
   context.entities.sound(self, 2, "weapons/laser2.wav", 1, ATTN_NORM, 0);
 }
+var TARGET_LASER_START_ON = 1;
+var TARGET_LASER_RED = 2;
+var TARGET_LASER_GREEN = 4;
+var TARGET_LASER_BLUE = 8;
+var TARGET_LASER_YELLOW = 16;
+var TARGET_LASER_ORANGE = 32;
+var TARGET_LASER_FAT = 64;
+function target_laser_think(self, context) {
+  let count;
+  if (self.spawnflags & 2147483648) {
+    count = 8;
+  } else {
+    count = 4;
+  }
+  if (self.enemy) {
+    const last_movedir = { ...self.movedir };
+    const size = subtractVec3(self.enemy.maxs, self.enemy.mins);
+    const centerOffset = scaleVec3(size, 0.5);
+    const enemyCenter = addVec3(self.enemy.mins, centerOffset);
+    const dir = subtractVec3(enemyCenter, self.origin);
+    self.movedir = normalizeVec3(dir);
+    if (Math.abs(self.movedir.x - last_movedir.x) > 1e-3 || Math.abs(self.movedir.y - last_movedir.y) > 1e-3 || Math.abs(self.movedir.z - last_movedir.z) > 1e-3) {
+      self.spawnflags |= 2147483648;
+    }
+  }
+  let ignore = self;
+  let start = { ...self.origin };
+  const end = addVec3(start, scaleVec3(self.movedir, 2048));
+  let traceResult;
+  while (true) {
+    traceResult = context.entities.trace(start, end, ZERO_VEC3, ZERO_VEC3, ignore, CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_DEADMONSTER);
+    if (!traceResult.ent) {
+      break;
+    }
+    const trEnt = traceResult.ent;
+    if (trEnt.takedamage && !(trEnt.flags & 2)) {
+      T_Damage(trEnt, self, self.activator, self.movedir, traceResult.endpos, ZERO_VEC3, self.dmg, 1, 4 /* ENERGY */, 31 /* TARGET_LASER */, context.entities.timeSeconds);
+    }
+    if (!(trEnt.svflags & 1) && !trEnt.client) {
+      if (self.spawnflags & 2147483648) {
+        self.spawnflags &= ~2147483648;
+        context.entities.multicast(traceResult.endpos, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.LASER_SPARKS, count, traceResult.endpos, traceResult.plane?.normal || ZERO_VEC3, self.skin);
+      }
+      break;
+    }
+    ignore = trEnt;
+    start = { ...traceResult.endpos };
+  }
+  self.old_origin = { ...traceResult.endpos };
+  self.nextthink = context.entities.timeSeconds + 0.1;
+}
+function target_laser_on(self, context) {
+  if (!self.activator) {
+    self.activator = self;
+  }
+  self.spawnflags |= 2147483649;
+  self.svflags &= ~1 /* NoClient */;
+  target_laser_think(self, context);
+}
+function target_laser_off(self) {
+  self.spawnflags &= ~1;
+  self.svflags |= 1 /* NoClient */;
+  self.nextthink = 0;
+}
+function target_laser_use(self, other, activator, context) {
+  self.activator = activator;
+  if (self.spawnflags & 1) {
+    target_laser_off(self);
+  } else {
+    target_laser_on(self, context);
+  }
+}
+function target_laser_start(self, context) {
+  self.movetype = 0 /* None */;
+  self.solid = 0 /* Not */;
+  self.renderfx |= 8 | 64;
+  self.modelindex = 1;
+  if (self.spawnflags & TARGET_LASER_FAT) {
+    self.frame = 16;
+  } else {
+    self.frame = 4;
+  }
+  if (self.spawnflags & TARGET_LASER_RED) {
+    self.skin = 4076007664;
+  } else if (self.spawnflags & TARGET_LASER_GREEN) {
+    self.skin = 3503411923;
+  } else if (self.spawnflags & TARGET_LASER_BLUE) {
+    self.skin = 4092850673;
+  } else if (self.spawnflags & TARGET_LASER_YELLOW) {
+    self.skin = 3705528031;
+  } else if (self.spawnflags & TARGET_LASER_ORANGE) {
+    self.skin = 3772900067;
+  }
+  if (!self.enemy) {
+    if (self.target) {
+      let found = null;
+      context.entities.forEachEntity((ent) => {
+        if (ent.targetname === self.target) {
+          found = ent;
+        }
+      });
+      if (found) {
+        self.enemy = found;
+      } else {
+        context.warn(`${self.classname} at ${self.origin}: ${self.target} is a bad target`);
+        self.movedir = setMovedir(self.angles);
+      }
+    } else {
+      self.movedir = setMovedir(self.angles);
+    }
+  }
+  self.use = (s, o, a) => target_laser_use(s, o, a || null, context);
+  self.think = (s) => target_laser_think(s, context);
+  if (!self.dmg) {
+    self.dmg = 1;
+  }
+  self.absmin = addVec3(self.origin, { x: -8, y: -8, z: -8 });
+  self.absmax = addVec3(self.origin, { x: 8, y: 8, z: 8 });
+  context.entities.linkentity(self);
+  if (self.spawnflags & TARGET_LASER_START_ON) {
+    target_laser_on(self, context);
+  } else {
+    target_laser_off(self);
+  }
+}
 function registerTargetSpawns(registry) {
   registry.register("target_temp_entity", (entity, context) => {
     entity.style = context.keyValues.style ? parseInt(context.keyValues.style) : 0;
@@ -4516,6 +4665,10 @@ function registerTargetSpawns(registry) {
     if (!entity.speed) entity.speed = 1e3;
     entity.svflags |= 1 /* NoClient */;
   });
+  registry.register("target_laser", (entity, context) => {
+    entity.think = (self) => target_laser_start(self, context);
+    entity.nextthink = context.entities.timeSeconds + 1;
+  });
 }
 
 // src/entities/triggers.ts
@@ -9935,11 +10088,11 @@ function registerInfantrySpawns(registry) {
   registry.register("monster_infantry", SP_monster_infantry);
 }
 
-// src/entities/monsters/jorg.ts
+// src/entities/monsters/makron.ts
 var MONSTER_TICK13 = 0.1;
-var JORG_MACHINEGUN_R1_OFFSET = { x: 40, y: -20, z: 20 };
-var JORG_MACHINEGUN_L1_OFFSET = { x: 40, y: 20, z: 20 };
-var JORG_BFG_OFFSET = { x: 30, y: 0, z: 40 };
+var MAKRON_BFG_OFFSET = { x: 30, y: 28, z: 24 };
+var MAKRON_BLASTER_OFFSET_1 = { x: 26, y: 16, z: 24 };
+var MAKRON_RAILGUN_OFFSET = { x: 26, y: -14, z: 24 };
 function monster_ai_stand13(self, dist, context) {
   ai_stand(self, MONSTER_TICK13, context);
 }
@@ -9958,49 +10111,36 @@ function monster_ai_move13(self, dist, context) {
 var stand_move12;
 var walk_move11;
 var run_move11;
-var attack1_move3;
-var attack1_end_move;
-var attack2_move2;
-var pain1_move5;
-var pain2_move5;
-var pain3_move4;
+var attack_bfg_move;
+var attack_hyperblaster_move;
+var attack_railgun_move;
+var pain4_move;
+var pain5_move;
+var pain6_move;
 var death_move10;
-function jorg_stand(self) {
+var sight_move;
+function makron_stand(self) {
   self.monsterinfo.current_move = stand_move12;
 }
-function jorg_walk(self) {
+function makron_walk(self) {
   self.monsterinfo.current_move = walk_move11;
 }
-function jorg_run(self) {
+function makron_run(self) {
   if (self.enemy && self.enemy.health > 0) {
     self.monsterinfo.current_move = run_move11;
   } else {
     self.monsterinfo.current_move = stand_move12;
   }
 }
-function jorg_attack(self, context) {
+function makron_attack(self) {
   if (!self.enemy) return;
-  if (Math.random() <= 0.75) {
-    context.sound(self, 0, "boss3/bs3atck1.wav", 1, 1, 0);
-    self.monsterinfo.current_move = attack1_move3;
-  } else {
-    context.sound(self, 0, "boss3/bs3atck2.wav", 1, 1, 0);
-    self.monsterinfo.current_move = attack2_move2;
-  }
-}
-function jorg_reattack1(self, context) {
-  const traceFn = (start, mins, maxs, end, ignore, mask) => {
-    const tr = context.trace(start, mins, maxs, end, ignore, mask);
-    return { fraction: tr.fraction, ent: tr.ent };
-  };
-  if (self.enemy && visible(self, self.enemy, traceFn)) {
-    if (Math.random() < 0.9) {
-      self.monsterinfo.current_move = attack1_move3;
-    } else {
-      self.monsterinfo.current_move = attack1_end_move;
-    }
+  const r = Math.random();
+  if (r <= 0.3) {
+    self.monsterinfo.current_move = attack_bfg_move;
+  } else if (r <= 0.6) {
+    self.monsterinfo.current_move = attack_hyperblaster_move;
   } else {
-    self.monsterinfo.current_move = attack1_end_move;
+    self.monsterinfo.current_move = attack_railgun_move;
   }
 }
 function getProjectedOffset2(self, offset) {
@@ -10011,136 +10151,408 @@ function getProjectedOffset2(self, offset) {
   const z = scaleVec3(up, offset.z);
   return addVec3(addVec3(addVec3(start, x), y), z);
 }
-function jorg_fire_bullet(self, context) {
-  if (!self.enemy) return;
-  const startL = getProjectedOffset2(self, JORG_MACHINEGUN_L1_OFFSET);
-  const dirL = normalizeVec3(subtractVec3(self.enemy.origin, startL));
-  monster_fire_bullet_v2(self, startL, dirL, 6, 4, 0.05, 0.05, 0, context, 4 /* MACHINEGUN */);
-  const startR = getProjectedOffset2(self, JORG_MACHINEGUN_R1_OFFSET);
-  const dirR = normalizeVec3(subtractVec3(self.enemy.origin, startR));
-  monster_fire_bullet_v2(self, startR, dirR, 6, 4, 0.05, 0.05, 0, context, 4 /* MACHINEGUN */);
-}
-function jorg_fire_bfg(self, context) {
+function makron_fire_bfg(self, context) {
   if (!self.enemy) return;
-  const start = getProjectedOffset2(self, JORG_BFG_OFFSET);
+  context.engine.sound?.(self, 0, "makron/bfg_fire.wav", 1, 1, 0);
+  const start = getProjectedOffset2(self, MAKRON_BFG_OFFSET);
   const target = { ...self.enemy.origin };
   target.z += self.enemy.viewheight || 0;
   const dir = normalizeVec3(subtractVec3(target, start));
-  monster_fire_bfg(self, start, dir, 50, 300, 100, 200, 0, context);
+  monster_fire_bfg(self, start, dir, 50, 300, 100, 300, 0, context);
 }
-function jorg_pain(self, other, kick, damage, context) {
+function makron_fire_railgun(self, context) {
+  if (!self.pos1) return;
+  context.engine.sound?.(self, 0, "makron/rail_fire.wav", 1, 1, 0);
+  const start = getProjectedOffset2(self, MAKRON_RAILGUN_OFFSET);
+  const dir = normalizeVec3(subtractVec3(self.pos1, start));
+  monster_fire_railgun(self, start, dir, 50, 100, 0, context);
+}
+function makron_save_loc(self) {
+  if (!self.enemy) return;
+  self.pos1 = { ...self.enemy.origin };
+  self.pos1 = { ...self.pos1, z: self.pos1.z + (self.enemy.viewheight || 0) };
+}
+function makron_fire_hyperblaster(self, context) {
+  context.engine.sound?.(self, 0, "makron/blaster.wav", 1, 1, 0);
+  const start = getProjectedOffset2(self, MAKRON_BLASTER_OFFSET_1);
+  const relFrame = (self.monsterinfo.nextframe || 0) - attack_hyperblaster_move.firstframe;
+  let yawDelta = 0;
+  let dir;
+  if (self.enemy) {
+    const target = { ...self.enemy.origin };
+    target.z += self.enemy.viewheight || 0;
+    const vec = subtractVec3(target, start);
+    const baseAngles = vectorToAngles(vec);
+    const enemyAngles = { ...baseAngles };
+    if (relFrame <= 12) {
+      enemyAngles.y -= 5 * (relFrame - 4);
+    } else {
+      enemyAngles.y -= 40 - 5 * (relFrame - 12);
+    }
+    const forward = angleVectors(enemyAngles).forward;
+    dir = forward;
+  } else {
+    const { forward } = angleVectors(self.angles);
+    dir = forward;
+  }
+  monster_fire_blaster(self, start, dir, 15, 1e3, 0, 0, context, 1 /* BLASTER */);
+}
+function makron_pain(self, other, kick, damage, context) {
   if (self.health < self.max_health / 2) {
     self.skin = 1;
   }
   if (self.timestamp < (self.pain_finished_time || 0)) return;
-  if (damage <= 40 && Math.random() <= 0.6) return;
-  if (self.monsterinfo.current_move === attack1_move3 || self.monsterinfo.current_move === attack2_move2) {
-    if (Math.random() <= 5e-3) return;
-  }
+  if (damage <= 25 && Math.random() < 0.2) return;
   self.pain_finished_time = self.timestamp + 3;
-  if (damage <= 50) {
-    context.engine.sound?.(self, 0, "boss3/bs3pain1.wav", 1, 1, 0);
-    self.monsterinfo.current_move = pain1_move5;
-  } else if (damage <= 100) {
-    context.engine.sound?.(self, 0, "boss3/bs3pain2.wav", 1, 1, 0);
-    self.monsterinfo.current_move = pain2_move5;
+  if (damage <= 40) {
+    context.engine.sound?.(self, 0, "makron/pain1.wav", 1, 1, 0);
+    self.monsterinfo.current_move = pain4_move;
+  } else if (damage <= 110) {
+    context.engine.sound?.(self, 0, "makron/pain2.wav", 1, 1, 0);
+    self.monsterinfo.current_move = pain5_move;
   } else {
-    if (Math.random() <= 0.3) {
-      context.engine.sound?.(self, 0, "boss3/bs3pain3.wav", 1, 1, 0);
-      self.monsterinfo.current_move = pain3_move4;
+    if (Math.random() <= 0.45) {
+      context.engine.sound?.(self, 0, "makron/pain3.wav", 1, 1, 0);
+      self.monsterinfo.current_move = pain6_move;
     }
   }
 }
-function jorg_die(self, context) {
-  context.engine.sound?.(self, 0, "boss3/bs3deth1.wav", 1, 1, 0);
+function makron_torso_think(self, context) {
+  if (++self.frame >= 365)
+    self.frame = 346;
+  self.nextthink = context.timeSeconds + 0.1;
+  if (self.angles.x > 0)
+    self.angles = { ...self.angles, x: Math.max(0, self.angles.x - 15) };
+}
+function makron_torso(ent, context) {
+  ent.frame = 346;
+  ent.model = "models/monsters/boss3/rider/tris.md2";
+  ent.skin = 1;
+  ent.think = makron_torso_think;
+  ent.nextthink = context.timeSeconds + 0.1;
+  context.sound(ent, 0, "makron/spine.wav", 1, 1, 0);
+  ent.movetype = 7 /* Toss */;
+  const { forward, up } = angleVectors(ent.angles);
+  const vUp = scaleVec3(up, 120);
+  const vFwd = scaleVec3(forward, -120);
+  ent.velocity = addVec3(addVec3(ent.velocity, vUp), vFwd);
+  ent.origin = addVec3(ent.origin, scaleVec3(forward, -10));
+  ent.angles = { ...ent.angles, x: 90 };
+  ent.avelocity = ZERO_VEC3;
+  context.linkentity(ent);
+}
+function makron_spawn_torso(self, context) {
+  const tempent = context.spawn();
+  tempent.classname = "makron_torso";
+  tempent.origin = { ...self.origin };
+  tempent.angles = { ...self.angles };
+  tempent.origin.z += self.maxs.z - 15;
+  makron_torso(tempent, context);
+}
+function makron_die(self, context) {
+  context.engine.sound?.(self, 0, "makron/death.wav", 1, 1, 0);
+  makron_spawn_torso(self, context);
   self.monsterinfo.current_move = death_move10;
+  self.mins = { x: -60, y: -60, z: 0 };
+  self.maxs = { x: 60, y: 60, z: 48 };
 }
-function jorg_dead(self) {
+function makron_dead(self) {
   self.monsterinfo.nextframe = death_move10.lastframe;
   self.nextthink = -1;
 }
-function makron_toss(self, context) {
-  const makron = context.spawn();
-  makron.classname = "monster_makron";
-  makron.origin = { ...self.origin };
-  makron.angles = { ...self.angles };
-}
-var stand_frames12 = Array.from({ length: 51 }, () => ({ ai: monster_ai_stand13, dist: 0 }));
-stand_move12 = { firstframe: 0, lastframe: 50, frames: stand_frames12, endfunc: jorg_stand };
-var walk_frames11 = Array.from({ length: 14 }, () => ({ ai: monster_ai_walk13, dist: 10 }));
-walk_move11 = { firstframe: 51, lastframe: 64, frames: walk_frames11, endfunc: jorg_walk };
-var run_frames10 = Array.from({ length: 14 }, () => ({ ai: monster_ai_run12, dist: 10 }));
-run_move11 = { firstframe: 51, lastframe: 64, frames: run_frames10, endfunc: jorg_run };
-var attack1_start_frames = Array.from({ length: 8 }, () => ({ ai: monster_ai_charge13, dist: 0 }));
-var attack1_start_move = { firstframe: 65, lastframe: 72, frames: attack1_start_frames, endfunc: null };
-var attack1_frames3 = Array.from({ length: 6 }, () => ({ ai: monster_ai_charge13, dist: 0, think: jorg_fire_bullet }));
-attack1_move3 = { firstframe: 73, lastframe: 78, frames: attack1_frames3, endfunc: jorg_reattack1 };
-attack1_start_move.endfunc = (self) => {
-  self.monsterinfo.current_move = attack1_move3;
-};
-var attack1_end_frames = Array.from({ length: 4 }, () => ({ ai: monster_ai_move13, dist: 0 }));
-attack1_end_move = { firstframe: 79, lastframe: 82, frames: attack1_end_frames, endfunc: jorg_run };
-var attack2_frames2 = Array.from({ length: 13 }, (_, i) => ({
+var stand_frames12 = Array.from({ length: 60 }, () => ({ ai: monster_ai_stand13, dist: 0 }));
+stand_move12 = { firstframe: 0, lastframe: 59, frames: stand_frames12, endfunc: makron_stand };
+var walk_frames11 = Array.from({ length: 10 }, () => ({ ai: monster_ai_walk13, dist: 8 }));
+walk_move11 = { firstframe: 60, lastframe: 69, frames: walk_frames11, endfunc: makron_walk };
+var run_frames10 = Array.from({ length: 10 }, () => ({ ai: monster_ai_run12, dist: 8 }));
+run_move11 = { firstframe: 60, lastframe: 69, frames: run_frames10, endfunc: makron_run };
+var attack_bfg_frames = Array.from({ length: 8 }, (_, i) => ({
   ai: monster_ai_charge13,
   dist: 0,
-  think: i === 6 ? jorg_fire_bfg : null
+  think: i === 3 ? makron_fire_bfg : null
 }));
-attack2_move2 = { firstframe: 83, lastframe: 95, frames: attack2_frames2, endfunc: jorg_run };
-var pain1_frames5 = Array.from({ length: 3 }, () => ({ ai: monster_ai_move13, dist: 0 }));
-pain1_move5 = { firstframe: 96, lastframe: 98, frames: pain1_frames5, endfunc: jorg_run };
-var pain2_frames5 = Array.from({ length: 3 }, () => ({ ai: monster_ai_move13, dist: 0 }));
-pain2_move5 = { firstframe: 99, lastframe: 101, frames: pain2_frames5, endfunc: jorg_run };
-var pain3_frames4 = Array.from({ length: 25 }, () => ({ ai: monster_ai_move13, dist: 0 }));
-pain3_move4 = { firstframe: 102, lastframe: 126, frames: pain3_frames4, endfunc: jorg_run };
-var death_frames10 = Array.from({ length: 50 }, (_, i) => ({
+attack_bfg_move = { firstframe: 70, lastframe: 77, frames: attack_bfg_frames, endfunc: makron_run };
+var attack_hyperblaster_frames = Array.from({ length: 26 }, (_, i) => ({
   ai: monster_ai_move13,
   dist: 0,
-  think: i === 49 ? ((self, ctx) => {
-  }) : i === 48 ? makron_toss : null
+  think: i >= 4 && i <= 20 ? makron_fire_hyperblaster : null
 }));
-death_move10 = { firstframe: 127, lastframe: 176, frames: death_frames10, endfunc: jorg_dead };
-function SP_monster_jorg(self, context) {
-  self.classname = "monster_jorg";
-  self.model = "models/monsters/boss3/jorg/tris.md2";
-  self.mins = { x: -80, y: -80, z: 0 };
-  self.maxs = { x: 80, y: 80, z: 140 };
+attack_hyperblaster_move = { firstframe: 78, lastframe: 103, frames: attack_hyperblaster_frames, endfunc: makron_run };
+var attack_railgun_frames = Array.from({ length: 16 }, (_, i) => ({
+  ai: monster_ai_charge13,
+  dist: 0,
+  think: i === 7 ? makron_save_loc : i === 8 ? makron_fire_railgun : null
+}));
+attack_railgun_move = { firstframe: 104, lastframe: 119, frames: attack_railgun_frames, endfunc: makron_run };
+var pain4_frames = Array.from({ length: 4 }, () => ({ ai: monster_ai_move13, dist: 0 }));
+pain4_move = { firstframe: 120, lastframe: 123, frames: pain4_frames, endfunc: makron_run };
+var pain5_frames = Array.from({ length: 4 }, () => ({ ai: monster_ai_move13, dist: 0 }));
+pain5_move = { firstframe: 124, lastframe: 127, frames: pain5_frames, endfunc: makron_run };
+var pain6_frames = Array.from({ length: 27 }, () => ({ ai: monster_ai_move13, dist: 0 }));
+pain6_move = { firstframe: 128, lastframe: 154, frames: pain6_frames, endfunc: makron_run };
+var death_frames10 = Array.from({ length: 95 }, () => ({ ai: monster_ai_move13, dist: 0 }));
+death_move10 = { firstframe: 155, lastframe: 249, frames: death_frames10, endfunc: makron_dead };
+var sight_frames = Array.from({ length: 13 }, () => ({ ai: monster_ai_move13, dist: 0 }));
+sight_move = { firstframe: 250, lastframe: 262, frames: sight_frames, endfunc: makron_run };
+function SP_monster_makron(self, context) {
+  self.classname = "monster_makron";
+  self.model = "models/monsters/boss3/rider/tris.md2";
+  self.mins = { x: -30, y: -30, z: 0 };
+  self.maxs = { x: 30, y: 30, z: 90 };
   self.movetype = 5 /* Step */;
   self.solid = 2 /* BoundingBox */;
   self.health = 3e3;
   self.max_health = 3e3;
-  self.mass = 1e3;
+  self.mass = 500;
   self.takedamage = true;
   self.viewheight = 90;
-  self.pain = (ent, other, kick, dmg) => jorg_pain(ent, other, kick, dmg, context.entities);
+  self.pain = (ent, other, kick, dmg) => makron_pain(ent, other, kick, dmg, context.entities);
   self.die = (self2, inflictor, attacker, damage, point) => {
-    self2.deadflag = 2 /* Dead */;
-    self2.solid = 0 /* Not */;
-    if (self2.health < -2e3) {
+    if (self2.health <= -2e3) {
       throwGibs(context.entities, self2.origin, damage);
       context.entities.free(self2);
       return;
     }
-    jorg_die(self2, context.entities);
+    self2.deadflag = 2 /* Dead */;
+    self2.solid = 0 /* Not */;
+    makron_die(self2, context.entities);
   };
-  self.monsterinfo.stand = jorg_stand;
-  self.monsterinfo.walk = jorg_walk;
-  self.monsterinfo.run = jorg_run;
-  self.monsterinfo.attack = (ent) => jorg_attack(ent, context.entities);
+  self.monsterinfo.stand = makron_stand;
+  self.monsterinfo.walk = makron_walk;
+  self.monsterinfo.run = makron_run;
+  self.monsterinfo.attack = makron_attack;
   self.monsterinfo.sight = (self2, other) => {
-    context.entities.sound?.(self2, 0, "boss3/sight1.wav", 1, 1, 0);
+    context.entities.sound?.(self2, 0, "makron/sight.wav", 1, 1, 0);
+    self2.monsterinfo.current_move = sight_move;
   };
   self.think = monster_think;
-  jorg_stand(self);
+  self.monsterinfo.current_move = sight_move;
   self.nextthink = self.timestamp + MONSTER_TICK13;
 }
-function registerJorgSpawns(registry) {
-  registry.register("monster_jorg", SP_monster_jorg);
+function registerMakronSpawns(registry) {
+  registry.register("monster_makron", SP_monster_makron);
 }
 
-// src/entities/monsters/insane.ts
+// src/entities/monsters/jorg.ts
 var MONSTER_TICK14 = 0.1;
-var SPAWNFLAG_INSANE_CRAWL = 4;
-var SPAWNFLAG_INSANE_CRUCIFIED = 8;
+var JORG_MACHINEGUN_R1_OFFSET = { x: 40, y: -20, z: 20 };
+var JORG_MACHINEGUN_L1_OFFSET = { x: 40, y: 20, z: 20 };
+var JORG_BFG_OFFSET = { x: 30, y: 0, z: 40 };
+function monster_ai_stand14(self, dist, context) {
+  ai_stand(self, MONSTER_TICK14, context);
+}
+function monster_ai_walk14(self, dist, context) {
+  ai_walk(self, dist, MONSTER_TICK14, context);
+}
+function monster_ai_run13(self, dist, context) {
+  ai_run(self, dist, MONSTER_TICK14, context);
+}
+function monster_ai_charge14(self, dist, context) {
+  ai_charge(self, dist, MONSTER_TICK14, context);
+}
+function monster_ai_move14(self, dist, context) {
+  ai_move(self, dist);
+}
+var stand_move13;
+var walk_move12;
+var run_move12;
+var attack1_move3;
+var attack1_end_move;
+var attack2_move2;
+var pain1_move5;
+var pain2_move5;
+var pain3_move4;
+var death_move11;
+function jorg_stand(self) {
+  self.monsterinfo.current_move = stand_move13;
+}
+function jorg_walk(self) {
+  self.monsterinfo.current_move = walk_move12;
+}
+function jorg_run(self) {
+  if (self.enemy && self.enemy.health > 0) {
+    self.monsterinfo.current_move = run_move12;
+  } else {
+    self.monsterinfo.current_move = stand_move13;
+  }
+}
+function jorg_attack(self, context) {
+  if (!self.enemy) return;
+  if (Math.random() <= 0.75) {
+    context.sound(self, 0, "boss3/bs3atck1.wav", 1, 1, 0);
+    self.monsterinfo.current_move = attack1_move3;
+  } else {
+    context.sound(self, 0, "boss3/bs3atck2.wav", 1, 1, 0);
+    self.monsterinfo.current_move = attack2_move2;
+  }
+}
+function jorg_reattack1(self, context) {
+  const traceFn = (start, mins, maxs, end, ignore, mask) => {
+    const tr = context.trace(start, mins, maxs, end, ignore, mask);
+    return { fraction: tr.fraction, ent: tr.ent };
+  };
+  if (self.enemy && visible(self, self.enemy, traceFn)) {
+    if (Math.random() < 0.9) {
+      self.monsterinfo.current_move = attack1_move3;
+    } else {
+      self.monsterinfo.current_move = attack1_end_move;
+    }
+  } else {
+    self.monsterinfo.current_move = attack1_end_move;
+  }
+}
+function getProjectedOffset3(self, offset) {
+  const { forward, right, up } = angleVectors(self.angles);
+  const start = { ...self.origin };
+  const x = scaleVec3(forward, offset.x);
+  const y = scaleVec3(right, offset.y);
+  const z = scaleVec3(up, offset.z);
+  return addVec3(addVec3(addVec3(start, x), y), z);
+}
+function jorg_fire_bullet(self, context) {
+  if (!self.enemy) return;
+  const startL = getProjectedOffset3(self, JORG_MACHINEGUN_L1_OFFSET);
+  const dirL = normalizeVec3(subtractVec3(self.enemy.origin, startL));
+  monster_fire_bullet_v2(self, startL, dirL, 6, 4, 0.05, 0.05, 0, context, 4 /* MACHINEGUN */);
+  const startR = getProjectedOffset3(self, JORG_MACHINEGUN_R1_OFFSET);
+  const dirR = normalizeVec3(subtractVec3(self.enemy.origin, startR));
+  monster_fire_bullet_v2(self, startR, dirR, 6, 4, 0.05, 0.05, 0, context, 4 /* MACHINEGUN */);
+}
+function jorg_fire_bfg(self, context) {
+  if (!self.enemy) return;
+  const start = getProjectedOffset3(self, JORG_BFG_OFFSET);
+  const target = { ...self.enemy.origin };
+  target.z += self.enemy.viewheight || 0;
+  const dir = normalizeVec3(subtractVec3(target, start));
+  monster_fire_bfg(self, start, dir, 50, 300, 100, 200, 0, context);
+}
+function jorg_pain(self, other, kick, damage, context) {
+  if (self.health < self.max_health / 2) {
+    self.skin = 1;
+  }
+  if (self.timestamp < (self.pain_finished_time || 0)) return;
+  if (damage <= 40 && Math.random() <= 0.6) return;
+  if (self.monsterinfo.current_move === attack1_move3 || self.monsterinfo.current_move === attack2_move2) {
+    if (Math.random() <= 5e-3) return;
+  }
+  self.pain_finished_time = self.timestamp + 3;
+  if (damage <= 50) {
+    context.engine.sound?.(self, 0, "boss3/bs3pain1.wav", 1, 1, 0);
+    self.monsterinfo.current_move = pain1_move5;
+  } else if (damage <= 100) {
+    context.engine.sound?.(self, 0, "boss3/bs3pain2.wav", 1, 1, 0);
+    self.monsterinfo.current_move = pain2_move5;
+  } else {
+    if (Math.random() <= 0.3) {
+      context.engine.sound?.(self, 0, "boss3/bs3pain3.wav", 1, 1, 0);
+      self.monsterinfo.current_move = pain3_move4;
+    }
+  }
+}
+function jorg_die(self, context) {
+  context.engine.sound?.(self, 0, "boss3/bs3deth1.wav", 1, 1, 0);
+  self.monsterinfo.current_move = death_move11;
+}
+function jorg_dead(self) {
+  self.monsterinfo.nextframe = death_move11.lastframe;
+  self.nextthink = -1;
+}
+function makron_toss(self, context) {
+  const makron = context.spawn();
+  makron.classname = "monster_makron";
+  makron.origin = { ...self.origin };
+  makron.target = self.target;
+  makron.enemy = self.enemy;
+  const spawnContext = { entities: context };
+  SP_monster_makron(makron, spawnContext);
+  if (makron.enemy && makron.enemy.health > 0) {
+    const vec = subtractVec3(makron.enemy.origin, makron.origin);
+    makron.angles = { ...makron.angles, y: vectorToYaw(vec) };
+    const dir = normalizeVec3(vec);
+    const vel = scaleVec3(dir, 400);
+    makron.velocity = { x: vel.x, y: vel.y, z: 200 };
+    makron.groundentity = null;
+    if (makron.monsterinfo.sight) {
+      makron.monsterinfo.sight(makron, makron.enemy);
+    }
+  }
+}
+var stand_frames13 = Array.from({ length: 51 }, () => ({ ai: monster_ai_stand14, dist: 0 }));
+stand_move13 = { firstframe: 0, lastframe: 50, frames: stand_frames13, endfunc: jorg_stand };
+var walk_frames12 = Array.from({ length: 14 }, () => ({ ai: monster_ai_walk14, dist: 10 }));
+walk_move12 = { firstframe: 51, lastframe: 64, frames: walk_frames12, endfunc: jorg_walk };
+var run_frames11 = Array.from({ length: 14 }, () => ({ ai: monster_ai_run13, dist: 10 }));
+run_move12 = { firstframe: 51, lastframe: 64, frames: run_frames11, endfunc: jorg_run };
+var attack1_start_frames = Array.from({ length: 8 }, () => ({ ai: monster_ai_charge14, dist: 0 }));
+var attack1_start_move = { firstframe: 65, lastframe: 72, frames: attack1_start_frames, endfunc: null };
+var attack1_frames3 = Array.from({ length: 6 }, () => ({ ai: monster_ai_charge14, dist: 0, think: jorg_fire_bullet }));
+attack1_move3 = { firstframe: 73, lastframe: 78, frames: attack1_frames3, endfunc: jorg_reattack1 };
+attack1_start_move.endfunc = (self) => {
+  self.monsterinfo.current_move = attack1_move3;
+};
+var attack1_end_frames = Array.from({ length: 4 }, () => ({ ai: monster_ai_move14, dist: 0 }));
+attack1_end_move = { firstframe: 79, lastframe: 82, frames: attack1_end_frames, endfunc: jorg_run };
+var attack2_frames2 = Array.from({ length: 13 }, (_, i) => ({
+  ai: monster_ai_charge14,
+  dist: 0,
+  think: i === 6 ? jorg_fire_bfg : null
+}));
+attack2_move2 = { firstframe: 83, lastframe: 95, frames: attack2_frames2, endfunc: jorg_run };
+var pain1_frames5 = Array.from({ length: 3 }, () => ({ ai: monster_ai_move14, dist: 0 }));
+pain1_move5 = { firstframe: 96, lastframe: 98, frames: pain1_frames5, endfunc: jorg_run };
+var pain2_frames5 = Array.from({ length: 3 }, () => ({ ai: monster_ai_move14, dist: 0 }));
+pain2_move5 = { firstframe: 99, lastframe: 101, frames: pain2_frames5, endfunc: jorg_run };
+var pain3_frames4 = Array.from({ length: 25 }, () => ({ ai: monster_ai_move14, dist: 0 }));
+pain3_move4 = { firstframe: 102, lastframe: 126, frames: pain3_frames4, endfunc: jorg_run };
+var death_frames11 = Array.from({ length: 50 }, (_, i) => ({
+  ai: monster_ai_move14,
+  dist: 0,
+  think: i === 49 ? ((self, ctx) => {
+  }) : i === 48 ? makron_toss : null
+}));
+death_move11 = { firstframe: 127, lastframe: 176, frames: death_frames11, endfunc: jorg_dead };
+function SP_monster_jorg(self, context) {
+  self.classname = "monster_jorg";
+  self.model = "models/monsters/boss3/jorg/tris.md2";
+  self.mins = { x: -80, y: -80, z: 0 };
+  self.maxs = { x: 80, y: 80, z: 140 };
+  self.movetype = 5 /* Step */;
+  self.solid = 2 /* BoundingBox */;
+  self.health = 3e3;
+  self.max_health = 3e3;
+  self.mass = 1e3;
+  self.takedamage = true;
+  self.viewheight = 90;
+  self.pain = (ent, other, kick, dmg) => jorg_pain(ent, other, kick, dmg, context.entities);
+  self.die = (self2, inflictor, attacker, damage, point) => {
+    self2.deadflag = 2 /* Dead */;
+    self2.solid = 0 /* Not */;
+    if (self2.health < -2e3) {
+      throwGibs(context.entities, self2.origin, damage);
+      context.entities.free(self2);
+      return;
+    }
+    jorg_die(self2, context.entities);
+  };
+  self.monsterinfo.stand = jorg_stand;
+  self.monsterinfo.walk = jorg_walk;
+  self.monsterinfo.run = jorg_run;
+  self.monsterinfo.attack = (ent) => jorg_attack(ent, context.entities);
+  self.monsterinfo.sight = (self2, other) => {
+    context.entities.sound?.(self2, 0, "boss3/sight1.wav", 1, 1, 0);
+  };
+  self.think = monster_think;
+  jorg_stand(self);
+  self.nextthink = self.timestamp + MONSTER_TICK14;
+}
+function registerJorgSpawns(registry) {
+  registry.register("monster_jorg", SP_monster_jorg);
+}
+
+// src/entities/monsters/insane.ts
+var MONSTER_TICK15 = 0.1;
+var SPAWNFLAG_INSANE_CRAWL = 4;
+var SPAWNFLAG_INSANE_CRUCIFIED = 8;
 var SPAWNFLAG_INSANE_STAND_GROUND = 16;
 var SPAWNFLAG_INSANE_ALWAYS_STAND = 32;
 var SPAWNFLAG_INSANE_QUIET = 64;
@@ -10308,7 +10720,7 @@ function insane_dead(self, context) {
 function m(ai, dist = 0, think) {
   return { ai: (s, d, c) => {
     if (think) think(s, c);
-    ai(s, dist, MONSTER_TICK14, c);
+    ai(s, dist, MONSTER_TICK15, c);
   }, dist };
 }
 var frames_stand_normal = [
@@ -10547,7 +10959,7 @@ insane_move_run_normal = {
   frames: frames_walk_normal.map((f) => ({
     ai: (s, d, c) => {
       if (f.ai === frames_walk_normal[0].ai) insane_scream(s, c);
-      ai_run(s, d, MONSTER_TICK14, c);
+      ai_run(s, d, MONSTER_TICK15, c);
     },
     dist: f.dist
   })),
@@ -10593,7 +11005,7 @@ insane_move_run_insane = {
   frames: frames_walk_insane.map((f) => ({
     ai: (s, d, c) => {
       if (f.ai === frames_walk_insane[0].ai) insane_scream(s, c);
-      ai_run(s, d, MONSTER_TICK14, c);
+      ai_run(s, d, MONSTER_TICK15, c);
     },
     dist: f.dist
   })),
@@ -10820,7 +11232,7 @@ function SP_misc_insane(self, context) {
   self.monsterinfo.current_move = insane_move_stand_normal;
   self.monsterinfo.scale = 1;
   self.think = monster_think;
-  self.nextthink = context.entities.timeSeconds + MONSTER_TICK14;
+  self.nextthink = context.entities.timeSeconds + MONSTER_TICK15;
   if (self.spawnflags & SPAWNFLAG_INSANE_CRUCIFIED) {
     self.mass = 1e5;
   }
@@ -10830,218 +11242,548 @@ function registerInsaneSpawns(registry) {
   registry.register("misc_insane", SP_misc_insane);
 }
 
-// src/entities/monsters/makron.ts
-var MONSTER_TICK15 = 0.1;
-var MAKRON_BFG_OFFSET = { x: 30, y: 28, z: 24 };
-var MAKRON_BLASTER_OFFSET_1 = { x: 26, y: 16, z: 24 };
-var MAKRON_RAILGUN_OFFSET = { x: 26, y: -14, z: 24 };
-function monster_ai_stand14(self, dist, context) {
-  ai_stand(self, MONSTER_TICK15, context);
-}
-function monster_ai_walk14(self, dist, context) {
-  ai_walk(self, dist, MONSTER_TICK15, context);
-}
-function monster_ai_run13(self, dist, context) {
-  ai_run(self, dist, MONSTER_TICK15, context);
-}
-function monster_ai_charge14(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK15, context);
-}
-function monster_ai_move14(self, dist, context) {
-  ai_move(self, dist);
+// src/entities/monsters/actor.ts
+var MONSTER_TICK16 = 0.1;
+var MZ2_ACTOR_MACHINEGUN_1 = 0;
+var actor_names = [
+  "Hellrot",
+  "Tokay",
+  "Killme",
+  "Disruptor",
+  "Adrianator",
+  "Rambear",
+  "Titus",
+  "Bitterman"
+];
+var FRAME_stand101 = 0;
+var FRAME_stand140 = 39;
+var FRAME_walk01 = 40;
+var FRAME_walk08 = 47;
+var FRAME_run02 = 48;
+var FRAME_run07 = 53;
+var FRAME_pain101 = 54;
+var FRAME_pain103 = 56;
+var FRAME_pain201 = 57;
+var FRAME_pain203 = 59;
+var FRAME_pain301 = 60;
+var FRAME_pain303 = 62;
+var FRAME_flip01 = 63;
+var FRAME_flip14 = 76;
+var FRAME_taunt01 = 77;
+var FRAME_taunt17 = 93;
+var FRAME_death101 = 94;
+var FRAME_death107 = 100;
+var FRAME_death201 = 101;
+var FRAME_death213 = 113;
+var FRAME_attak01 = 114;
+var FRAME_attak04 = 117;
+var actor_move_stand;
+var actor_move_walk;
+var actor_move_run;
+var actor_move_pain1;
+var actor_move_pain2;
+var actor_move_pain3;
+var actor_move_flipoff;
+var actor_move_taunt;
+var actor_move_death1;
+var actor_move_death2;
+var actor_move_attack;
+function m2(ai, dist = 0, think) {
+  return { ai: (s, d, c) => {
+    if (think) think(s, c);
+    ai(s, dist, MONSTER_TICK16, c);
+  }, dist };
 }
-var stand_move13;
-var walk_move12;
-var run_move12;
-var attack_bfg_move;
-var attack_hyperblaster_move;
-var attack_railgun_move;
-var pain4_move;
-var pain5_move;
-var pain6_move;
-var death_move11;
-var sight_move;
-function makron_stand(self) {
-  self.monsterinfo.current_move = stand_move13;
+function actor_stand(self, context) {
+  self.monsterinfo.current_move = actor_move_stand;
+  if (context.timeSeconds < 1) {
+    self.frame = FRAME_stand101 + Math.floor(Math.random() * (FRAME_stand140 - FRAME_stand101 + 1));
+  }
 }
-function makron_walk(self) {
-  self.monsterinfo.current_move = walk_move12;
+function actor_walk(self, context) {
+  self.monsterinfo.current_move = actor_move_walk;
 }
-function makron_run(self) {
-  if (self.enemy && self.enemy.health > 0) {
-    self.monsterinfo.current_move = run_move12;
-  } else {
-    self.monsterinfo.current_move = stand_move13;
+function actor_run(self, context) {
+  if (context.timeSeconds < self.pain_debounce_time && !self.enemy) {
+    if (self.movetarget)
+      actor_walk(self, context);
+    else
+      actor_stand(self, context);
+    return;
   }
-}
-function makron_attack(self) {
-  if (!self.enemy) return;
-  const r = Math.random();
-  if (r <= 0.3) {
-    self.monsterinfo.current_move = attack_bfg_move;
-  } else if (r <= 0.6) {
-    self.monsterinfo.current_move = attack_hyperblaster_move;
-  } else {
-    self.monsterinfo.current_move = attack_railgun_move;
+  if (self.monsterinfo.aiflags & 1 /* StandGround */) {
+    actor_stand(self, context);
+    return;
   }
+  self.monsterinfo.current_move = actor_move_run;
 }
-function getProjectedOffset3(self, offset) {
-  const { forward, right, up } = angleVectors(self.angles);
-  const start = { ...self.origin };
-  const x = scaleVec3(forward, offset.x);
-  const y = scaleVec3(right, offset.y);
-  const z = scaleVec3(up, offset.z);
-  return addVec3(addVec3(addVec3(start, x), y), z);
-}
-function makron_fire_bfg(self, context) {
-  if (!self.enemy) return;
-  context.engine.sound?.(self, 0, "makron/bfg_fire.wav", 1, 1, 0);
-  const start = getProjectedOffset3(self, MAKRON_BFG_OFFSET);
-  const target = { ...self.enemy.origin };
-  target.z += self.enemy.viewheight || 0;
-  const dir = normalizeVec3(subtractVec3(target, start));
-  monster_fire_bfg(self, start, dir, 50, 300, 100, 300, 0, context);
-}
-function makron_fire_railgun(self, context) {
-  if (!self.pos1) return;
-  context.engine.sound?.(self, 0, "makron/rail_fire.wav", 1, 1, 0);
-  const start = getProjectedOffset3(self, MAKRON_RAILGUN_OFFSET);
-  const dir = normalizeVec3(subtractVec3(self.pos1, start));
-  monster_fire_railgun(self, start, dir, 50, 100, 0, context);
+var messages = [
+  "Watch it",
+  "#$@*&",
+  "Idiot",
+  "Check your targets"
+];
+function actor_pain(self, other, kick, damage) {
+  const context = self.monsterinfo.context;
+  if (!context) return;
+  if (context.timeSeconds < self.pain_debounce_time)
+    return;
+  self.pain_debounce_time = context.timeSeconds + 3;
+  const random10 = Math.random();
+  if (other && other.client && random10 < 0.4) {
+    const v = subtractVec3(other.origin, self.origin);
+    self.ideal_yaw = vectorToYaw(v);
+    if (Math.random() < 0.5)
+      self.monsterinfo.current_move = actor_move_flipoff;
+    else
+      self.monsterinfo.current_move = actor_move_taunt;
+    const name = actor_names[Math.floor(Math.random() * actor_names.length)];
+    const message = messages[Math.floor(Math.random() * messages.length)];
+    context.centerprintf(other, `${name}: ${message}!
+`);
+    return;
+  }
+  const n = Math.floor(Math.random() * 3);
+  if (n === 0)
+    self.monsterinfo.current_move = actor_move_pain1;
+  else if (n === 1)
+    self.monsterinfo.current_move = actor_move_pain2;
+  else
+    self.monsterinfo.current_move = actor_move_pain3;
 }
-function makron_save_loc(self) {
-  if (!self.enemy) return;
-  self.pos1 = { ...self.enemy.origin };
-  self.pos1 = { ...self.pos1, z: self.pos1.z + (self.enemy.viewheight || 0) };
+function actor_setskin(self, context) {
+  if (self.health < self.max_health / 2)
+    self.skin = 1;
+  else
+    self.skin = 0;
 }
-function makron_fire_hyperblaster(self, context) {
-  context.engine.sound?.(self, 0, "makron/blaster.wav", 1, 1, 0);
-  const start = getProjectedOffset3(self, MAKRON_BLASTER_OFFSET_1);
-  const relFrame = (self.monsterinfo.nextframe || 0) - attack_hyperblaster_move.firstframe;
-  let yawDelta = 0;
+function actorMachineGun(self, context) {
+  const flashOffset = { x: 0, y: 0, z: 0 };
+  const vectors = angleVectors(self.angles);
+  const forward = vectors.forward;
+  const start = copyVec3(self.origin);
+  start.z += self.viewheight;
   let dir;
   if (self.enemy) {
-    const target = { ...self.enemy.origin };
-    target.z += self.enemy.viewheight || 0;
-    const vec = subtractVec3(target, start);
-    const baseAngles = vectorToAngles(vec);
-    const enemyAngles = { ...baseAngles };
-    if (relFrame <= 12) {
-      enemyAngles.y -= 5 * (relFrame - 4);
+    let target;
+    if (self.enemy.health > 0) {
+      target = subtractVec3(self.enemy.origin, scaleVec3(self.enemy.velocity, 0.2));
+      target.z += self.enemy.viewheight;
     } else {
-      enemyAngles.y -= 40 - 5 * (relFrame - 12);
+      target = copyVec3(self.enemy.absmin);
+      target.z += self.enemy.size.z / 2 + 1;
     }
-    const forward = angleVectors(enemyAngles).forward;
-    dir = forward;
+    dir = subtractVec3(target, start);
+    dir = normalizeVec3(dir);
   } else {
-    const { forward } = angleVectors(self.angles);
     dir = forward;
   }
-  monster_fire_blaster(self, start, dir, 15, 1e3, 0, 0, context, 1 /* BLASTER */);
+  monster_fire_bullet(self, start, dir, 3, 4, 0, 0, MZ2_ACTOR_MACHINEGUN_1, context);
 }
-function makron_pain(self, other, kick, damage, context) {
-  if (self.health < self.max_health / 2) {
-    self.skin = 1;
-  }
-  if (self.timestamp < (self.pain_finished_time || 0)) return;
-  if (damage <= 25 && Math.random() < 0.2) return;
-  self.pain_finished_time = self.timestamp + 3;
-  if (damage <= 40) {
-    context.engine.sound?.(self, 0, "makron/pain1.wav", 1, 1, 0);
-    self.monsterinfo.current_move = pain4_move;
-  } else if (damage <= 110) {
-    context.engine.sound?.(self, 0, "makron/pain2.wav", 1, 1, 0);
-    self.monsterinfo.current_move = pain5_move;
-  } else {
-    if (Math.random() <= 0.45) {
-      context.engine.sound?.(self, 0, "makron/pain3.wav", 1, 1, 0);
-      self.monsterinfo.current_move = pain6_move;
-    }
-  }
+function actor_dead(self, context) {
+  self.mins = { x: -16, y: -16, z: -24 };
+  self.maxs = { x: 16, y: 16, z: -8 };
+  self.movetype = 7 /* Toss */;
+  self.svflags |= 1;
+  self.nextthink = -1;
+  context.linkentity(self);
 }
-function makron_die(self, context) {
-  context.engine.sound?.(self, 0, "makron/death.wav", 1, 1, 0);
-  self.monsterinfo.current_move = death_move11;
+function actor_die(self, inflictor, attacker, damage, point, mod) {
+  const context = self.monsterinfo.context;
+  if (!context) return;
+  if (self.health <= -80) {
+    throwGibs(context, self.origin, damage);
+    self.deadflag = 2 /* Dead */;
+    return;
+  }
+  if (self.deadflag === 2 /* Dead */)
+    return;
+  self.deadflag = 2 /* Dead */;
+  self.takedamage = true;
+  if (Math.random() < 0.5)
+    self.monsterinfo.current_move = actor_move_death1;
+  else
+    self.monsterinfo.current_move = actor_move_death2;
+}
+function actor_fire(self, context) {
+  actorMachineGun(self, context);
+  const fire_wait = self.monsterinfo.fire_wait ?? 0;
+  if (context.timeSeconds >= fire_wait)
+    self.monsterinfo.aiflags &= ~128 /* HoldFrame */;
+  else
+    self.monsterinfo.aiflags |= 128 /* HoldFrame */;
 }
-function makron_dead(self) {
-  self.monsterinfo.nextframe = death_move11.lastframe;
-  self.nextthink = -1;
+function actor_attack(self, context) {
+  self.monsterinfo.current_move = actor_move_attack;
+  self.monsterinfo.fire_wait = context.timeSeconds + 1 + Math.random() * 1.6;
 }
-var stand_frames13 = Array.from({ length: 60 }, () => ({ ai: monster_ai_stand14, dist: 0 }));
-stand_move13 = { firstframe: 0, lastframe: 59, frames: stand_frames13, endfunc: makron_stand };
-var walk_frames12 = Array.from({ length: 10 }, () => ({ ai: monster_ai_walk14, dist: 8 }));
-walk_move12 = { firstframe: 60, lastframe: 69, frames: walk_frames12, endfunc: makron_walk };
-var run_frames11 = Array.from({ length: 10 }, () => ({ ai: monster_ai_run13, dist: 8 }));
-run_move12 = { firstframe: 60, lastframe: 69, frames: run_frames11, endfunc: makron_run };
-var attack_bfg_frames = Array.from({ length: 8 }, (_, i) => ({
-  ai: monster_ai_charge14,
-  dist: 0,
-  think: i === 3 ? makron_fire_bfg : null
-}));
-attack_bfg_move = { firstframe: 70, lastframe: 77, frames: attack_bfg_frames, endfunc: makron_run };
-var attack_hyperblaster_frames = Array.from({ length: 26 }, (_, i) => ({
-  ai: monster_ai_move14,
-  dist: 0,
-  think: i >= 4 && i <= 20 ? makron_fire_hyperblaster : null
-}));
-attack_hyperblaster_move = { firstframe: 78, lastframe: 103, frames: attack_hyperblaster_frames, endfunc: makron_run };
-var attack_railgun_frames = Array.from({ length: 16 }, (_, i) => ({
-  ai: monster_ai_charge14,
-  dist: 0,
-  think: i === 7 ? makron_save_loc : i === 8 ? makron_fire_railgun : null
-}));
-attack_railgun_move = { firstframe: 104, lastframe: 119, frames: attack_railgun_frames, endfunc: makron_run };
-var pain4_frames = Array.from({ length: 4 }, () => ({ ai: monster_ai_move14, dist: 0 }));
-pain4_move = { firstframe: 120, lastframe: 123, frames: pain4_frames, endfunc: makron_run };
-var pain5_frames = Array.from({ length: 4 }, () => ({ ai: monster_ai_move14, dist: 0 }));
-pain5_move = { firstframe: 124, lastframe: 127, frames: pain5_frames, endfunc: makron_run };
-var pain6_frames = Array.from({ length: 27 }, () => ({ ai: monster_ai_move14, dist: 0 }));
-pain6_move = { firstframe: 128, lastframe: 154, frames: pain6_frames, endfunc: makron_run };
-var death_frames11 = Array.from({ length: 95 }, () => ({ ai: monster_ai_move14, dist: 0 }));
-death_move11 = { firstframe: 155, lastframe: 249, frames: death_frames11, endfunc: makron_dead };
-var sight_frames = Array.from({ length: 13 }, () => ({ ai: monster_ai_move14, dist: 0 }));
-sight_move = { firstframe: 250, lastframe: 262, frames: sight_frames, endfunc: makron_run };
-function SP_monster_makron(self, context) {
-  self.classname = "monster_makron";
-  self.model = "models/monsters/boss3/rider/tris.md2";
-  self.mins = { x: -30, y: -30, z: 0 };
-  self.maxs = { x: 30, y: 30, z: 90 };
+function actor_use(self, other, activator) {
+  const context = self.monsterinfo.context;
+  const target = context.pickTarget(self.target);
+  self.goalentity = target;
+  self.movetarget = target;
+  if (!self.movetarget || self.movetarget.classname !== "target_actor") {
+    console.log(`${self.classname}: bad target ${self.target}`);
+    self.target = void 0;
+    self.monsterinfo.pausetime = 1e8;
+    if (self.monsterinfo.stand) self.monsterinfo.stand(self, context);
+    return;
+  }
+  const goalPos = self.goalentity ? self.goalentity.origin : self.movetarget ? self.movetarget.origin : self.origin;
+  const v = subtractVec3(goalPos, self.origin);
+  self.ideal_yaw = vectorToYaw(v);
+  self.angles.y = self.ideal_yaw;
+  if (self.monsterinfo.walk) self.monsterinfo.walk(self, context);
+  self.target = void 0;
+}
+function actor_stand_wrapper(self, context) {
+  actor_stand(self, context);
+}
+var frames_stand = [
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand),
+  m2(ai_stand)
+];
+actor_move_stand = {
+  firstframe: FRAME_stand101,
+  lastframe: FRAME_stand140,
+  frames: frames_stand,
+  endfunc: null
+};
+var frames_walk = [
+  m2(ai_walk),
+  m2(ai_walk, 6),
+  m2(ai_walk, 10),
+  m2(ai_walk, 3),
+  m2(ai_walk, 2),
+  m2(ai_walk, 7),
+  m2(ai_walk, 10),
+  m2(ai_walk, 1)
+];
+actor_move_walk = {
+  firstframe: FRAME_walk01,
+  lastframe: FRAME_walk08,
+  frames: frames_walk,
+  endfunc: null
+};
+var frames_run = [
+  m2(ai_run, 4),
+  m2(ai_run, 15),
+  m2(ai_run, 15),
+  m2(ai_run, 8),
+  m2(ai_run, 20),
+  m2(ai_run, 15)
+];
+actor_move_run = {
+  firstframe: FRAME_run02,
+  lastframe: FRAME_run07,
+  frames: frames_run,
+  endfunc: null
+};
+var frames_pain1 = [
+  m2(ai_move, -5),
+  m2(ai_move, 4),
+  m2(ai_move, 1)
+];
+actor_move_pain1 = {
+  firstframe: FRAME_pain101,
+  lastframe: FRAME_pain103,
+  frames: frames_pain1,
+  endfunc: actor_run
+};
+var frames_pain2 = [
+  m2(ai_move, -4),
+  m2(ai_move, 4),
+  m2(ai_move)
+];
+actor_move_pain2 = {
+  firstframe: FRAME_pain201,
+  lastframe: FRAME_pain203,
+  frames: frames_pain2,
+  endfunc: actor_run
+};
+var frames_pain3 = [
+  m2(ai_move, -1),
+  m2(ai_move, 1),
+  m2(ai_move, 0)
+];
+actor_move_pain3 = {
+  firstframe: FRAME_pain301,
+  lastframe: FRAME_pain303,
+  frames: frames_pain3,
+  endfunc: actor_run
+};
+var frames_flipoff = [
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn)
+];
+actor_move_flipoff = {
+  firstframe: FRAME_flip01,
+  lastframe: FRAME_flip14,
+  frames: frames_flipoff,
+  endfunc: actor_run
+};
+var frames_taunt = [
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn),
+  m2(ai_turn)
+];
+actor_move_taunt = {
+  firstframe: FRAME_taunt01,
+  lastframe: FRAME_taunt17,
+  frames: frames_taunt,
+  endfunc: actor_run
+};
+var frames_death1 = [
+  m2(ai_move),
+  m2(ai_move),
+  m2(ai_move, -13),
+  m2(ai_move, 14),
+  m2(ai_move, 3),
+  m2(ai_move, -2),
+  m2(ai_move, 1)
+];
+actor_move_death1 = {
+  firstframe: FRAME_death101,
+  lastframe: FRAME_death107,
+  frames: frames_death1,
+  endfunc: actor_dead
+};
+var frames_death2 = [
+  m2(ai_move),
+  m2(ai_move, 7),
+  m2(ai_move, -6),
+  m2(ai_move, -5),
+  m2(ai_move, 1),
+  m2(ai_move),
+  m2(ai_move, -1),
+  m2(ai_move, -2),
+  m2(ai_move, -1),
+  m2(ai_move, -9),
+  m2(ai_move, -13),
+  m2(ai_move, -13),
+  m2(ai_move)
+];
+actor_move_death2 = {
+  firstframe: FRAME_death201,
+  lastframe: FRAME_death213,
+  frames: frames_death2,
+  endfunc: actor_dead
+};
+var frames_attack = [
+  m2(ai_charge, -2, actor_fire),
+  m2(ai_charge, -2),
+  m2(ai_charge, 3),
+  m2(ai_charge, 2)
+];
+actor_move_attack = {
+  firstframe: FRAME_attak01,
+  lastframe: FRAME_attak04,
+  frames: frames_attack,
+  endfunc: actor_run
+};
+function SP_misc_actor(self, context) {
+  if (!self.targetname) {
+    console.log(`${self.classname}: no targetname`);
+    context.entities.free(self);
+    return;
+  }
+  if (!self.target) {
+    console.log(`${self.classname}: no target`);
+    context.entities.free(self);
+    return;
+  }
+  self.movetarget = null;
   self.movetype = 5 /* Step */;
   self.solid = 2 /* BoundingBox */;
-  self.health = 3e3;
-  self.max_health = 3e3;
-  self.mass = 500;
-  self.takedamage = true;
-  self.viewheight = 90;
-  self.pain = (ent, other, kick, dmg) => makron_pain(ent, other, kick, dmg, context.entities);
-  self.die = (self2, inflictor, attacker, damage, point) => {
-    if (self2.health <= -2e3) {
-      throwGibs(context.entities, self2.origin, damage);
-      context.entities.free(self2);
-      return;
-    }
-    self2.deadflag = 2 /* Dead */;
-    self2.solid = 0 /* Not */;
-    makron_die(self2, context.entities);
+  self.model = "players/male/tris.md2";
+  self.mins = { x: -16, y: -16, z: -24 };
+  self.maxs = { x: 16, y: 16, z: 32 };
+  if (!self.health)
+    self.health = 100;
+  self.max_health = self.health;
+  self.mass = 200;
+  self.pain = actor_pain;
+  self.die = actor_die;
+  self.monsterinfo = {
+    ...self.monsterinfo,
+    // Preserve default properties like last_sighting, trail_time, pausetime
+    stand: (s) => actor_stand_wrapper(s, context.entities),
+    // Wrap to match signature
+    walk: actor_walk,
+    run: actor_run,
+    attack: actor_attack,
+    melee: void 0,
+    sight: void 0,
+    setskin: (s) => actor_setskin(s, context.entities),
+    // Wrap to match signature
+    aiflags: 256 /* GoodGuy */,
+    scale: 1
+    // MODEL_SCALE
   };
-  self.monsterinfo.stand = makron_stand;
-  self.monsterinfo.walk = makron_walk;
-  self.monsterinfo.run = makron_run;
-  self.monsterinfo.attack = makron_attack;
-  self.monsterinfo.sight = (self2, other) => {
-    context.entities.sound?.(self2, 0, "makron/sight.wav", 1, 1, 0);
-    self2.monsterinfo.current_move = sight_move;
+  self.monsterinfo.context = context.entities;
+  context.entities.linkentity(self);
+  self.monsterinfo.current_move = actor_move_stand;
+  self.think = (s) => {
+    const c = s.monsterinfo.context;
+    if (c) monster_think(s, c);
   };
-  self.think = monster_think;
-  self.monsterinfo.current_move = sight_move;
-  self.nextthink = self.timestamp + MONSTER_TICK15;
+  self.nextthink = context.entities.timeSeconds + MONSTER_TICK16;
+  self.use = (self2, other, activator = null) => actor_use(self2, other, activator);
+}
+var SPAWNFLAG_TARGET_ACTOR_JUMP = 1;
+var SPAWNFLAG_TARGET_ACTOR_SHOOT = 2;
+var SPAWNFLAG_TARGET_ACTOR_ATTACK = 4;
+var SPAWNFLAG_TARGET_ACTOR_HOLD = 16;
+var SPAWNFLAG_TARGET_ACTOR_BRUTAL = 32;
+function target_actor_touch(self, other, plane, surf) {
+  if (!other) return;
+  const context = self.monsterinfo.context;
+  if (other.movetarget !== self)
+    return;
+  if (other.enemy)
+    return;
+  other.goalentity = null;
+  other.movetarget = null;
+  if (self.message) {
+    const name = actor_names[Math.floor(Math.random() * actor_names.length)];
+  }
+  if (self.spawnflags & SPAWNFLAG_TARGET_ACTOR_JUMP) {
+    const v = other.velocity;
+    v.x = self.movedir.x * self.speed;
+    v.y = self.movedir.y * self.speed;
+    if (other.groundentity) {
+      other.groundentity = null;
+      v.z = self.movedir.z;
+      context.sound(other, 2, "player/male/jump1.wav", 1, 1, 0);
+    }
+  }
+  if (self.spawnflags & SPAWNFLAG_TARGET_ACTOR_SHOOT) {
+  } else if (self.spawnflags & SPAWNFLAG_TARGET_ACTOR_ATTACK) {
+    other.enemy = context.pickTarget(self.pathtarget);
+    if (other.enemy) {
+      other.goalentity = other.enemy;
+      if (self.spawnflags & SPAWNFLAG_TARGET_ACTOR_BRUTAL)
+        other.monsterinfo.aiflags |= 512 /* Brutal */;
+      if (self.spawnflags & SPAWNFLAG_TARGET_ACTOR_HOLD) {
+        other.monsterinfo.aiflags |= 1 /* StandGround */;
+        actor_stand(other, context);
+      } else {
+        actor_run(other, context);
+      }
+    }
+  }
+  if (!(self.spawnflags & (SPAWNFLAG_TARGET_ACTOR_ATTACK | SPAWNFLAG_TARGET_ACTOR_SHOOT)) && self.pathtarget) {
+    const savetarget = self.target;
+    self.target = self.pathtarget;
+    context.useTargets(self, other);
+    self.target = savetarget;
+  }
+  other.movetarget = context.pickTarget(self.target);
+  if (!other.goalentity)
+    other.goalentity = other.movetarget;
+  if (!other.movetarget && !other.enemy) {
+    other.monsterinfo.pausetime = 1e8;
+    if (other.monsterinfo.stand) other.monsterinfo.stand(other, context);
+  } else if (other.movetarget === other.goalentity && other.movetarget) {
+    const v = subtractVec3(other.movetarget.origin, other.origin);
+    other.ideal_yaw = vectorToYaw(v);
+  }
 }
-function registerMakronSpawns(registry) {
-  registry.register("monster_makron", SP_monster_makron);
+function SP_target_actor(self, context) {
+  if (!self.targetname)
+    console.log(`${self.classname}: no targetname`);
+  self.solid = 1 /* Trigger */;
+  self.touch = target_actor_touch;
+  self.mins = { x: -8, y: -8, z: -8 };
+  self.maxs = { x: 8, y: 8, z: 8 };
+  self.svflags = 1 << 6;
+  self.monsterinfo = {
+    ...self.monsterinfo
+  };
+  self.monsterinfo.context = context.entities;
+  if (self.spawnflags & SPAWNFLAG_TARGET_ACTOR_JUMP) {
+    if (!self.speed)
+      self.speed = 200;
+    const height = self.height || 200;
+    if (self.angles.y === 0)
+      self.angles.y = 360;
+    const dir = setMovedir(self.angles);
+    dir.z = height;
+    self.movedir = dir;
+  }
+  context.entities.linkentity(self);
+}
+function registerActorSpawns(registry) {
+  registry.register("misc_actor", SP_misc_actor);
+  registry.register("target_actor", SP_target_actor);
 }
 
 // src/entities/monsters/medic.ts
-var MONSTER_TICK16 = 0.1;
+var MONSTER_TICK17 = 0.1;
 function monster_ai_stand15(self, dist, context) {
   if (self.classname === "monster_medic") {
     if (medic_find_dead(self, context)) {
@@ -11049,24 +11791,24 @@ function monster_ai_stand15(self, dist, context) {
       return;
     }
   }
-  ai_stand(self, MONSTER_TICK16, context);
+  ai_stand(self, MONSTER_TICK17, context);
 }
 function monster_ai_walk15(self, dist, context) {
-  ai_walk(self, dist, MONSTER_TICK16, context);
+  ai_walk(self, dist, MONSTER_TICK17, context);
 }
 function monster_ai_run14(self, dist, context) {
   if (self.classname === "monster_medic") {
     if (medic_find_dead(self, context)) {
       self.monsterinfo.current_move = run_move13;
     } else {
-      ai_run(self, dist, MONSTER_TICK16, context);
+      ai_run(self, dist, MONSTER_TICK17, context);
     }
   } else {
-    ai_run(self, dist, MONSTER_TICK16, context);
+    ai_run(self, dist, MONSTER_TICK17, context);
   }
 }
 function monster_ai_charge15(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK16, context);
+  ai_charge(self, dist, MONSTER_TICK17, context);
 }
 function monster_ai_move15(self, dist, context) {
   ai_move(self, dist);
@@ -11402,7 +12144,7 @@ function SP_monster_medic(self, context) {
   self.monsterinfo.attack = medic_attack;
   self.think = monster_think;
   medic_stand(self);
-  self.nextthink = self.timestamp + MONSTER_TICK16;
+  self.nextthink = self.timestamp + MONSTER_TICK17;
 }
 function SP_monster_medic_commander(self, context) {
   SP_monster_medic(self, context);
@@ -11417,25 +12159,25 @@ function registerMedicSpawns(registry) {
 }
 
 // src/entities/monsters/mutant.ts
-var MONSTER_TICK17 = 0.1;
+var MONSTER_TICK18 = 0.1;
 var random6 = () => Math.random();
 function monster_ai_stand16(self, dist, context) {
-  ai_stand(self, MONSTER_TICK17, context);
+  ai_stand(self, MONSTER_TICK18, context);
 }
 function monster_ai_walk16(self, dist, context) {
-  ai_walk(self, dist, MONSTER_TICK17, context);
+  ai_walk(self, dist, MONSTER_TICK18, context);
 }
 function monster_ai_run15(self, dist, context) {
-  ai_run(self, dist, MONSTER_TICK17, context);
+  ai_run(self, dist, MONSTER_TICK18, context);
 }
 function monster_ai_charge16(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK17, context);
+  ai_charge(self, dist, MONSTER_TICK18, context);
 }
 function monster_ai_move16(self, dist, context) {
   ai_move(self, dist);
 }
 function monster_ai_face(self, dist, context) {
-  ai_face(self, null, dist, MONSTER_TICK17);
+  ai_face(self, null, dist, MONSTER_TICK18);
 }
 var stand_move15;
 var walk_move14;
@@ -11799,26 +12541,26 @@ function SP_monster_mutant(self, context) {
   self.monsterinfo.idle = mutant_stand;
   self.think = monster_think;
   mutant_stand(self);
-  self.nextthink = self.timestamp + MONSTER_TICK17;
+  self.nextthink = self.timestamp + MONSTER_TICK18;
 }
 function registerMutantSpawns(registry) {
   registry.register("monster_mutant", SP_monster_mutant);
 }
 
 // src/entities/monsters/parasite.ts
-var MONSTER_TICK18 = 0.1;
+var MONSTER_TICK19 = 0.1;
 var random7 = () => Math.random();
 function monster_ai_stand17(self, dist, context) {
-  ai_stand(self, MONSTER_TICK18, context);
+  ai_stand(self, MONSTER_TICK19, context);
 }
 function monster_ai_walk17(self, dist, context) {
-  ai_walk(self, dist, MONSTER_TICK18, context);
+  ai_walk(self, dist, MONSTER_TICK19, context);
 }
 function monster_ai_run16(self, dist, context) {
-  ai_run(self, dist, MONSTER_TICK18, context);
+  ai_run(self, dist, MONSTER_TICK19, context);
 }
 function monster_ai_charge17(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK18, context);
+  ai_charge(self, dist, MONSTER_TICK19, context);
 }
 function monster_ai_move17(self, dist, context) {
   ai_move(self, dist);
@@ -12195,28 +12937,28 @@ function SP_monster_parasite(self, context) {
   self.monsterinfo.idle = parasite_idle;
   self.think = monster_think;
   parasite_stand(self);
-  self.nextthink = self.timestamp + MONSTER_TICK18;
+  self.nextthink = self.timestamp + MONSTER_TICK19;
 }
 function registerParasiteSpawns(registry) {
   registry.register("monster_parasite", SP_monster_parasite);
 }
 
 // src/entities/monsters/soldier.ts
-var MONSTER_TICK19 = 0.1;
+var MONSTER_TICK20 = 0.1;
 var SOLDIER_LIGHT = 1;
 var SOLDIER_SSG = 2;
 var SOLDIER_MACHINEGUN = 4;
 function monster_ai_stand18(self, dist, context) {
-  ai_stand(self, MONSTER_TICK19, context);
+  ai_stand(self, MONSTER_TICK20, context);
 }
 function monster_ai_walk18(self, dist, context) {
-  ai_walk(self, dist, MONSTER_TICK19, context);
+  ai_walk(self, dist, MONSTER_TICK20, context);
 }
 function monster_ai_run17(self, dist, context) {
-  ai_run(self, dist, MONSTER_TICK19, context);
+  ai_run(self, dist, MONSTER_TICK20, context);
 }
 function monster_ai_charge18(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK19, context);
+  ai_charge(self, dist, MONSTER_TICK20, context);
 }
 function monster_ai_move18(self, dist, context) {
   ai_move(self, dist);
@@ -12500,7 +13242,7 @@ function SP_monster_soldier(self, context) {
   };
   self.think = monster_think;
   soldier_stand(self);
-  self.nextthink = self.timestamp + MONSTER_TICK19;
+  self.nextthink = self.timestamp + MONSTER_TICK20;
 }
 function SP_monster_soldier_light(self, context) {
   self.spawnflags |= SOLDIER_LIGHT;
@@ -12540,12 +13282,12 @@ function registerMonsterSpawns(registry) {
 }
 
 // src/entities/monsters/supertank.ts
-var MONSTER_TICK20 = 0.1;
+var MONSTER_TICK21 = 0.1;
 var SUPERTANK_MACHINEGUN_OFFSET = { x: 30, y: 30, z: 40 };
 var SUPERTANK_ROCKET_OFFSET = { x: 30, y: -30, z: 40 };
 var SUPERTANK_GRENADE_OFFSET = { x: 20, y: 0, z: 70 };
 function monster_ai_stand19(self, dist, context) {
-  ai_stand(self, MONSTER_TICK20, context);
+  ai_stand(self, MONSTER_TICK21, context);
 }
 function monster_ai_run18(self, dist, context) {
   if (self.enemy && self.enemy.health > 0) {
@@ -12555,7 +13297,7 @@ function monster_ai_run18(self, dist, context) {
   }
 }
 function monster_ai_charge19(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK20, context);
+  ai_charge(self, dist, MONSTER_TICK21, context);
 }
 function monster_ai_move19(self, dist, context) {
   ai_move(self, dist);
@@ -12751,7 +13493,7 @@ function SP_monster_supertank(self, context) {
   };
   self.think = monster_think;
   supertank_stand(self);
-  self.nextthink = self.timestamp + MONSTER_TICK20;
+  self.nextthink = self.timestamp + MONSTER_TICK21;
 }
 function registerSupertankSpawns(registry) {
   registry.register("monster_supertank", SP_monster_supertank);
@@ -12764,7 +13506,7 @@ function registerSupertankSpawns(registry) {
 }
 
 // src/entities/monsters/tank.ts
-var MONSTER_TICK21 = 0.1;
+var MONSTER_TICK22 = 0.1;
 function M_AdjustBlindfireTarget(self, start, target, right, context) {
   const tr = context.trace(start, target, ZERO_VEC3, ZERO_VEC3, self, MASK_SHOT);
   if (!tr.startsolid && !tr.allsolid && tr.fraction >= 0.5) {
@@ -12791,10 +13533,10 @@ function tank_blind_check(self, context) {
   }
 }
 function monster_ai_stand20(self, dist, context) {
-  ai_stand(self, MONSTER_TICK21, context);
+  ai_stand(self, MONSTER_TICK22, context);
 }
 function monster_ai_walk19(self, dist, context) {
-  ai_walk(self, dist, MONSTER_TICK21, context);
+  ai_walk(self, dist, MONSTER_TICK22, context);
 }
 function monster_ai_run19(self, dist, context) {
   if (self.enemy && self.enemy.health > 0) {
@@ -12804,7 +13546,7 @@ function monster_ai_run19(self, dist, context) {
   }
 }
 function monster_ai_charge20(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK21, context);
+  ai_charge(self, dist, MONSTER_TICK22, context);
 }
 function monster_ai_move20(self, dist, context) {
   ai_move(self, dist);
@@ -13115,7 +13857,7 @@ function SP_monster_tank(self, context) {
   self.monsterinfo.blindfire = true;
   self.think = monster_think;
   tank_stand(self);
-  self.nextthink = self.timestamp + MONSTER_TICK21;
+  self.nextthink = self.timestamp + MONSTER_TICK22;
 }
 function registerTankSpawns(registry) {
   registry.register("monster_tank", SP_monster_tank);
@@ -13134,15 +13876,15 @@ function registerTankCommanderSpawns(registry) {
 }
 
 // src/entities/monsters/turret.ts
-var MONSTER_TICK22 = 0.1;
+var MONSTER_TICK23 = 0.1;
 function monster_ai_stand21(self, dist, context) {
-  ai_stand(self, MONSTER_TICK22, context);
+  ai_stand(self, MONSTER_TICK23, context);
 }
 function monster_ai_run20(self, dist, context) {
-  ai_run(self, dist, MONSTER_TICK22, context);
+  ai_run(self, dist, MONSTER_TICK23, context);
 }
 function monster_ai_charge21(self, dist, context) {
-  ai_charge(self, dist, MONSTER_TICK22, context);
+  ai_charge(self, dist, MONSTER_TICK23, context);
 }
 var stand_move20;
 var run_move19;
@@ -13278,7 +14020,7 @@ function SP_monster_turret(self, context) {
   };
   self.think = monster_think;
   turret_stand(self);
-  self.nextthink = self.timestamp + MONSTER_TICK22;
+  self.nextthink = self.timestamp + MONSTER_TICK23;
 }
 function registerTurretSpawns(registry) {
   registry.register("monster_turret", SP_monster_turret);
@@ -13309,6 +14051,7 @@ function registerMonsterSpawns2(registry) {
   registerJorgSpawns(registry);
   registerMakronSpawns(registry);
   registerInsaneSpawns(registry);
+  registerActorSpawns(registry);
 }
 
 // src/entities/worldspawn.ts
@@ -14756,7 +15499,97 @@ function ClientObituary(self, inflictor, attacker, mod, sys) {
   }
 }
 
+// src/entities/player_anim.ts
+var FRAME_stand01 = 0;
+var FRAME_stand402 = 39;
+var FRAME_run1 = 40;
+var FRAME_run6 = 45;
+var FRAME_pain1012 = 54;
+var FRAME_pain104 = 57;
+var FRAME_pain2012 = 58;
+var FRAME_pain204 = 61;
+var FRAME_pain3012 = 62;
+var FRAME_pain304 = 65;
+var FRAME_death1012 = 66;
+var FRAME_death106 = 71;
+var FRAME_death2012 = 72;
+var FRAME_death206 = 77;
+var FRAME_death301 = 78;
+var FRAME_death306 = 83;
+var ANIM_BASIC = 0;
+var ANIM_PAIN = 2;
+var ANIM_DEATH = 3;
+
+// src/combat/weapons/firing.ts
+var random9 = createRandomGenerator();
+
 // src/entities/player.ts
+function P_PlayerThink(ent, sys) {
+  if (!ent.client) return;
+  const client = ent.client;
+  let animChanged = false;
+  if (ent.deadflag) {
+  } else {
+    const speed = Math.sqrt(ent.velocity.x * ent.velocity.x + ent.velocity.y * ent.velocity.y);
+    const moving = speed > 10;
+    if (client.anim_priority === ANIM_BASIC || client.anim_priority === void 0) {
+      if (moving) {
+        if (ent.frame < FRAME_run1 || ent.frame > FRAME_run6) {
+          ent.frame = FRAME_run1;
+          client.anim_end = FRAME_run6;
+          client.anim_priority = ANIM_BASIC;
+          animChanged = true;
+        }
+      } else {
+        if (ent.frame >= FRAME_run1 && ent.frame <= FRAME_run6 || client.anim_priority === ANIM_BASIC && client.anim_end !== FRAME_stand402 || client.anim_priority === void 0) {
+          ent.frame = FRAME_stand01;
+          client.anim_end = FRAME_stand402;
+          client.anim_priority = ANIM_BASIC;
+          animChanged = true;
+        }
+      }
+    }
+  }
+  if (animChanged) {
+    return;
+  }
+  if (client.anim_end !== void 0 && client.anim_end !== ent.frame) {
+    if (ent.frame < client.anim_end) {
+      ent.frame++;
+    } else if (ent.frame > client.anim_end) {
+      ent.frame--;
+    }
+  } else if (client.anim_end === ent.frame) {
+    if (client.anim_priority === ANIM_BASIC) {
+      if (ent.frame === FRAME_run6) ent.frame = FRAME_run1;
+      else if (ent.frame === FRAME_stand402) ent.frame = FRAME_stand01;
+    } else {
+      if (client.anim_priority !== ANIM_DEATH) {
+        client.anim_priority = ANIM_BASIC;
+      }
+    }
+  }
+}
+function player_pain(self, damage) {
+  if (!self.client) return;
+  if (self.health < 40) {
+  }
+  if (self.client.anim_priority && self.client.anim_priority >= ANIM_PAIN) {
+    return;
+  }
+  self.client.anim_priority = ANIM_PAIN;
+  const r = random9.frandom();
+  if (r < 0.33) {
+    self.frame = FRAME_pain1012;
+    self.client.anim_end = FRAME_pain104;
+  } else if (r < 0.66) {
+    self.frame = FRAME_pain2012;
+    self.client.anim_end = FRAME_pain204;
+  } else {
+    self.frame = FRAME_pain3012;
+    self.client.anim_end = FRAME_pain304;
+  }
+}
 function player_die(self, inflictor, attacker, damage, point, mod, sys) {
   self.deadflag = 2 /* Dead */;
   self.solid = 0 /* Not */;
@@ -14764,8 +15597,24 @@ function player_die(self, inflictor, attacker, damage, point, mod, sys) {
   self.takedamage = false;
   if (self.health < -40 && sys) {
     throwGibs(sys, self.origin, damage);
+    return;
+  }
+  if (self.client) {
+    self.client.anim_priority = ANIM_DEATH;
+    const r = random9.frandom();
+    if (r < 0.33) {
+      self.frame = FRAME_death1012;
+      self.client.anim_end = FRAME_death106;
+    } else if (r < 0.66) {
+      self.frame = FRAME_death2012;
+      self.client.anim_end = FRAME_death206;
+    } else {
+      self.frame = FRAME_death301;
+      self.client.anim_end = FRAME_death306;
+    }
+  } else {
+    self.frame = 0;
   }
-  self.frame = 0;
   if (sys) {
     ClientObituary(self, inflictor, attacker, mod, sys);
   }
@@ -14799,6 +15648,7 @@ function player_think(self, sys) {
       weaponItem.think(self, sys);
     }
   }
+  P_PlayerThink(self, sys);
   self.nextthink = sys.timeSeconds + 0.1;
   sys.scheduleThink(self, self.nextthink);
 }
@@ -15145,7 +15995,7 @@ var WEAPONS = {
 };
 
 // src/index.ts
-var ZERO_VEC37 = { x: 0, y: 0, z: 0 };
+var ZERO_VEC36 = { x: 0, y: 0, z: 0 };
 function createGame(imports, engine, options) {
   const gravity = options.gravity;
   const deathmatch = options.deathmatch ?? false;
@@ -15214,8 +16064,8 @@ function createGame(imports, engine, options) {
     };
     entities.runFrame();
   });
-  let origin = { ...ZERO_VEC37 };
-  let velocity = { ...ZERO_VEC37 };
+  let origin = { ...ZERO_VEC36 };
+  let velocity = { ...ZERO_VEC36 };
   const calculateBlend = (player, time) => {
     const blend = [0, 0, 0, 0];
     if (!player || !player.client) return blend;
@@ -15297,10 +16147,10 @@ function createGame(imports, engine, options) {
         // TODO
         damageIndicators: [],
         stats: player ? populatePlayerStats(player, levelClock.current.timeSeconds) : [],
-        kick_angles: player?.client?.kick_angles ?? ZERO_VEC37,
-        kick_origin: player?.client?.kick_origin ?? ZERO_VEC37,
-        gunoffset: ZERO_VEC37,
-        gunangles: ZERO_VEC37,
+        kick_angles: player?.client?.kick_angles ?? ZERO_VEC36,
+        kick_origin: player?.client?.kick_origin ?? ZERO_VEC36,
+        gunoffset: ZERO_VEC36,
+        gunangles: ZERO_VEC36,
         gunindex: 0,
         gun_frame: player?.client?.gun_frame ?? 0,
         rdflags: player?.client?.rdflags ?? 0,
@@ -15314,8 +16164,8 @@ function createGame(imports, engine, options) {
   const resetState = (startTimeMs) => {
     frameLoop.reset(startTimeMs);
     levelClock.start(startTimeMs);
-    origin = { ...ZERO_VEC37 };
-    velocity = { ...ZERO_VEC37 };
+    origin = { ...ZERO_VEC36 };
+    velocity = { ...ZERO_VEC36 };
     entities.beginFrame(startTimeMs / 1e3);
     entities.runFrame();
   };
@@ -15343,10 +16193,10 @@ function createGame(imports, engine, options) {
       blend: [0, 0, 0, 0],
       // Stubs
       stats: populatePlayerStats(player, levelClock.current.timeSeconds),
-      kick_angles: ZERO_VEC37,
-      kick_origin: ZERO_VEC37,
-      gunoffset: ZERO_VEC37,
-      gunangles: ZERO_VEC37,
+      kick_angles: ZERO_VEC36,
+      kick_origin: ZERO_VEC36,
+      gunoffset: ZERO_VEC36,
+      gunangles: ZERO_VEC36,
       gunindex: 0,
       pm_type: 0,
       pm_time: 0,
@@ -15404,6 +16254,9 @@ function createGame(imports, engine, options) {
       player.die = (self, inflictor, attacker, damage, point, mod) => {
         player_die(self, inflictor, attacker, damage, point, mod, entities);
       };
+      player.pain = (self, other, kick, damage) => {
+        player_pain(self, damage);
+      };
       player.think = (self) => {
         player_think(self, entities);
       };
@@ -15473,8 +16326,8 @@ function createGame(imports, engine, options) {
         rng,
         player: player?.client?.inventory
       });
-      origin = player ? { ...player.origin } : { ...ZERO_VEC37 };
-      velocity = player ? { ...player.velocity } : { ...ZERO_VEC37 };
+      origin = player ? { ...player.origin } : { ...ZERO_VEC36 };
+      velocity = player ? { ...player.velocity } : { ...ZERO_VEC36 };
       frameLoop.reset(save.level.timeSeconds * 1e3);
     }
   };