quake2ts 0.0.220 → 0.0.222

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

@@ -8429,33 +8429,68 @@ function monster_ai_move9(self, dist, context) {
   ai_move(self, dist);
 }
 var stand_move8;
+var fidget_move2;
 var walk_move7;
 var run_move7;
+var runandshoot_move;
 var attack_chain_move;
 var attack_grenade_move;
-var pain_move4;
+var fire_chain_move;
+var endfire_chain_move;
+var pain1_move4;
+var pain2_move4;
+var pain3_move3;
 var death_move6;
+var duck_move3;
+function gunner_idlesound(self, context) {
+  context.engine.sound?.(self, 0, "gunner/gunidle1.wav", 1, 1, 0);
+}
 function gunner_stand(self) {
   self.monsterinfo.current_move = stand_move8;
 }
+function gunner_fidget(self) {
+  if (self.monsterinfo.aiflags & 1 /* StandGround */) {
+    return;
+  }
+  if (Math.random() <= 0.05) {
+    self.monsterinfo.current_move = fidget_move2;
+  }
+}
 function gunner_walk(self) {
   self.monsterinfo.current_move = walk_move7;
 }
 function gunner_run(self) {
-  if (self.enemy && self.enemy.health > 0) {
-    self.monsterinfo.current_move = run_move7;
-  } else {
+  if (self.monsterinfo.aiflags & 1 /* StandGround */) {
     self.monsterinfo.current_move = stand_move8;
+  } else {
+    self.monsterinfo.current_move = run_move7;
   }
 }
-function gunner_attack(self) {
+function gunner_attack(self, context) {
   if (Math.random() > 0.5) {
     self.monsterinfo.current_move = attack_chain_move;
   } else {
     self.monsterinfo.current_move = attack_grenade_move;
   }
 }
+function gunner_opengun(self, context) {
+  context.engine.sound?.(self, 0, "gunner/gunatck1.wav", 1, 1, 0);
+}
 function gunner_fire_chain(self, context) {
+  self.monsterinfo.current_move = fire_chain_move;
+}
+function gunner_refire_chain(self, context) {
+  if (self.enemy && self.enemy.health > 0) {
+    if (visible(self, self.enemy, context.trace)) {
+      if (Math.random() <= 0.5) {
+        self.monsterinfo.current_move = fire_chain_move;
+        return;
+      }
+    }
+  }
+  self.monsterinfo.current_move = endfire_chain_move;
+}
+function gunner_fire_bullet_logic(self, context) {
   if (!self.enemy) return;
   const start = {
     x: self.origin.x,
@@ -8463,10 +8498,10 @@ function gunner_fire_chain(self, context) {
     z: self.origin.z + self.viewheight - 8
   };
   const forward = normalizeVec3(subtractVec3(self.enemy.origin, start));
-  const damage = 10;
-  const kick = 2;
+  const damage = 3;
+  const kick = 4;
   context.engine.sound?.(self, 0, "gunner/gunatck2.wav", 1, 1, 0);
-  monster_fire_bullet(self, start, forward, damage, kick, 0, 0, 0, context, 5 /* CHAINGUN */);
+  monster_fire_bullet(self, start, forward, damage, kick, 300, 500, 0, context, 5 /* CHAINGUN */);
 }
 function gunner_fire_grenade(self, context) {
   if (!self.enemy) return;
@@ -8482,93 +8517,218 @@ function gunner_fire_grenade(self, context) {
   createGrenade(context, self, start, forward, damage, speed);
 }
 function gunner_pain(self, context) {
+  if (self.health < self.max_health / 2) {
+  }
+  if (self.pain_debounce_time && context.timeSeconds < self.pain_debounce_time) return;
+  self.pain_debounce_time = context.timeSeconds + 3;
   if (Math.random() < 0.5) {
     context.engine.sound?.(self, 0, "gunner/gunpain1.wav", 1, 1, 0);
   } else {
     context.engine.sound?.(self, 0, "gunner/gunpain2.wav", 1, 1, 0);
   }
-  self.monsterinfo.current_move = pain_move4;
+  const r = Math.random();
+  if (r < 0.33) {
+    self.monsterinfo.current_move = pain3_move3;
+  } else if (r < 0.66) {
+    self.monsterinfo.current_move = pain2_move4;
+  } else {
+    self.monsterinfo.current_move = pain1_move4;
+  }
 }
 function gunner_die(self, context) {
   context.engine.sound?.(self, 0, "gunner/death1.wav", 1, 1, 0);
   self.monsterinfo.current_move = death_move6;
 }
-var stand_frames8 = Array.from({ length: 30 }, () => ({
+function gunner_duck_down(self, context) {
+  if (self.monsterinfo.aiflags & 2048 /* Ducked */) return;
+  self.monsterinfo.aiflags |= 2048 /* Ducked */;
+  if (Math.random() > 0.5) {
+    gunner_fire_grenade(self, context);
+  }
+  self.maxs = { ...self.maxs, z: self.maxs.z - 32 };
+  self.takedamage = true;
+  self.monsterinfo.pausetime = context.timeSeconds + 1;
+}
+function gunner_duck_hold(self, context) {
+  if (context.timeSeconds >= self.monsterinfo.pausetime) {
+    self.monsterinfo.aiflags &= ~128 /* HoldFrame */;
+  } else {
+    self.monsterinfo.aiflags |= 128 /* HoldFrame */;
+  }
+}
+function gunner_duck_up(self, context) {
+  self.monsterinfo.aiflags &= ~2048 /* Ducked */;
+  self.maxs = { ...self.maxs, z: self.maxs.z + 32 };
+  self.takedamage = true;
+}
+function gunner_dodge(self, attacker, eta, context) {
+  if (Math.random() > 0.25) return;
+  if (!self.enemy) self.enemy = attacker;
+  self.monsterinfo.current_move = duck_move3;
+}
+var stand_frames8 = Array.from({ length: 30 }, (_, i) => ({
   ai: monster_ai_stand9,
-  dist: 0
+  dist: 0,
+  think: i === 29 ? gunner_fidget : null
 }));
 stand_move8 = {
   firstframe: 0,
   lastframe: 29,
   frames: stand_frames8,
+  endfunc: null
+};
+var fidget_frames2 = Array.from({ length: 40 }, (_, i) => ({
+  ai: monster_ai_stand9,
+  dist: 0,
+  think: i === 7 ? gunner_idlesound : null
+}));
+fidget_move2 = {
+  firstframe: 30,
+  lastframe: 69,
+  frames: fidget_frames2,
   endfunc: gunner_stand
 };
-var walk_frames7 = Array.from({ length: 40 }, () => ({
+var walk_dists = [0, 3, 4, 5, 7, 2, 6, 4, 2, 7, 5, 7, 4];
+var walk_frames7 = walk_dists.map((d) => ({
   ai: monster_ai_walk9,
-  dist: 2
+  dist: d
 }));
 walk_move7 = {
-  firstframe: 30,
-  lastframe: 69,
+  firstframe: 76,
+  lastframe: 88,
   frames: walk_frames7,
-  endfunc: gunner_walk
+  endfunc: null
 };
-var run_frames6 = Array.from({ length: 20 }, () => ({
+var run_dists = [26, 9, 9, 9, 15, 10, 13, 6];
+var run_frames6 = run_dists.map((d) => ({
   ai: monster_ai_run8,
-  dist: 10
+  dist: d
 }));
 run_move7 = {
-  firstframe: 70,
-  lastframe: 89,
+  firstframe: 94,
+  lastframe: 101,
   frames: run_frames6,
+  endfunc: null
+};
+var runshoot_dists = [32, 15, 10, 18, 8, 20];
+var runshoot_frames = runshoot_dists.map((d) => ({
+  ai: monster_ai_run8,
+  dist: d
+}));
+runandshoot_move = {
+  firstframe: 102,
+  lastframe: 107,
+  frames: runshoot_frames,
+  endfunc: null
+};
+var attack_grenade_frames = Array.from({ length: 21 }, (_, i) => ({
+  ai: monster_ai_charge9,
+  dist: 0,
+  think: [4, 7, 10, 13].includes(i) ? gunner_fire_grenade : null
+}));
+attack_grenade_move = {
+  firstframe: 108,
+  lastframe: 128,
+  frames: attack_grenade_frames,
   endfunc: gunner_run
 };
-var attack_chain_frames = Array.from({ length: 10 }, (_, i) => ({
+var attack_chain_frames = Array.from({ length: 7 }, (_, i) => ({
   ai: monster_ai_charge9,
   dist: 0,
-  think: i >= 2 && i <= 8 ? gunner_fire_chain : null
+  think: i === 0 ? gunner_opengun : null
 }));
 attack_chain_move = {
-  firstframe: 90,
-  lastframe: 99,
+  firstframe: 137,
+  lastframe: 143,
   frames: attack_chain_frames,
-  endfunc: gunner_run
+  endfunc: gunner_fire_chain
 };
-var attack_grenade_frames = Array.from({ length: 10 }, (_, i) => ({
+var fire_chain_frames = Array.from({ length: 8 }, () => ({
   ai: monster_ai_charge9,
   dist: 0,
-  think: i === 5 ? gunner_fire_grenade : null
+  think: gunner_fire_bullet_logic
 }));
-attack_grenade_move = {
-  firstframe: 100,
-  lastframe: 109,
-  frames: attack_grenade_frames,
+fire_chain_move = {
+  firstframe: 144,
+  lastframe: 151,
+  frames: fire_chain_frames,
+  endfunc: gunner_refire_chain
+};
+var endfire_chain_frames = Array.from({ length: 7 }, () => ({
+  ai: monster_ai_charge9,
+  dist: 0
+}));
+endfire_chain_move = {
+  firstframe: 152,
+  lastframe: 158,
+  frames: endfire_chain_frames,
   endfunc: gunner_run
 };
-var pain_frames4 = Array.from({ length: 8 }, () => ({
+var pain1_dists = [2, 0, -5, 3, -1, 0, 0, 0, 0, 1, 1, 2, 1, 0, -2, -2, 0, 0];
+var pain1_frames4 = pain1_dists.map((d) => ({
   ai: monster_ai_move9,
-  dist: 0
+  dist: d
 }));
-pain_move4 = {
-  firstframe: 110,
-  lastframe: 117,
-  frames: pain_frames4,
+pain1_move4 = {
+  firstframe: 159,
+  lastframe: 176,
+  frames: pain1_frames4,
   endfunc: gunner_run
 };
-var death_frames6 = Array.from({ length: 15 }, () => ({
+var pain2_dists = [-2, 11, 6, 2, -1, -7, -2, -7];
+var pain2_frames4 = pain2_dists.map((d) => ({
   ai: monster_ai_move9,
-  dist: 0
+  dist: d
+}));
+pain2_move4 = {
+  firstframe: 177,
+  lastframe: 184,
+  frames: pain2_frames4,
+  endfunc: gunner_run
+};
+var pain3_dists = [-3, 1, 1, 0, 1];
+var pain3_frames3 = pain3_dists.map((d) => ({
+  ai: monster_ai_move9,
+  dist: d
+}));
+pain3_move3 = {
+  firstframe: 185,
+  lastframe: 189,
+  frames: pain3_frames3,
+  endfunc: gunner_run
+};
+var death_dists = [0, 0, 0, -7, -3, -5, 8, 6, 0, 0, 0];
+var death_frames6 = death_dists.map((d) => ({
+  ai: monster_ai_move9,
+  dist: d
 }));
 function gunner_dead(self) {
   self.monsterinfo.nextframe = death_move6.lastframe;
   self.nextthink = -1;
+  self.solid = 0 /* Not */;
 }
 death_move6 = {
-  firstframe: 118,
-  lastframe: 132,
+  firstframe: 190,
+  lastframe: 200,
   frames: death_frames6,
   endfunc: gunner_dead
 };
+var duck_frames3 = [
+  { ai: monster_ai_move9, dist: 1, think: gunner_duck_down },
+  { ai: monster_ai_move9, dist: 1 },
+  { ai: monster_ai_move9, dist: 1, think: gunner_duck_hold },
+  { ai: monster_ai_move9, dist: 0 },
+  { ai: monster_ai_move9, dist: -1 },
+  { ai: monster_ai_move9, dist: -1 },
+  { ai: monster_ai_move9, dist: 0, think: gunner_duck_up },
+  { ai: monster_ai_move9, dist: -1 }
+];
+duck_move3 = {
+  firstframe: 201,
+  lastframe: 208,
+  frames: duck_frames3,
+  endfunc: gunner_run
+};
 function SP_monster_gunner(self, context) {
   self.model = "models/monsters/gunner/tris.md2";
   self.mins = { x: -16, y: -16, z: -24 };
@@ -8580,11 +8740,7 @@ function SP_monster_gunner(self, context) {
   self.mass = 200;
   self.takedamage = true;
   self.pain = (self2, other, kick, damage) => {
-    if (self2.health < self2.max_health / 2) {
-      gunner_pain(self2, context.entities);
-    } else if (Math.random() < 0.2) {
-      gunner_pain(self2, context.entities);
-    }
+    gunner_pain(self2, context.entities);
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
     self2.deadflag = 2 /* Dead */;
@@ -8601,6 +8757,7 @@ function SP_monster_gunner(self, context) {
   self.monsterinfo.walk = gunner_walk;
   self.monsterinfo.run = gunner_run;
   self.monsterinfo.attack = gunner_attack;
+  self.monsterinfo.dodge = (self2, attacker, eta) => gunner_dodge(self2, attacker, eta, context.entities);
   self.monsterinfo.sight = (self2, other) => {
     context.entities.sound?.(self2, 0, "gunner/sight1.wav", 1, 1, 0);
   };
@@ -8633,7 +8790,7 @@ var stand_move9;
 var walk_move8;
 var run_move8;
 var attack_move4;
-var pain_move5;
+var pain_move4;
 var death_move7;
 function hover_stand(self) {
   self.monsterinfo.current_move = stand_move9;
@@ -8709,14 +8866,14 @@ attack_move4 = {
   frames: attack_frames4,
   endfunc: hover_run
 };
-var pain_frames5 = Array.from({ length: 6 }, () => ({
+var pain_frames4 = Array.from({ length: 6 }, () => ({
   ai: monster_ai_move10,
   dist: 0
 }));
-pain_move5 = {
+pain_move4 = {
   firstframe: 66,
   lastframe: 71,
-  frames: pain_frames5,
+  frames: pain_frames4,
   endfunc: hover_run
 };
 var death_frames7 = Array.from({ length: 10 }, () => ({
@@ -8744,7 +8901,7 @@ function SP_monster_hover(self, context) {
   self.viewheight = 18;
   self.pain = (self2, other, kick, damage) => {
     if (self2.health < self2.max_health / 2) {
-      self2.monsterinfo.current_move = pain_move5;
+      self2.monsterinfo.current_move = pain_move4;
     }
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
@@ -8790,7 +8947,7 @@ var stand_move10;
 var walk_move9;
 var run_move9;
 var attack_move5;
-var pain_move6;
+var pain_move5;
 var death_move8;
 function icarus_stand(self) {
   self.monsterinfo.current_move = stand_move10;
@@ -8866,14 +9023,14 @@ attack_move5 = {
   frames: attack_frames5,
   endfunc: icarus_run
 };
-var pain_frames6 = Array.from({ length: 6 }, () => ({
+var pain_frames5 = Array.from({ length: 6 }, () => ({
   ai: monster_ai_move11,
   dist: 0
 }));
-pain_move6 = {
+pain_move5 = {
   firstframe: 66,
   lastframe: 71,
-  frames: pain_frames6,
+  frames: pain_frames5,
   endfunc: icarus_run
 };
 var death_frames8 = Array.from({ length: 10 }, () => ({
@@ -8901,7 +9058,7 @@ function SP_monster_icarus(self, context) {
   self.viewheight = 18;
   self.pain = (self2, other, kick, damage) => {
     if (self2.health < self2.max_health / 2) {
-      self2.monsterinfo.current_move = pain_move6;
+      self2.monsterinfo.current_move = pain_move5;
     }
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
@@ -8947,9 +9104,9 @@ var stand_move11;
 var walk_move10;
 var run_move10;
 var attack_move6;
-var pain_move7;
+var pain_move6;
 var death_move9;
-var duck_move3;
+var duck_move4;
 function infantry_stand(self) {
   self.monsterinfo.current_move = stand_move11;
 }
@@ -8989,7 +9146,7 @@ function infantry_die(self) {
   self.monsterinfo.current_move = death_move9;
 }
 function infantry_duck(self) {
-  self.monsterinfo.current_move = duck_move3;
+  self.monsterinfo.current_move = duck_move4;
 }
 var stand_frames11 = Array.from({ length: 22 }, () => ({
   ai: monster_ai_stand12,
@@ -9032,14 +9189,14 @@ attack_move6 = {
   frames: attack_frames6,
   endfunc: infantry_run
 };
-var pain_frames7 = Array.from({ length: 10 }, () => ({
+var pain_frames6 = Array.from({ length: 10 }, () => ({
   ai: monster_ai_move12,
   dist: 0
 }));
-pain_move7 = {
+pain_move6 = {
   firstframe: 60,
   lastframe: 69,
-  frames: pain_frames7,
+  frames: pain_frames6,
   endfunc: infantry_run
 };
 var death_frames9 = Array.from({ length: 20 }, () => ({
@@ -9056,19 +9213,19 @@ death_move9 = {
   frames: death_frames9,
   endfunc: infantry_dead
 };
-var duck_frames3 = Array.from({ length: 5 }, () => ({
+var duck_frames4 = Array.from({ length: 5 }, () => ({
   ai: monster_ai_move12,
   dist: 0
 }));
-duck_move3 = {
+duck_move4 = {
   firstframe: 90,
   lastframe: 94,
-  frames: duck_frames3,
+  frames: duck_frames4,
   endfunc: infantry_run
 };
 function infantry_dodge(self, context) {
   if (!self.enemy) return false;
-  if (self.monsterinfo.current_move === duck_move3 || self.monsterinfo.current_move === death_move9 || self.monsterinfo.current_move === pain_move7) {
+  if (self.monsterinfo.current_move === duck_move4 || self.monsterinfo.current_move === death_move9 || self.monsterinfo.current_move === pain_move6) {
     return false;
   }
   if (Math.random() > 0.3) return false;
@@ -9100,7 +9257,7 @@ function SP_monster_infantry(self, context) {
   self.takedamage = true;
   self.pain = (self2, other, kick, damage) => {
     if (self2.health < self2.max_health / 2) {
-      self2.monsterinfo.current_move = pain_move7;
+      self2.monsterinfo.current_move = pain_move6;
     }
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
@@ -9152,9 +9309,9 @@ var run_move11;
 var attack1_move3;
 var attack1_end_move;
 var attack2_move2;
-var pain1_move4;
-var pain2_move4;
-var pain3_move3;
+var pain1_move5;
+var pain2_move5;
+var pain3_move4;
 var death_move10;
 function jorg_stand(self) {
   self.monsterinfo.current_move = stand_move12;
@@ -9231,14 +9388,14 @@ function jorg_pain(self, other, kick, damage, context) {
   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_move4;
+    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_move4;
+    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_move3;
+      self.monsterinfo.current_move = pain3_move4;
     }
   }
 }
@@ -9277,12 +9434,12 @@ var attack2_frames2 = Array.from({ length: 13 }, (_, i) => ({
   think: i === 6 ? jorg_fire_bfg : null
 }));
 attack2_move2 = { firstframe: 83, lastframe: 95, frames: attack2_frames2, endfunc: jorg_run };
-var pain1_frames4 = Array.from({ length: 3 }, () => ({ ai: monster_ai_move13, dist: 0 }));
-pain1_move4 = { firstframe: 96, lastframe: 98, frames: pain1_frames4, endfunc: jorg_run };
-var pain2_frames4 = Array.from({ length: 3 }, () => ({ ai: monster_ai_move13, dist: 0 }));
-pain2_move4 = { firstframe: 99, lastframe: 101, frames: pain2_frames4, endfunc: jorg_run };
-var pain3_frames3 = Array.from({ length: 25 }, () => ({ ai: monster_ai_move13, dist: 0 }));
-pain3_move3 = { firstframe: 102, lastframe: 126, frames: pain3_frames3, 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) => ({
   ai: monster_ai_move13,
   dist: 0,
@@ -9575,7 +9732,7 @@ var run_move13;
 var attack_hyper_move;
 var attack_cable_move;
 var spawn_move;
-var pain_move8;
+var pain_move7;
 var death_move12;
 function medic_stand(self) {
   self.monsterinfo.current_move = stand_move14;
@@ -9832,14 +9989,14 @@ attack_cable_move = {
   frames: attack_cable_frames,
   endfunc: medic_run
 };
-var pain_frames8 = Array.from({ length: 6 }, () => ({
+var pain_frames7 = Array.from({ length: 6 }, () => ({
   ai: monster_ai_move15,
   dist: 0
 }));
-pain_move8 = {
+pain_move7 = {
   firstframe: 116,
   lastframe: 121,
-  frames: pain_frames8,
+  frames: pain_frames7,
   endfunc: medic_run
 };
 var spawn_frames = Array.from({ length: 23 }, (_, i) => ({
@@ -9877,7 +10034,7 @@ function SP_monster_medic(self, context) {
   self.takedamage = true;
   self.pain = (self2, other, kick, damage) => {
     if (self2.health < self2.max_health / 2) {
-      self2.monsterinfo.current_move = pain_move8;
+      self2.monsterinfo.current_move = pain_move7;
       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);
@@ -9939,9 +10096,9 @@ var stand_move15;
 var walk_move14;
 var run_move14;
 var attack_move7;
-var pain1_move5;
-var pain2_move5;
-var pain3_move4;
+var pain1_move6;
+var pain2_move6;
+var pain3_move5;
 var death_move13;
 var jump_move;
 function mutant_step(self) {
@@ -10048,13 +10205,13 @@ function mutant_pain_func(self, other, kick, damage, context) {
   self.pain_finished_time = self.timestamp + 3;
   if (random6() < 0.5) {
     context.engine.sound?.(self, 0, "mutant/mutpain1.wav", 1, 1, 0);
-    self.monsterinfo.current_move = pain1_move5;
+    self.monsterinfo.current_move = pain1_move6;
   } else if (random6() < 0.5) {
     context.engine.sound?.(self, 0, "mutant/mutpain2.wav", 1, 1, 0);
-    self.monsterinfo.current_move = pain2_move5;
+    self.monsterinfo.current_move = pain2_move6;
   } else {
     context.engine.sound?.(self, 0, "mutant/mutpain3.wav", 1, 1, 0);
-    self.monsterinfo.current_move = pain3_move4;
+    self.monsterinfo.current_move = pain3_move5;
   }
 }
 function mutant_die(self) {
@@ -10202,32 +10359,32 @@ jump_move.frames[3].ai = (self, dist, context) => {
     }
   }
 };
-var pain1_frames5 = [
+var pain1_frames6 = [
   { ai: monster_ai_move16, dist: 4 },
   { ai: monster_ai_move16, dist: -3 },
   { ai: monster_ai_move16, dist: -8 },
   { ai: monster_ai_move16, dist: 2 },
   { ai: monster_ai_move16, dist: 5 }
 ];
-pain1_move5 = {
+pain1_move6 = {
   firstframe: 78,
   lastframe: 82,
-  frames: pain1_frames5,
+  frames: pain1_frames6,
   endfunc: mutant_run
 };
-var pain2_frames5 = [
+var pain2_frames6 = [
   { ai: monster_ai_move16, dist: -24 },
   { ai: monster_ai_move16, dist: 11 },
   { ai: monster_ai_move16, dist: 5 },
   { ai: monster_ai_move16, dist: -2 }
 ];
-pain2_move5 = {
+pain2_move6 = {
   firstframe: 83,
   lastframe: 86,
-  frames: pain2_frames5,
+  frames: pain2_frames6,
   endfunc: mutant_run
 };
-var pain3_frames4 = [
+var pain3_frames5 = [
   { ai: monster_ai_move16, dist: 11 },
   { ai: monster_ai_move16, dist: 0 },
   { ai: monster_ai_move16, dist: -2 },
@@ -10235,10 +10392,10 @@ var pain3_frames4 = [
   { ai: monster_ai_move16, dist: 0 },
   { ai: monster_ai_move16, dist: 0 }
 ];
-pain3_move4 = {
+pain3_move5 = {
   firstframe: 87,
   lastframe: 92,
-  frames: pain3_frames4,
+  frames: pain3_frames5,
   endfunc: mutant_run
 };
 var death_frames13 = [
@@ -10325,12 +10482,12 @@ var stand_move16;
 var walk_move15;
 var run_move15;
 var drain_move;
-var pain_move9;
+var pain_move8;
 var death_move14;
 var start_run_move;
 var start_walk_move;
 var start_fidget_move;
-var fidget_move2;
+var fidget_move3;
 var end_fidget_move;
 function parasite_launch(self, context) {
   context.engine.sound?.(self, 0, "parasite/paratck1.wav", 1, 1, 0);
@@ -10347,11 +10504,11 @@ function parasite_scratch(self, context) {
   context.engine.sound?.(self, 0, "parasite/paridle2.wav", 1, 2, 0);
 }
 function parasite_do_fidget(self) {
-  self.monsterinfo.current_move = fidget_move2;
+  self.monsterinfo.current_move = fidget_move3;
 }
 function parasite_refidget(self) {
   if (random7() <= 0.8) {
-    self.monsterinfo.current_move = fidget_move2;
+    self.monsterinfo.current_move = fidget_move3;
   } else {
     self.monsterinfo.current_move = end_fidget_move;
   }
@@ -10468,7 +10625,7 @@ function parasite_pain_func(self, other, kick, damage, context) {
   } else {
     context.engine.sound?.(self, 0, "parasite/parpain2.wav", 1, 1, 0);
   }
-  self.monsterinfo.current_move = pain_move9;
+  self.monsterinfo.current_move = pain_move8;
 }
 function parasite_die(self) {
   self.monsterinfo.current_move = death_move14;
@@ -10516,7 +10673,7 @@ start_fidget_move = {
   frames: start_fidget_frames,
   endfunc: parasite_do_fidget
 };
-var fidget_frames2 = [
+var fidget_frames3 = [
   { ai: monster_ai_stand17, dist: 0, think: parasite_scratch },
   { ai: monster_ai_stand17, dist: 0 },
   { ai: monster_ai_stand17, dist: 0 },
@@ -10524,10 +10681,10 @@ var fidget_frames2 = [
   { ai: monster_ai_stand17, dist: 0 },
   { ai: monster_ai_stand17, dist: 0 }
 ];
-fidget_move2 = {
+fidget_move3 = {
   firstframe: 104,
   lastframe: 109,
-  frames: fidget_frames2,
+  frames: fidget_frames3,
   endfunc: parasite_refidget
 };
 var end_fidget_frames = [
@@ -10596,7 +10753,7 @@ walk_move15 = {
   frames: walk_frames15,
   endfunc: parasite_walk
 };
-var pain_frames9 = [
+var pain_frames8 = [
   { ai: monster_ai_move17, dist: 0 },
   { ai: monster_ai_move17, dist: 0 },
   { ai: monster_ai_move17, dist: 0 },
@@ -10609,10 +10766,10 @@ var pain_frames9 = [
   { ai: monster_ai_move17, dist: -7 },
   { ai: monster_ai_move17, dist: 0 }
 ];
-pain_move9 = {
+pain_move8 = {
   firstframe: 57,
   lastframe: 67,
-  frames: pain_frames9,
+  frames: pain_frames8,
   endfunc: parasite_start_run
 };
 var drain_frames = [
@@ -10724,7 +10881,7 @@ var walk_move16;
 var run_move16;
 var attack_move8;
 var attack_move_mg;
-var pain_move10;
+var pain_move9;
 var death_move15;
 function soldier_stand(self) {
   self.monsterinfo.current_move = stand_move17;
@@ -10915,14 +11072,14 @@ attack_move_mg = {
   frames: attack_frames_mg,
   endfunc: soldier_run
 };
-var pain_frames10 = Array.from({ length: 6 }, () => ({
+var pain_frames9 = Array.from({ length: 6 }, () => ({
   ai: monster_ai_move18,
   dist: 0
 }));
-pain_move10 = {
+pain_move9 = {
   firstframe: 100,
   lastframe: 105,
-  frames: pain_frames10,
+  frames: pain_frames9,
   endfunc: soldier_run
 };
 var death_frames15 = Array.from({ length: 10 }, () => ({
@@ -10966,7 +11123,7 @@ function SP_monster_soldier(self, context) {
   }
   self.pain = (self2, other, kick, damage) => {
     if (self2.health < self2.max_health / 2) {
-      self2.monsterinfo.current_move = pain_move10;
+      self2.monsterinfo.current_move = pain_move9;
     }
     if (Math.random() < 0.5) {
       context.entities.sound?.(self2, 0, "soldier/pain1.wav", 1, 1, 0);
@@ -11064,9 +11221,9 @@ var attack_rocket_move2;
 var attack_grenade_move2;
 var attack_chain_move2;
 var attack_chain_end_move;
-var pain1_move6;
-var pain2_move6;
-var pain3_move5;
+var pain1_move7;
+var pain2_move7;
+var pain3_move6;
 var death_move16;
 function supertank_stand(self) {
   self.monsterinfo.current_move = stand_move18;
@@ -11168,12 +11325,12 @@ run_move17 = {
   frames: run_frames16,
   endfunc: supertank_run
 };
-var pain3_frames5 = Array.from({ length: 4 }, () => ({ ai: monster_ai_move19, dist: 0 }));
-pain3_move5 = { firstframe: 78, lastframe: 81, frames: pain3_frames5, endfunc: supertank_run };
-var pain2_frames6 = Array.from({ length: 4 }, () => ({ ai: monster_ai_move19, dist: 0 }));
-pain2_move6 = { firstframe: 82, lastframe: 85, frames: pain2_frames6, endfunc: supertank_run };
-var pain1_frames6 = Array.from({ length: 4 }, () => ({ ai: monster_ai_move19, dist: 0 }));
-pain1_move6 = { firstframe: 86, lastframe: 89, frames: pain1_frames6, endfunc: supertank_run };
+var pain3_frames6 = Array.from({ length: 4 }, () => ({ ai: monster_ai_move19, dist: 0 }));
+pain3_move6 = { firstframe: 78, lastframe: 81, frames: pain3_frames6, endfunc: supertank_run };
+var pain2_frames7 = Array.from({ length: 4 }, () => ({ ai: monster_ai_move19, dist: 0 }));
+pain2_move7 = { firstframe: 82, lastframe: 85, frames: pain2_frames7, endfunc: supertank_run };
+var pain1_frames7 = Array.from({ length: 4 }, () => ({ ai: monster_ai_move19, dist: 0 }));
+pain1_move7 = { firstframe: 86, lastframe: 89, frames: pain1_frames7, endfunc: supertank_run };
 var death_frames16 = Array.from({ length: 24 }, () => ({ ai: monster_ai_move19, dist: 0 }));
 death_move16 = { firstframe: 90, lastframe: 113, frames: death_frames16, endfunc: supertank_dead };
 var attack_grenade_frames2 = Array.from({ length: 6 }, (_, i) => ({
@@ -11220,13 +11377,13 @@ function SP_monster_supertank(self, context) {
     if (self2.monsterinfo.current_move === attack_rocket_move2 && (self2.monsterinfo.nextframe || 0) < attack_rocket_move2.firstframe + 14) return;
     if (damage <= 10) {
       context.entities.sound?.(self2, 0, "boss1/b1pain1.wav", 1, 1, 0);
-      self2.monsterinfo.current_move = pain1_move6;
+      self2.monsterinfo.current_move = pain1_move7;
     } else if (damage <= 25) {
       context.entities.sound?.(self2, 0, "boss1/b1pain3.wav", 1, 1, 0);
-      self2.monsterinfo.current_move = pain3_move5;
+      self2.monsterinfo.current_move = pain3_move6;
     } else {
       context.entities.sound?.(self2, 0, "boss1/b1pain2.wav", 1, 1, 0);
-      self2.monsterinfo.current_move = pain2_move6;
+      self2.monsterinfo.current_move = pain2_move7;
     }
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
@@ -11313,7 +11470,7 @@ var run_move18;
 var attack_blaster_move;
 var attack_machinegun_move;
 var attack_rocket_move3;
-var pain_move11;
+var pain_move10;
 var death_move17;
 function tank_stand(self) {
   self.monsterinfo.current_move = stand_move19;
@@ -11551,14 +11708,14 @@ attack_rocket_move3 = {
   frames: attack_rocket_frames3,
   endfunc: tank_refire_rocket
 };
-var pain_frames11 = Array.from({ length: 6 }, () => ({
+var pain_frames10 = Array.from({ length: 6 }, () => ({
   ai: monster_ai_move20,
   dist: 0
 }));
-pain_move11 = {
+pain_move10 = {
   firstframe: 116,
   lastframe: 121,
-  frames: pain_frames11,
+  frames: pain_frames10,
   endfunc: tank_run
 };
 var death_frames17 = Array.from({ length: 16 }, () => ({
@@ -11592,7 +11749,7 @@ function SP_monster_tank(self, context) {
     }
     self2.pain_finished_time = self2.timestamp + 3;
     if (damage <= 10 && Math.random() < 0.5) return;
-    self2.monsterinfo.current_move = pain_move11;
+    self2.monsterinfo.current_move = pain_move10;
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
     self2.deadflag = 2 /* Dead */;
@@ -11645,7 +11802,7 @@ function monster_ai_charge21(self, dist, context) {
 var stand_move20;
 var run_move19;
 var attack_move9;
-var pain_move12;
+var pain_move11;
 var death_move18;
 function turret_stand(self) {
   self.monsterinfo.current_move = stand_move20;
@@ -11708,14 +11865,14 @@ attack_move9 = {
   frames: attack_frames9,
   endfunc: turret_run
 };
-var pain_frames12 = Array.from({ length: 2 }, () => ({
+var pain_frames11 = Array.from({ length: 2 }, () => ({
   ai: monster_ai_run20,
   dist: 0
 }));
-pain_move12 = {
+pain_move11 = {
   firstframe: 9,
   lastframe: 10,
-  frames: pain_frames12,
+  frames: pain_frames11,
   endfunc: turret_run
 };
 var death_frames18 = Array.from({ length: 4 }, () => ({
@@ -11751,7 +11908,7 @@ function SP_monster_turret(self, context) {
     if (context.entities.timeSeconds < self2.pain_debounce_time) return;
     self2.pain_debounce_time = context.entities.timeSeconds + 3;
     context.entities.sound?.(self2, 0, "turret/pain.wav", 1, 1, 0);
-    self2.monsterinfo.current_move = pain_move12;
+    self2.monsterinfo.current_move = pain_move11;
   };
   self.die = (self2, inflictor, attacker, damage, point) => {
     self2.takedamage = false;