quake2ts 0.0.466 → 0.0.468

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

@@ -2547,6 +2547,7 @@ __export(index_exports, {
   ai_face: () => ai_face,
   ai_move: () => ai_move,
   ai_run: () => ai_run,
+  ai_run_slide: () => ai_run_slide,
   ai_stand: () => ai_stand,
   ai_turn: () => ai_turn,
   ai_walk: () => ai_walk,
@@ -2605,6 +2606,7 @@ __export(index_exports, {
   infront: () => infront,
   isZeroVector: () => isZeroVector,
   killBox: () => killBox,
+  monster_done_dodge: () => monster_done_dodge,
   monster_jump_finished: () => monster_jump_finished,
   monster_jump_start: () => monster_jump_start,
   monster_think: () => monster_think,
@@ -3611,6 +3613,7 @@ function ai_checkattack(self, dist, context) {
 // src/ai/movement.ts
 var STEPSIZE = 18;
 var MONSTER_TICK = 0.1;
+var MAX_SIDESTEP = 8;
 function yawVector(yawDegrees, distance4) {
   if (distance4 === 0) {
     return { x: 0, y: 0, z: 0 };
@@ -3669,6 +3672,44 @@ function setIdealYawTowards2(self, target) {
   };
   self.ideal_yaw = vectorToYaw(toTarget);
 }
+function monster_done_dodge(self) {
+  self.monsterinfo.aiflags &= ~524288 /* Dodging */;
+  self.monsterinfo.attack_state = 0 /* Straight */;
+}
+function ai_run_slide(self, distance4, context) {
+  const ideal_yaw = self.ideal_yaw;
+  const angle = 90;
+  let ofs;
+  if (self.monsterinfo.lefty) {
+    ofs = angle;
+  } else {
+    ofs = -angle;
+  }
+  if (!(self.monsterinfo.aiflags & 2048 /* ManualSteering */)) {
+    changeYaw(self, MONSTER_TICK);
+  }
+  if (!(self.flags & 1 /* Fly */)) {
+    const scale = 1;
+    const maxDist = MAX_SIDESTEP * scale;
+    if (distance4 > maxDist) distance4 = maxDist;
+  }
+  if (M_walkmove(self, ideal_yaw + ofs, distance4, context)) {
+    return;
+  }
+  if (self.monsterinfo.aiflags & 524288 /* Dodging */) {
+    monster_done_dodge(self);
+    self.monsterinfo.attack_state = 0 /* Straight */;
+    return;
+  }
+  self.monsterinfo.lefty = self.monsterinfo.lefty ? 0 : 1;
+  if (M_walkmove(self, ideal_yaw - ofs, distance4, context)) {
+    return;
+  }
+  if (self.monsterinfo.aiflags & 524288 /* Dodging */) {
+    monster_done_dodge(self);
+  }
+  self.monsterinfo.attack_state = 0 /* Straight */;
+}
 function ai_stand(self, dist, context) {
   if (dist) {
     M_walkmove(self, self.angles.y, dist, context);
@@ -3727,14 +3768,20 @@ function ai_run(self, dist, context) {
   if (ai_checkattack(self, dist, context)) {
     return;
   }
-  if (self.monsterinfo.attack_state === 0 /* Straight */) {
-    M_walkmove(self, self.angles.y, dist, context);
+  const enemy_vis = self.enemy && visible(self, self.enemy, context.trace, { throughGlass: false });
+  if (!enemy_vis && self.monsterinfo.attack_state === 1 /* Sliding */) {
     self.monsterinfo.attack_state = 0 /* Straight */;
-    return;
+  }
+  if (self.monsterinfo.aiflags & 524288 /* Dodging */) {
+    self.monsterinfo.attack_state = 1 /* Sliding */;
+  }
+  if (self.monsterinfo.attack_state === 0 /* Straight */) {
   }
   if (self.monsterinfo.attack_state === 1 /* Sliding */) {
-    M_walkmove(self, self.angles.y, dist, context);
-    return;
+    ai_run_slide(self, dist, context);
+    if (self.monsterinfo.attack_state === 1 /* Sliding */) {
+      return;
+    }
   }
   M_MoveToGoal(self, dist, context);
 }
@@ -12129,7 +12176,7 @@ function M_ProjectFlashSource(self, offset, forward, right) {
 }
 function M_MonsterDodge(self, attacker, eta) {
 }
-function monster_done_dodge(self) {
+function monster_done_dodge2(self) {
   self.monsterinfo.aiflags &= ~524288 /* Dodging */;
   if (self.monsterinfo.attack_state === 1 /* Sliding */) {
     self.monsterinfo.attack_state = 0 /* Straight */;
@@ -12324,7 +12371,7 @@ function blocked_checkplat(context, self, dist) {
   return false;
 }
 function monster_jump_start(context, self) {
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   self.monsterinfo.jump_time = context.timeSeconds + 3;
 }
 function monster_jump_finished(context, self) {
@@ -12501,7 +12548,7 @@ var berserk_frames_run1 = [
   { ai: monster_ai_run, dist: 21 },
   { ai: monster_ai_run, dist: 11, think: monster_footstep },
   { ai: monster_ai_run, dist: 21 },
-  { ai: monster_ai_run, dist: 25, think: monster_done_dodge },
+  { ai: monster_ai_run, dist: 25, think: monster_done_dodge2 },
   { ai: monster_ai_run, dist: 18, think: monster_footstep },
   { ai: monster_ai_run, dist: 19 }
 ];
@@ -12512,7 +12559,7 @@ berserk_move_run1 = {
   endfunc: null
 };
 function berserk_run(self, context) {
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   if (self.monsterinfo.aiflags & 1 /* StandGround */) {
     M_SetAnimation3(self, berserk_move_stand);
   } else {
@@ -13885,7 +13932,7 @@ function chick_walk(self) {
   self.monsterinfo.current_move = walk_move2;
 }
 function chick_run(self) {
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   if (self.monsterinfo.aiflags & 4) {
     self.monsterinfo.current_move = stand_move3;
     return;
@@ -21735,7 +21782,7 @@ function guncmdr_walk(self, context) {
   M_SetAnimation(self, walk_move18, context);
 }
 function guncmdr_run(self, context) {
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   if (self.monsterinfo.aiflags & 1 /* StandGround */) {
     M_SetAnimation(self, stand_move21, context);
   } else {
@@ -21753,7 +21800,7 @@ function guncmdr_fire_chain(self, context) {
   M_SetAnimation(self, fire_chain_move2, context);
 }
 function guncmdr_refire_chain(self, context) {
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   self.monsterinfo.attack_state = MonsterAttackState.Straight;
   if (self.enemy && self.enemy.health > 0) {
     if (visible(self, self.enemy, context.trace)) {
@@ -21963,7 +22010,7 @@ function guncmdr_jump_wait_land(self, context) {
 }
 function guncmdr_jump(self, result, context) {
   if (!self.enemy) return;
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   if (result === 2 /* JUMP_JUMP_UP */) {
     M_SetAnimation(self, jump2_move, context);
   } else {
@@ -21974,7 +22021,7 @@ function GunnerCmdrCounter(self, context) {
   context.engine.sound?.(self, 0, "weapons/rocklx1a.wav", 1, 1, 0);
 }
 function guncmdr_attack(self, context) {
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   const d = lengthVec3(subtractVec3(self.enemy.origin, self.origin));
   const { forward, right } = angleVectors(self.angles);
   const RANGE_GRENADE = 100;
@@ -22032,7 +22079,7 @@ function guncmdr_dead(self, context) {
   self.solid = 0 /* Not */;
 }
 function guncmdr_pain(self, context) {
-  monster_done_dodge(self);
+  monster_done_dodge2(self);
   if (self.monsterinfo.current_move === jump_move3 || self.monsterinfo.current_move === jump2_move || self.monsterinfo.current_move === duck_attack_move) {
     return;
   }
@@ -22217,7 +22264,7 @@ run_move20 = {
   firstframe: 101,
   lastframe: 106,
   frames: [
-    { ai: monster_ai_run24, dist: 15, think: monster_done_dodge },
+    { ai: monster_ai_run24, dist: 15, think: monster_done_dodge2 },
     { ai: monster_ai_run24, dist: 16 },
     { ai: monster_ai_run24, dist: 20 },
     { ai: monster_ai_run24, dist: 18 },
@@ -26813,6 +26860,7 @@ function createGame(imports, engine, options) {
   ai_face,
   ai_move,
   ai_run,
+  ai_run_slide,
   ai_stand,
   ai_turn,
   ai_walk,
@@ -26871,6 +26919,7 @@ function createGame(imports, engine, options) {
   infront,
   isZeroVector,
   killBox,
+  monster_done_dodge,
   monster_jump_finished,
   monster_jump_start,
   monster_think,