quake2ts 0.0.219 → 0.0.220

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

@@ -27,6 +27,7 @@ __export(index_exports, {
   AmmoItemId: () => AmmoItemId,
   AmmoType: () => AmmoType,
   ArmorType: () => ArmorType,
+  AttackState: () => AttackState,
   CheckGround: () => CheckGround,
   DamageFlags: () => DamageFlags,
   DamageMod: () => DamageMod,
@@ -2111,9 +2112,18 @@ var AIFlags = /* @__PURE__ */ ((AIFlags2) => {
   AIFlags2[AIFlags2["CombatPoint"] = 4096] = "CombatPoint";
   AIFlags2[AIFlags2["Medic"] = 8192] = "Medic";
   AIFlags2[AIFlags2["Resurrecting"] = 16384] = "Resurrecting";
+  AIFlags2[AIFlags2["ManualSteering"] = 32768] = "ManualSteering";
   AIFlags2[AIFlags2["Pathing"] = 1073741824] = "Pathing";
   return AIFlags2;
 })(AIFlags || {});
+var AttackState = /* @__PURE__ */ ((AttackState2) => {
+  AttackState2[AttackState2["Straight"] = 0] = "Straight";
+  AttackState2[AttackState2["Sliding"] = 1] = "Sliding";
+  AttackState2[AttackState2["Melee"] = 2] = "Melee";
+  AttackState2[AttackState2["Missile"] = 3] = "Missile";
+  AttackState2[AttackState2["Blind"] = 4] = "Blind";
+  return AttackState2;
+})(AttackState || {});
 var TraceMask = /* @__PURE__ */ ((TraceMask2) => {
   TraceMask2[TraceMask2["Opaque"] = 1] = "Opaque";
   TraceMask2[TraceMask2["Window"] = 2] = "Window";
@@ -2407,7 +2417,9 @@ function ai_turn(self, distance2, deltaSeconds) {
   if (distance2 !== 0) {
     walkMove(self, self.angles.y, distance2);
   }
-  changeYaw(self, deltaSeconds);
+  if ((self.monsterinfo.aiflags & 32768 /* ManualSteering */) === 0) {
+    changeYaw(self, deltaSeconds);
+  }
 }
 function ai_run(self, distance2, deltaSeconds, context) {
   if ((self.monsterinfo.aiflags & 1 /* StandGround */) !== 0) {
@@ -2416,7 +2428,9 @@ function ai_run(self, distance2, deltaSeconds, context) {
   }
   if (findTarget(self, context.targetAwareness, context, context.trace)) {
   }
-  setIdealYawTowards2(self, self.enemy ?? self.goalentity);
+  if ((self.monsterinfo.aiflags & 32768 /* ManualSteering */) === 0) {
+    setIdealYawTowards2(self, self.enemy ?? self.goalentity);
+  }
   changeYaw(self, deltaSeconds);
   if (self.monsterinfo.checkattack && self.monsterinfo.checkattack(self, context)) {
     return;
@@ -2426,7 +2440,7 @@ function ai_run(self, distance2, deltaSeconds, context) {
   }
 }
 function ai_face(self, enemy, distance2, deltaSeconds) {
-  if (enemy) {
+  if (enemy && (self.monsterinfo.aiflags & 32768 /* ManualSteering */) === 0) {
     setIdealYawTowards2(self, enemy);
   }
   changeYaw(self, deltaSeconds);
@@ -2435,7 +2449,9 @@ function ai_face(self, enemy, distance2, deltaSeconds) {
   }
 }
 function ai_charge(self, distance2, deltaSeconds, context) {
-  setIdealYawTowards2(self, self.enemy);
+  if ((self.monsterinfo.aiflags & 32768 /* ManualSteering */) === 0) {
+    setIdealYawTowards2(self, self.enemy);
+  }
   changeYaw(self, deltaSeconds);
   if (self.monsterinfo.checkattack && self.monsterinfo.checkattack(self, context)) {
     return;
@@ -11247,6 +11263,31 @@ function registerSupertankSpawns(registry) {
 
 // src/entities/monsters/tank.ts
 var MONSTER_TICK20 = 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) {
+    return normalizeVec3(subtractVec3(target, start));
+  }
+  const leftTarget = addVec3(target, scaleVec3(right, -20));
+  const trLeft = context.trace(start, leftTarget, ZERO_VEC3, ZERO_VEC3, self, MASK_SHOT);
+  if (!trLeft.startsolid && !trLeft.allsolid && trLeft.fraction >= 0.5) {
+    return normalizeVec3(subtractVec3(leftTarget, start));
+  }
+  const rightTarget = addVec3(target, scaleVec3(right, 20));
+  const trRight = context.trace(start, rightTarget, ZERO_VEC3, ZERO_VEC3, self, MASK_SHOT);
+  if (!trRight.startsolid && !trRight.allsolid && trRight.fraction >= 0.5) {
+    return normalizeVec3(subtractVec3(rightTarget, start));
+  }
+  return null;
+}
+function tank_blind_check(self, context) {
+  if (self.monsterinfo.aiflags & 32768 /* ManualSteering */) {
+    if (self.monsterinfo.blind_fire_target) {
+      const aim = subtractVec3(self.monsterinfo.blind_fire_target, self.origin);
+      self.ideal_yaw = vectorToYaw(aim);
+    }
+  }
+}
 function monster_ai_stand20(self, dist, context) {
   ai_stand(self, MONSTER_TICK20, context);
 }
@@ -11293,8 +11334,60 @@ function classifyRange3(distance2) {
   if (distance2 <= 1e3) return "mid" /* Mid */;
   return "far" /* Far */;
 }
+function tank_checkattack(self, context) {
+  if (!self.enemy) return false;
+  const visibleEnemy = rangeTo(self, self.enemy) <= 1e3 && context.trace(self.origin, ZERO_VEC3, ZERO_VEC3, self.enemy.origin, self, MASK_SHOT).fraction === 1;
+  if (visibleEnemy) {
+    self.monsterinfo.blind_fire_target = addVec3(self.enemy.origin, scaleVec3(self.enemy.velocity, -0.1));
+    self.monsterinfo.blind_fire_delay = 0;
+  } else {
+    if (self.monsterinfo.blindfire && (self.monsterinfo.blind_fire_delay || 0) <= 20) {
+      if (self.attack_finished_time > context.timeSeconds) return false;
+      if (context.timeSeconds < self.monsterinfo.trail_time + (self.monsterinfo.blind_fire_delay || 0)) {
+        return false;
+      }
+      if (self.monsterinfo.blind_fire_target) {
+        const tr = context.trace(self.origin, ZERO_VEC3, ZERO_VEC3, self.monsterinfo.blind_fire_target, self, 0);
+        self.monsterinfo.attack_state = 4 /* Blind */;
+        return true;
+      }
+    }
+    return false;
+  }
+  const dist = rangeTo(self, self.enemy);
+  if (self.attack_finished_time > context.timeSeconds) return false;
+  let chance = 0;
+  if (dist <= 150) chance = 0.4;
+  else if (dist <= 500) chance = 0.25;
+  else if (dist <= 1e3) chance = 0.06;
+  else chance = 0;
+  if (Math.random() < chance) {
+    self.monsterinfo.attack_state = 3 /* Missile */;
+    self.attack_finished_time = context.timeSeconds;
+    return true;
+  }
+  return false;
+}
 function tank_attack(self) {
   if (!self.enemy) return;
+  if (self.monsterinfo.attack_state === 4 /* Blind */) {
+    let chance = 1;
+    if ((self.monsterinfo.blind_fire_delay || 0) < 1) chance = 1;
+    else if ((self.monsterinfo.blind_fire_delay || 0) < 7.5) chance = 0.4;
+    else chance = 0.1;
+    if (Math.random() > chance) return;
+    self.monsterinfo.blind_fire_delay = (self.monsterinfo.blind_fire_delay || 0) + 5.2 + Math.random() * 3;
+    if (!self.monsterinfo.blind_fire_target) return;
+    self.monsterinfo.aiflags |= 32768 /* ManualSteering */;
+    if (Math.random() < 0.5) {
+      self.monsterinfo.current_move = attack_rocket_move3;
+    } else {
+      self.monsterinfo.current_move = attack_blaster_move;
+      self.monsterinfo.nextframe = 69;
+    }
+    self.pain_debounce_time = self.timestamp + 5;
+    return;
+  }
   const dist = rangeTo(self, self.enemy);
   const range = classifyRange3(dist);
   if (range === "melee" /* Melee */ || range === "near" /* Near */) {
@@ -11320,7 +11413,18 @@ function tank_fire_blaster(self, context) {
     y: self.origin.y,
     z: self.origin.z + (self.viewheight || 0)
   };
-  const dir = normalizeVec3(subtractVec3(self.enemy.origin, start));
+  let dir;
+  const blindfire = (self.monsterinfo.aiflags & 32768 /* ManualSteering */) !== 0;
+  if (blindfire && self.monsterinfo.blind_fire_target) {
+    const angles = self.angles;
+    const { right } = angleVectors(angles);
+    const target = self.monsterinfo.blind_fire_target;
+    const adj = M_AdjustBlindfireTarget(self, start, target, right, context);
+    if (!adj) return;
+    dir = adj;
+  } else {
+    dir = normalizeVec3(subtractVec3(self.enemy.origin, start));
+  }
   const damage = 30;
   const speed = 1e3;
   monster_fire_blaster(self, start, dir, damage, speed, 0, 0, context, 1 /* BLASTER */);
@@ -11345,7 +11449,18 @@ function tank_fire_rocket(self, context) {
     z: self.origin.z + (self.viewheight || 0)
     // Firing from shoulder
   };
-  const dir = normalizeVec3(subtractVec3(self.enemy.origin, start));
+  let dir;
+  const blindfire = (self.monsterinfo.aiflags & 32768 /* ManualSteering */) !== 0;
+  if (blindfire && self.monsterinfo.blind_fire_target) {
+    const angles = self.angles;
+    const { right } = angleVectors(angles);
+    const target = self.monsterinfo.blind_fire_target;
+    const adj = M_AdjustBlindfireTarget(self, start, target, right, context);
+    if (!adj) return;
+    dir = adj;
+  } else {
+    dir = normalizeVec3(subtractVec3(self.enemy.origin, start));
+  }
   const damage = 50;
   const speed = 650;
   monster_fire_rocket(self, start, dir, damage, speed, 0, context);
@@ -11357,6 +11472,12 @@ function tank_dead(self) {
   self.monsterinfo.nextframe = death_move17.lastframe;
   self.nextthink = -1;
 }
+function tank_refire_rocket(self, context) {
+  if (self.monsterinfo.aiflags & 32768 /* ManualSteering */) {
+    self.monsterinfo.aiflags &= ~32768 /* ManualSteering */;
+  }
+  tank_run(self);
+}
 var stand_frames19 = Array.from({ length: 30 }, () => ({
   ai: monster_ai_stand20,
   dist: 0
@@ -11387,12 +11508,16 @@ run_move18 = {
   frames: run_frames17,
   endfunc: tank_run
 };
-var attack_blaster_frames = Array.from({ length: 16 }, (_, i) => ({
-  ai: monster_ai_charge20,
-  dist: 0,
-  think: i > 5 && i < 12 ? tank_fire_blaster : null
-  // Rapid fire blaster
-}));
+var attack_blaster_frames = Array.from({ length: 16 }, (_, i) => {
+  let think = null;
+  if (i === 7) think = tank_blind_check;
+  else if (i > 5 && i < 12) think = tank_fire_blaster;
+  return {
+    ai: monster_ai_charge20,
+    dist: 0,
+    think
+  };
+});
 attack_blaster_move = {
   firstframe: 62,
   lastframe: 77,
@@ -11410,17 +11535,21 @@ attack_machinegun_move = {
   frames: attack_machinegun_frames,
   endfunc: tank_run
 };
-var attack_rocket_frames3 = Array.from({ length: 18 }, (_, i) => ({
-  ai: monster_ai_charge20,
-  dist: 0,
-  think: i === 8 ? tank_fire_rocket : i === 12 ? tank_fire_rocket : i === 16 ? tank_fire_rocket : null
-  // Burst of 3
-}));
+var attack_rocket_frames3 = Array.from({ length: 18 }, (_, i) => {
+  let think = null;
+  if (i === 0) think = tank_blind_check;
+  else if (i === 8 || i === 12 || i === 16) think = tank_fire_rocket;
+  return {
+    ai: monster_ai_charge20,
+    dist: 0,
+    think
+  };
+});
 attack_rocket_move3 = {
   firstframe: 98,
   lastframe: 115,
   frames: attack_rocket_frames3,
-  endfunc: tank_run
+  endfunc: tank_refire_rocket
 };
 var pain_frames11 = Array.from({ length: 6 }, () => ({
   ai: monster_ai_move20,
@@ -11480,6 +11609,8 @@ function SP_monster_tank(self, context) {
   self.monsterinfo.run = tank_run;
   self.monsterinfo.attack = tank_attack;
   self.monsterinfo.attack_machinegun = attack_machinegun_move;
+  self.monsterinfo.checkattack = tank_checkattack;
+  self.monsterinfo.blindfire = true;
   self.think = monster_think;
   tank_stand(self);
   self.nextthink = self.timestamp + MONSTER_TICK20;
@@ -13510,7 +13641,7 @@ var WEAPONS = {
 };
 
 // src/index.ts
-var ZERO_VEC38 = { x: 0, y: 0, z: 0 };
+var ZERO_VEC37 = { x: 0, y: 0, z: 0 };
 function createGame(imports, engine, options) {
   const gravity = options.gravity;
   const deathmatch = options.deathmatch ?? false;
@@ -13577,8 +13708,8 @@ function createGame(imports, engine, options) {
     };
     entities.runFrame();
   });
-  let origin = { ...ZERO_VEC38 };
-  let velocity = { ...ZERO_VEC38 };
+  let origin = { ...ZERO_VEC37 };
+  let velocity = { ...ZERO_VEC37 };
   const calculateBlend = (player, time) => {
     const blend = [0, 0, 0, 0];
     if (!player || !player.client) return blend;
@@ -13661,9 +13792,9 @@ function createGame(imports, engine, options) {
         damageIndicators: [],
         // Stubs for new PlayerState fields
         stats: player ? populatePlayerStats(player, levelClock.current.timeSeconds) : [],
-        kick_angles: ZERO_VEC38,
-        gunoffset: ZERO_VEC38,
-        gunangles: ZERO_VEC38,
+        kick_angles: ZERO_VEC37,
+        gunoffset: ZERO_VEC37,
+        gunangles: ZERO_VEC37,
         gunindex: 0
       }
     };
@@ -13671,8 +13802,8 @@ function createGame(imports, engine, options) {
   const resetState = (startTimeMs) => {
     frameLoop.reset(startTimeMs);
     levelClock.start(startTimeMs);
-    origin = { ...ZERO_VEC38 };
-    velocity = { ...ZERO_VEC38 };
+    origin = { ...ZERO_VEC37 };
+    velocity = { ...ZERO_VEC37 };
     entities.beginFrame(startTimeMs / 1e3);
     entities.runFrame();
   };
@@ -13700,9 +13831,9 @@ function createGame(imports, engine, options) {
       blend: [0, 0, 0, 0],
       // Stubs
       stats: populatePlayerStats(player, levelClock.current.timeSeconds),
-      kick_angles: ZERO_VEC38,
-      gunoffset: ZERO_VEC38,
-      gunangles: ZERO_VEC38,
+      kick_angles: ZERO_VEC37,
+      gunoffset: ZERO_VEC37,
+      gunangles: ZERO_VEC37,
       gunindex: 0
     };
     const traceAdapter = (start, end) => {
@@ -13821,8 +13952,8 @@ function createGame(imports, engine, options) {
         rng,
         player: player?.client?.inventory
       });
-      origin = player ? { ...player.origin } : { ...ZERO_VEC38 };
-      velocity = player ? { ...player.velocity } : { ...ZERO_VEC38 };
+      origin = player ? { ...player.origin } : { ...ZERO_VEC37 };
+      velocity = player ? { ...player.velocity } : { ...ZERO_VEC37 };
       frameLoop.reset(save.level.timeSeconds * 1e3);
     }
   };
@@ -13839,6 +13970,7 @@ function createGame(imports, engine, options) {
   AmmoItemId,
   AmmoType,
   ArmorType,
+  AttackState,
   CheckGround,
   DamageFlags,
   DamageMod,