quake2ts 0.0.438 → 0.0.440

package/packages/game/dist/esm/index.js

@@ -2623,6 +2623,11 @@ var TraceMask = /* @__PURE__ */ ((TraceMask2) => {
   TraceMask2[TraceMask2["Window"] = 2] = "Window";
   return TraceMask2;
 })(TraceMask || {});
+var BOTTOM_EMPTY = 0;
+var BOTTOM_SOLID = 1;
+var BOTTOM_WATER = 2;
+var BOTTOM_SLIME = 3;
+var BOTTOM_LAVA = 4;
 
 // src/entities/entity.ts
 var MoveType = /* @__PURE__ */ ((MoveType3) => {
@@ -3536,7 +3541,7 @@ function CheckGround(self, context) {
     }
   }
 }
-function M_CheckBottom(self, context) {
+function M_CheckBottomEx(self, context) {
   const mins = {
     x: self.origin.x + self.mins.x,
     y: self.origin.y + self.mins.y,
@@ -3548,26 +3553,72 @@ function M_CheckBottom(self, context) {
     z: self.origin.z + self.maxs.z
   };
   let start = { x: 0, y: 0, z: 0 };
-  let stop = { x: 0, y: 0, z: 0 };
-  for (let i = 0; i < 2; i++) {
-    if (i === 1) start = { x: mins.x, y: mins.y, z: 0 };
-    else start = { x: maxs.x, y: mins.y, z: 0 };
-    start.z = mins.z - 1;
-    if (context.pointcontents(start) !== 0) return true;
-    stop = { ...start };
-    stop.z = start.z - 60;
-    const trace = context.trace(start, null, null, stop, self, MASK_MONSTERSOLID);
-    if (trace.fraction < 1) return true;
-    if (i === 1) start = { x: mins.x, y: maxs.y, z: 0 };
-    else start = { x: maxs.x, y: maxs.y, z: 0 };
-    start.z = mins.z - 1;
-    if (context.pointcontents(start) !== 0) return true;
-    stop = { ...start };
-    stop.z = start.z - 60;
-    const trace2 = context.trace(start, null, null, stop, self, MASK_MONSTERSOLID);
-    if (trace2.fraction < 1) return true;
+  let allSolid = true;
+  for (let x = 0; x <= 1; x++) {
+    for (let y = 0; y <= 1; y++) {
+      start.x = x ? maxs.x : mins.x;
+      start.y = y ? maxs.y : mins.y;
+      start.z = mins.z - 1;
+      const content = context.pointcontents(start);
+      if (content !== CONTENTS_SOLID) {
+        allSolid = false;
+        break;
+      }
+    }
+    if (!allSolid) break;
+  }
+  if (allSolid) return BOTTOM_SOLID;
+  start.x = self.origin.x;
+  start.y = self.origin.y;
+  start.z = self.origin.z + self.mins.z;
+  const stop = { ...start };
+  stop.z = start.z - STEPSIZE * 2;
+  const trace = context.trace(start, null, null, stop, self, MASK_MONSTERSOLID);
+  if (trace.fraction === 1) return BOTTOM_EMPTY;
+  const mid = trace.endpos.z;
+  const bottomType = context.pointcontents(trace.endpos);
+  let result = BOTTOM_SOLID;
+  if (bottomType & CONTENTS_WATER) result = BOTTOM_WATER;
+  else if (bottomType & CONTENTS_SLIME) result = BOTTOM_SLIME;
+  else if (bottomType & CONTENTS_LAVA) result = BOTTOM_LAVA;
+  const stepQuadrantSize = {
+    x: (self.maxs.x - self.mins.x) * 0.5,
+    y: (self.maxs.y - self.mins.y) * 0.5
+  };
+  const halfStepQuadrant = {
+    x: stepQuadrantSize.x * 0.5,
+    y: stepQuadrantSize.y * 0.5,
+    z: 0
+  };
+  const halfStepQuadrantMins = {
+    x: -halfStepQuadrant.x,
+    y: -halfStepQuadrant.y,
+    z: 0
+  };
+  const centerStart = {
+    x: self.origin.x + (self.mins.x + self.maxs.x) * 0.5,
+    y: self.origin.y + (self.mins.y + self.maxs.y) * 0.5,
+    z: 0
+  };
+  for (let x = 0; x <= 1; x++) {
+    for (let y = 0; y <= 1; y++) {
+      const quadrantStart = { ...centerStart };
+      if (x) quadrantStart.x += halfStepQuadrant.x;
+      else quadrantStart.x -= halfStepQuadrant.x;
+      if (y) quadrantStart.y += halfStepQuadrant.y;
+      else quadrantStart.y -= halfStepQuadrant.y;
+      quadrantStart.z = start.z;
+      const quadrantEnd = { ...quadrantStart, z: stop.z };
+      const subTrace = context.trace(quadrantStart, halfStepQuadrantMins, halfStepQuadrant, quadrantEnd, self, MASK_MONSTERSOLID);
+      if (subTrace.fraction === 1 || mid - subTrace.endpos.z > STEPSIZE) {
+        return BOTTOM_EMPTY;
+      }
+    }
   }
-  return false;
+  return result;
+}
+function M_CheckBottom(self, context) {
+  return M_CheckBottomEx(self, context) !== BOTTOM_EMPTY;
 }
 function M_MoveStep(self, move, relink, context) {
   if (!((self.flags & (2 /* Swim */ | 1 /* Fly */)) !== 0) && self.movetype !== 1 /* Noclip */) {
@@ -25859,6 +25910,11 @@ export {
   AmmoType,
   ArmorType,
   AttackState,
+  BOTTOM_EMPTY,
+  BOTTOM_LAVA,
+  BOTTOM_SLIME,
+  BOTTOM_SOLID,
+  BOTTOM_WATER,
   BlockedJumpResult,
   CheckGround,
   DamageFlags,
@@ -25880,6 +25936,7 @@ export {
   M_CheckAttack,
   M_CheckAttack_Base,
   M_CheckBottom,
+  M_CheckBottomEx,
   M_MoveFrame,
   M_MoveStep,
   M_MoveToGoal,