quake2ts 0.0.296 → 0.0.298

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

@@ -446,7 +446,7 @@ function G_SetPowerupStat(stats, powerupId, val) {
   if (safeVal < 0) safeVal = 0;
   setCompressedInteger(stats, 41, index, safeVal, NUM_BITS_FOR_POWERUP);
 }
-var __defProp2, __export2, ZERO_VEC3, STOP_EPSILON, DEG_TO_RAD, PITCH, YAW, ROLL, DEG2RAD_FACTOR, RAD2DEG_FACTOR, ANORMS, STATE_SIZE, MIDDLE_WORD, MATRIX_A, UPPER_MASK, LOWER_MASK, TWO_POW_32, MersenneTwister19937, RandomGenerator, CONTENTS_SOLID, CONTENTS_WINDOW, CONTENTS_AUX, CONTENTS_LAVA, CONTENTS_SLIME, CONTENTS_WATER, CONTENTS_MIST, CONTENTS_NO_WATERJUMP, CONTENTS_PROJECTILECLIP, CONTENTS_AREAPORTAL, CONTENTS_PLAYERCLIP, CONTENTS_MONSTERCLIP, CONTENTS_CURRENT_0, CONTENTS_CURRENT_90, CONTENTS_CURRENT_180, CONTENTS_CURRENT_270, CONTENTS_CURRENT_UP, CONTENTS_CURRENT_DOWN, CONTENTS_ORIGIN, CONTENTS_MONSTER, CONTENTS_DEADMONSTER, CONTENTS_DETAIL, CONTENTS_TRANSLUCENT, CONTENTS_LADDER, CONTENTS_PLAYER, CONTENTS_PROJECTILE, SURF_LIGHT, SURF_SLICK, SURF_SKY, SURF_WARP, SURF_TRANS33, SURF_TRANS66, SURF_FLOWING, SURF_NODRAW, SURF_ALPHATEST, SURF_N64_UV, SURF_N64_SCROLL_X, SURF_N64_SCROLL_Y, SURF_N64_SCROLL_FLIP, MASK_SOLID, MASK_PLAYERSOLID, MASK_DEADSOLID, MASK_MONSTERSOLID, MASK_WATER, MASK_OPAQUE, MASK_SHOT, MASK_CURRENT, MASK_BLOCK_SIGHT, MASK_NAV_SOLID, MASK_LADDER_NAV_SOLID, MASK_WALK_NAV_SOLID, MASK_PROJECTILE, MAX_CHECKCOUNT, CvarFlags, MAX_CLIENTS, MAX_LIGHTSTYLES, MAX_MODELS, MAX_SOUNDS, MAX_IMAGES, MAX_ITEMS, MAX_GENERAL, MAX_SHADOW_LIGHTS, MAX_WHEEL_ITEMS, ConfigStringIndex, MAX_CONFIGSTRINGS, replay_exports, WaterLevel, WATERJUMP_CLEAR, ServerCommand, TempEntity, MZ_BLASTER, MZ_MACHINEGUN, MZ_SHOTGUN, MZ_CHAINGUN1, MZ_RAILGUN, MZ_ROCKET, MZ_GRENADE, MZ_SSHOTGUN, MZ_BFG, MZ_HYPERBLASTER, PowerupId, PlayerStat, AMMO_MAX, NUM_BITS_FOR_AMMO, NUM_AMMO_STATS, POWERUP_MAX, NUM_BITS_FOR_POWERUP, NUM_POWERUP_STATS, POWERUP_STAT_MAP, RenderFx, entityFlags_exports, U_NUMBER, U_MODEL, U_SOUND, U_ORIGIN1, U_ORIGIN2, U_ORIGIN3, U_ANGLE1, U_ANGLE2, U_ANGLE3, U_FRAME, U_SKIN, U_EFFECTS, U_RENDERFX, U_SOLID, U_EVENT, U_MOREBITS, U_MODEL2, U_MODEL3, U_MODEL4, U_REMOVE, FRAMETIME, MASK_WATER2, WaterLevel3, categorizePosition2, checkWater, applyPmove, BinaryWriter, _NetChan, WeaponId, AmmoType, AMMO_TYPE_COUNT, AmmoItemId, WEAPON_WHEEL_ORDER, SoundChannel, ATTN_NORM, ATTN_IDLE;
+var __defProp2, __export2, ZERO_VEC3, STOP_EPSILON, DEG_TO_RAD, PITCH, YAW, ROLL, DEG2RAD_FACTOR, RAD2DEG_FACTOR, ANORMS, STATE_SIZE, MIDDLE_WORD, MATRIX_A, UPPER_MASK, LOWER_MASK, TWO_POW_32, MersenneTwister19937, RandomGenerator, CONTENTS_SOLID, CONTENTS_WINDOW, CONTENTS_AUX, CONTENTS_LAVA, CONTENTS_SLIME, CONTENTS_WATER, CONTENTS_MIST, CONTENTS_NO_WATERJUMP, CONTENTS_PROJECTILECLIP, CONTENTS_AREAPORTAL, CONTENTS_PLAYERCLIP, CONTENTS_MONSTERCLIP, CONTENTS_CURRENT_0, CONTENTS_CURRENT_90, CONTENTS_CURRENT_180, CONTENTS_CURRENT_270, CONTENTS_CURRENT_UP, CONTENTS_CURRENT_DOWN, CONTENTS_ORIGIN, CONTENTS_MONSTER, CONTENTS_DEADMONSTER, CONTENTS_DETAIL, CONTENTS_TRANSLUCENT, CONTENTS_LADDER, CONTENTS_PLAYER, CONTENTS_PROJECTILE, SURF_LIGHT, SURF_SLICK, SURF_SKY, SURF_WARP, SURF_TRANS33, SURF_TRANS66, SURF_FLOWING, SURF_NODRAW, SURF_ALPHATEST, SURF_N64_UV, SURF_N64_SCROLL_X, SURF_N64_SCROLL_Y, SURF_N64_SCROLL_FLIP, MASK_SOLID, MASK_PLAYERSOLID, MASK_DEADSOLID, MASK_MONSTERSOLID, MASK_WATER, MASK_OPAQUE, MASK_SHOT, MASK_CURRENT, MASK_BLOCK_SIGHT, MASK_NAV_SOLID, MASK_LADDER_NAV_SOLID, MASK_WALK_NAV_SOLID, MASK_PROJECTILE, MAX_CHECKCOUNT, CvarFlags, MAX_CLIENTS, MAX_LIGHTSTYLES, MAX_MODELS, MAX_SOUNDS, MAX_IMAGES, MAX_ITEMS, MAX_GENERAL, MAX_SHADOW_LIGHTS, MAX_WHEEL_ITEMS, ConfigStringIndex, MAX_CONFIGSTRINGS, replay_exports, WaterLevel, WATERJUMP_CLEAR, ServerCommand, TempEntity, MZ_BLASTER, MZ_MACHINEGUN, MZ_SHOTGUN, MZ_CHAINGUN1, MZ_RAILGUN, MZ_ROCKET, MZ_GRENADE, MZ_SSHOTGUN, MZ_BFG, MZ_HYPERBLASTER, PowerupId, PlayerStat, AMMO_MAX, NUM_BITS_FOR_AMMO, NUM_AMMO_STATS, POWERUP_MAX, NUM_BITS_FOR_POWERUP, NUM_POWERUP_STATS, POWERUP_STAT_MAP, RenderFx, entityFlags_exports, U_NUMBER, U_MODEL, U_SOUND, U_ORIGIN1, U_ORIGIN2, U_ORIGIN3, U_ANGLE1, U_ANGLE2, U_ANGLE3, U_FRAME, U_SKIN, U_EFFECTS, U_RENDERFX, U_SOLID, U_EVENT, U_MOREBITS, U_MODEL2, U_MODEL3, U_MODEL4, U_REMOVE, FRAMETIME2, MASK_WATER2, WaterLevel3, categorizePosition2, checkWater, applyPmove, BinaryWriter, _NetChan, WeaponId, AmmoType, AMMO_TYPE_COUNT, AmmoItemId, WEAPON_WHEEL_ORDER, SoundChannel, ATTN_NORM, ATTN_IDLE;
 var init_esm = __esm({
   "../shared/dist/esm/index.js"() {
     "use strict";
@@ -1238,7 +1238,7 @@ var init_esm = __esm({
     U_MODEL3 = 1 << 1;
     U_MODEL4 = 1 << 2;
     U_REMOVE = 32768;
-    FRAMETIME = 0.025;
+    FRAMETIME2 = 0.025;
     MASK_WATER2 = 33554432;
     WaterLevel3 = {
       None: 0,
@@ -1292,7 +1292,7 @@ var init_esm = __esm({
       const { forward, right } = angleVectors(adjustedAngles);
       const frictionedVelocity = applyPmoveFriction({
         velocity,
-        frametime: FRAMETIME,
+        frametime: FRAMETIME2,
         onGround,
         groundIsSlick: false,
         onLadder: false,
@@ -1318,12 +1318,12 @@ var init_esm = __esm({
         wishspeed: wish.wishspeed,
         // Water movement uses ground acceleration (10), not air acceleration (1)
         accel: onGround || waterLevel >= 2 ? 10 : 1,
-        frametime: FRAMETIME
+        frametime: FRAMETIME2
       });
       const traceResult = trace(origin, {
-        x: origin.x + finalVelocity.x * FRAMETIME,
-        y: origin.y + finalVelocity.y * FRAMETIME,
-        z: origin.z + finalVelocity.z * FRAMETIME
+        x: origin.x + finalVelocity.x * FRAMETIME2,
+        y: origin.y + finalVelocity.y * FRAMETIME2,
+        z: origin.z + finalVelocity.z * FRAMETIME2
       });
       return {
         ...newState,
@@ -3146,6 +3146,7 @@ function findTarget(self, level, context, trace, hearability = {}) {
 }
 
 // src/ai/movement.ts
+var STEPSIZE = 18;
 function yawVector(yawDegrees, distance2) {
   if (distance2 === 0) {
     return { x: 0, y: 0, z: 0 };
@@ -3348,24 +3349,70 @@ function M_walkmove(self, yawDegrees, distance2, context) {
     z: self.origin.z + delta.z
   };
   const trace = context.trace(self.origin, self.mins, self.maxs, dest, self, MASK_MONSTERSOLID);
-  if (trace.fraction < 1) {
+  if (trace.fraction === 1) {
+    const oldOrigin2 = { ...self.origin };
+    self.origin.x = dest.x;
+    self.origin.y = dest.y;
+    self.origin.z = dest.z;
+    if (!((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0) && self.movetype !== 1 /* Noclip */) {
+      if (!M_CheckBottom(self, context)) {
+        self.origin.x = oldOrigin2.x;
+        self.origin.y = oldOrigin2.y;
+        self.origin.z = oldOrigin2.z;
+        return false;
+      }
+    }
+    if (!((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0)) {
+      CheckGround(self, context);
+    }
+    return true;
+  }
+  if ((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0) {
     return false;
   }
   const oldOrigin = { ...self.origin };
-  self.origin.x = dest.x;
-  self.origin.y = dest.y;
-  self.origin.z = dest.z;
-  if (!((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0) && self.movetype !== 1 /* Noclip */) {
-    if (!M_CheckBottom(self, context)) {
-      self.origin.x = oldOrigin.x;
-      self.origin.y = oldOrigin.y;
-      self.origin.z = oldOrigin.z;
-      return false;
-    }
+  const up = { ...self.origin, z: self.origin.z + STEPSIZE };
+  const traceUp = context.trace(self.origin, self.mins, self.maxs, up, self, MASK_MONSTERSOLID);
+  if (traceUp.startsolid || traceUp.allsolid) {
+    return false;
   }
-  if (!((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0)) {
-    CheckGround(self, context);
+  const destUp = {
+    x: up.x + delta.x,
+    y: up.y + delta.y,
+    z: up.z
+    // stay at up z
+  };
+  const traceStep = context.trace(up, self.mins, self.maxs, destUp, self, MASK_MONSTERSOLID);
+  if (traceStep.fraction < 1) {
+    return false;
+  }
+  const destDown = {
+    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) {
+    return false;
+  }
+  const newPos = traceDown.endpos;
+  self.origin.x = newPos.x;
+  self.origin.y = newPos.y;
+  self.origin.z = newPos.z;
+  if (!M_CheckBottom(self, context)) {
+    self.origin.x = oldOrigin.x;
+    self.origin.y = oldOrigin.y;
+    self.origin.z = oldOrigin.z;
+    return false;
   }
+  CheckGround(self, context);
   return true;
 }
 function SV_StepDirection(self, yaw, dist, context) {