quake2ts 0.0.263 → 0.0.268

package/packages/shared/dist/cjs/index.cjs

@@ -2069,12 +2069,12 @@ var CGAME_EXPORT_KEYS = [
 ];
 
 // src/pmove/constants.ts
-var WaterLevel = /* @__PURE__ */ ((WaterLevel3) => {
-  WaterLevel3[WaterLevel3["None"] = 0] = "None";
-  WaterLevel3[WaterLevel3["Feet"] = 1] = "Feet";
-  WaterLevel3[WaterLevel3["Waist"] = 2] = "Waist";
-  WaterLevel3[WaterLevel3["Under"] = 3] = "Under";
-  return WaterLevel3;
+var WaterLevel = /* @__PURE__ */ ((WaterLevel4) => {
+  WaterLevel4[WaterLevel4["None"] = 0] = "None";
+  WaterLevel4[WaterLevel4["Feet"] = 1] = "Feet";
+  WaterLevel4[WaterLevel4["Waist"] = 2] = "Waist";
+  WaterLevel4[WaterLevel4["Under"] = 3] = "Under";
+  return WaterLevel4;
 })(WaterLevel || {});
 function isAtLeastWaistDeep(level) {
   return level >= 2 /* Waist */;
@@ -2231,12 +2231,14 @@ function buildWaterWish(params) {
   let wishvel = {
     x: forward.x * cmd.forwardmove + right.x * cmd.sidemove,
     y: forward.y * cmd.forwardmove + right.y * cmd.sidemove,
-    z: 0
+    z: forward.z * cmd.forwardmove + right.z * cmd.sidemove
   };
   if (cmd.upmove > 10) {
     wishvel = addVec3(wishvel, { x: 0, y: 0, z: cmd.upmove });
   } else if (cmd.upmove < -10) {
     wishvel = addVec3(wishvel, { x: 0, y: 0, z: cmd.upmove });
+  } else if (Math.abs(cmd.forwardmove) < 10 && Math.abs(cmd.sidemove) < 10) {
+    wishvel = addVec3(wishvel, { x: 0, y: 0, z: -60 });
   } else {
     wishvel = addVec3(wishvel, { x: 0, y: 0, z: 10 });
   }
@@ -4112,6 +4114,13 @@ var U_REMOVE = 32768;
 
 // src/pmove/apply.ts
 var FRAMETIME = 0.025;
+var MASK_WATER2 = 33554432;
+var WaterLevel3 = {
+  None: 0,
+  Feet: 1,
+  Waist: 2,
+  Under: 3
+};
 var categorizePosition2 = (state, trace) => {
   const point = { ...state.origin };
   point.z -= 0.25;
@@ -4123,12 +4132,26 @@ var categorizePosition2 = (state, trace) => {
 };
 var checkWater = (state, pointContents2) => {
   const point = { ...state.origin };
-  point.z += state.mins.z + 1;
+  const { mins, maxs } = state;
+  point.z = state.origin.z + mins.z + 1;
   const contents = pointContents2(point);
-  if (contents & 33554432) {
-    return { ...state, waterLevel: 1 };
+  if (!(contents & MASK_WATER2)) {
+    return { ...state, waterLevel: WaterLevel3.None };
+  }
+  let waterLevel = WaterLevel3.Feet;
+  const waist = state.origin.z + (mins.z + maxs.z) * 0.5;
+  point.z = waist;
+  const waistContents = pointContents2(point);
+  if (waistContents & MASK_WATER2) {
+    waterLevel = WaterLevel3.Waist;
+    const head = state.origin.z + 22;
+    point.z = head;
+    const headContents = pointContents2(point);
+    if (headContents & MASK_WATER2) {
+      waterLevel = WaterLevel3.Under;
+    }
   }
-  return { ...state, waterLevel: 0 };
+  return { ...state, waterLevel };
 };
 var applyPmove = (state, cmd, trace, pointContents2) => {
   let newState = { ...state };
@@ -4168,7 +4191,8 @@ var applyPmove = (state, cmd, trace, pointContents2) => {
     velocity: frictionedVelocity,
     wishdir: wish.wishdir,
     wishspeed: wish.wishspeed,
-    accel: onGround ? 10 : 1,
+    // Water movement uses ground acceleration (10), not air acceleration (1)
+    accel: onGround || waterLevel >= 2 ? 10 : 1,
     frametime: FRAMETIME
   });
   const traceResult = trace(origin, {