quake2ts 0.0.414 → 0.0.415

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

@@ -2467,10 +2467,14 @@ __export(index_exports, {
   KEY_ITEMS: () => KEY_ITEMS,
   KeyId: () => KeyId,
   M_CalculatePitchToFire: () => M_CalculatePitchToFire,
+  M_ChangeYaw: () => M_ChangeYaw,
   M_CheckAttack: () => M_CheckAttack,
   M_CheckAttack_Base: () => M_CheckAttack_Base,
   M_CheckBottom: () => M_CheckBottom,
   M_MoveFrame: () => M_MoveFrame,
+  M_MoveStep: () => M_MoveStep,
+  M_MoveToGoal: () => M_MoveToGoal,
+  M_MoveToPath: () => M_MoveToPath,
   M_walkmove: () => M_walkmove,
   MonsterAttackState: () => MonsterAttackState,
   MoveType: () => MoveType,
@@ -3571,6 +3575,7 @@ function changeYaw(self, deltaSeconds) {
   else if (move < -speed) move = -speed;
   self.angles.y = angleMod(current + move);
 }
+var M_ChangeYaw = changeYaw;
 function facingIdeal(self) {
   const delta = angleMod(self.angles.y - self.ideal_yaw);
   const hasPathing = (self.monsterinfo.aiflags & 1073741824 /* Pathing */) !== 0;
@@ -3595,8 +3600,6 @@ function ai_stand(self, deltaSeconds, context) {
   if (findTarget(self, context.targetAwareness, context, context.trace)) {
     return;
   }
-  if (self.enemy && self.enemy.inUse) {
-  }
   changeYaw(self, deltaSeconds);
 }
 function ai_walk(self, distance4, deltaSeconds, context) {
@@ -3605,19 +3608,11 @@ function ai_walk(self, distance4, deltaSeconds, context) {
   }
   setIdealYawTowards2(self, self.goalentity);
   changeYaw(self, deltaSeconds);
-  if (distance4 !== 0) {
-    walkMove(self, self.angles.y, distance4);
-  }
-  if (self.goalentity && self.goalentity.classname === "path_corner") {
-    const dist = rangeTo(self, self.goalentity);
-    if (dist < 64) {
-      if (self.goalentity.target) {
-        const next = context.pickTarget(self.goalentity.target);
-        if (next) {
-          self.goalentity = next;
-          self.ideal_yaw = self.angles.y;
-        }
-      }
+  if (self.goalentity) {
+    M_MoveToGoal(self, distance4, context);
+  } else {
+    if (distance4 !== 0) {
+      M_walkmove(self, self.angles.y, distance4, context);
     }
   }
 }
@@ -3731,19 +3726,16 @@ function M_CheckBottom(self, context) {
   }
   return false;
 }
-function M_walkmove(self, yawDegrees, distance4, context) {
+function M_MoveStep(self, move, relink, context) {
   if (!((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0) && self.movetype !== 1 /* Noclip */) {
     if (!self.groundentity && self.waterlevel === 0) {
       return false;
     }
   }
-  const delta = yawVector(yawDegrees, distance4);
-  if ((self.monsterinfo.aiflags & 1024 /* NoStep */) !== 0 && (self.monsterinfo.aiflags & 1073741824 /* Pathing */) !== 0) {
-  }
   const dest = {
-    x: self.origin.x + delta.x,
-    y: self.origin.y + delta.y,
-    z: self.origin.z + delta.z
+    x: self.origin.x + move.x,
+    y: self.origin.y + move.y,
+    z: self.origin.z + move.z
   };
   const trace = context.trace(self.origin, self.mins, self.maxs, dest, self, MASK_MONSTERSOLID);
   if (trace.fraction === 1) {
@@ -3773,13 +3765,13 @@ function M_walkmove(self, yawDegrees, distance4, context) {
   if (traceUp.startsolid || traceUp.allsolid) {
     return false;
   }
+  const stepOrigin = traceUp.endpos;
   const destUp = {
-    x: up.x + delta.x,
-    y: up.y + delta.y,
-    z: up.z
-    // stay at up z
+    x: stepOrigin.x + move.x,
+    y: stepOrigin.y + move.y,
+    z: stepOrigin.z
   };
-  const traceStep = context.trace(up, self.mins, self.maxs, destUp, self, MASK_MONSTERSOLID);
+  const traceStep = context.trace(stepOrigin, self.mins, self.maxs, destUp, self, MASK_MONSTERSOLID);
   if (traceStep.fraction < 1) {
     return false;
   }
@@ -3787,13 +3779,6 @@ function M_walkmove(self, yawDegrees, distance4, context) {
     x: destUp.x,
     y: destUp.y,
     z: destUp.z - STEPSIZE
-    // Go back down
-  };
-  const downTraceDest = {
-    x: destDown.x,
-    y: destDown.y,
-    z: destDown.z - STEPSIZE
-    // Look a bit deeper?
   };
   const traceDown = context.trace(destUp, self.mins, self.maxs, destDown, self, MASK_MONSTERSOLID);
   if (traceDown.startsolid || traceDown.allsolid) {
@@ -3812,6 +3797,10 @@ function M_walkmove(self, yawDegrees, distance4, context) {
   CheckGround(self, context);
   return true;
 }
+function M_walkmove(self, yawDegrees, distance4, context) {
+  const delta = yawVector(yawDegrees, distance4);
+  return M_MoveStep(self, delta, true, context);
+}
 function SV_StepDirection(self, yaw, dist, context) {
   for (let i = 0; i <= 90; i += 45) {
     if (M_walkmove(self, yaw + i, dist, context)) {
@@ -3847,6 +3836,46 @@ function SV_NewChaseDir(self, enemy, dist, context) {
   }
   SV_StepDirection(self, self.ideal_yaw, dist, context);
 }
+function SV_CloseEnough(self, goal, dist) {
+  if (!goal) return false;
+  const dx = Math.abs(self.origin.x - goal.origin.x);
+  const dy = Math.abs(self.origin.y - goal.origin.y);
+  const dz = Math.abs(self.origin.z - goal.origin.z);
+  return dx <= dist && dy <= dist && dz <= dist;
+}
+function M_MoveToPath(self, context) {
+  const goal = self.goalentity;
+  if (goal && goal.target) {
+    const next = context.pickTarget(goal.target);
+    if (next) {
+      self.goalentity = next;
+      self.ideal_yaw = vectorToYaw({
+        x: next.origin.x - self.origin.x,
+        y: next.origin.y - self.origin.y,
+        z: next.origin.z - self.origin.z
+      });
+    }
+  }
+}
+function M_MoveToGoal(self, dist, context) {
+  const goal = self.goalentity;
+  if (!self.groundentity && !((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0)) {
+    return false;
+  }
+  if (self.enemy && SV_CloseEnough(self, self.enemy, dist)) {
+    return true;
+  }
+  if (goal && goal.classname === "path_corner") {
+    if (SV_CloseEnough(self, goal, dist)) {
+      M_MoveToPath(self, context);
+      return true;
+    }
+  }
+  if (!SV_StepDirection(self, self.ideal_yaw, dist, context)) {
+    return false;
+  }
+  return true;
+}
 
 // src/physics/collision.ts
 function resolveImpact(ent, trace, system) {
@@ -25536,10 +25565,14 @@ function createGame(imports, engine, options) {
   KEY_ITEMS,
   KeyId,
   M_CalculatePitchToFire,
+  M_ChangeYaw,
   M_CheckAttack,
   M_CheckAttack_Base,
   M_CheckBottom,
   M_MoveFrame,
+  M_MoveStep,
+  M_MoveToGoal,
+  M_MoveToPath,
   M_walkmove,
   MonsterAttackState,
   MoveType,