quake2ts 0.0.469 → 0.0.470

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

@@ -2620,6 +2620,7 @@ __export(index_exports, {
   pickupPowerArmor: () => pickupPowerArmor,
   pickupPowerup: () => pickupPowerup,
   pickupWeapon: () => pickupWeapon,
+  player_noise: () => player_noise,
   range: () => rangeTo,
   rangeTo: () => rangeTo,
   registerCallback: () => registerCallback,
@@ -3586,11 +3587,19 @@ function findTarget(self, level, context, trace, hearability = {}) {
     return false;
   }
   const { candidate, heardit } = chooseCandidate(self, level);
-  if (!candidate || !candidate.inUse) return false;
-  if (candidate === self.enemy) return true;
-  if (rejectNotargetEntity(candidate)) return false;
+  if (!candidate || !candidate.inUse) {
+    return false;
+  }
+  if (candidate === self.enemy) {
+    return true;
+  }
+  if (rejectNotargetEntity(candidate)) {
+    return false;
+  }
   if (!heardit) {
-    if (!classifyClientVisibility(self, candidate, level, trace)) return false;
+    if (!classifyClientVisibility(self, candidate, level, trace)) {
+      return false;
+    }
     self.monsterinfo.aiflags &= ~4 /* SoundTarget */;
     self.enemy = candidate;
   } else if (!updateSoundChase(self, candidate, level, hearability, trace)) {
@@ -4538,6 +4547,91 @@ function killBox(teleporter, targets, options = {}) {
   return { events, cleared };
 }
 
+// src/physics/fluid.ts
+init_esm();
+function checkWater2(ent, system, imports) {
+  const origin = ent.origin;
+  const mins = ent.mins;
+  const maxs = ent.maxs;
+  if (!origin || !mins || !maxs) {
+    return;
+  }
+  const point = {
+    x: origin.x + (mins.x + maxs.x) * 0.5,
+    y: origin.y + (mins.y + maxs.y) * 0.5,
+    z: origin.z + mins.z + 1
+  };
+  let cont = imports.pointcontents(point);
+  if ((cont & MASK_WATER) === 0) {
+    if (ent.waterlevel > 0) {
+      playLeaveWaterSound(ent, system);
+      ent.flags &= ~2 /* Swim */;
+    }
+    ent.waterlevel = 0;
+    ent.watertype = 0;
+    return;
+  }
+  ent.watertype = cont;
+  ent.waterlevel = 1;
+  const viewheight = ent.viewheight || (maxs.z - mins.z) * 0.8;
+  const waist = origin.z + (mins.z + maxs.z) * 0.5;
+  const feetZ = origin.z + mins.z + 1;
+  const waistZ = origin.z + mins.z + (maxs.z - mins.z) * 0.5;
+  const headZ = origin.z + maxs.z - 1;
+  const waistPoint = { ...point, z: waistZ };
+  cont = imports.pointcontents(waistPoint);
+  if (cont & MASK_WATER) {
+    ent.waterlevel = 2;
+    const headPoint = { ...point, z: headZ };
+    cont = imports.pointcontents(headPoint);
+    if (cont & MASK_WATER) {
+      ent.waterlevel = 3;
+    }
+  }
+  if ((ent.flags & 2 /* Swim */) === 0) {
+    playEnterWaterSound(ent, system);
+    ent.flags |= 2 /* Swim */;
+  }
+}
+function playEnterWaterSound(ent, system) {
+  if (ent.watertype & CONTENTS_LAVA) {
+    system.sound(ent, 0, "player/lava_in.wav", 1, 1, 0);
+  } else if (ent.watertype & CONTENTS_SLIME) {
+    system.sound(ent, 0, "player/watr_in.wav", 1, 1, 0);
+  } else if (ent.watertype & CONTENTS_WATER) {
+    system.sound(ent, 0, "player/watr_in.wav", 1, 1, 0);
+  }
+}
+function playLeaveWaterSound(ent, system) {
+  if (ent.watertype & CONTENTS_LAVA) {
+    system.sound(ent, 0, "player/lava_out.wav", 1, 1, 0);
+  } else if (ent.watertype & CONTENTS_SLIME) {
+    system.sound(ent, 0, "player/watr_out.wav", 1, 1, 0);
+  } else if (ent.watertype & CONTENTS_WATER) {
+    system.sound(ent, 0, "player/watr_out.wav", 1, 1, 0);
+  }
+}
+function SV_AddCurrents(ent, currentSpeed = 400) {
+  if (!(ent.watertype & MASK_CURRENT)) {
+    return;
+  }
+  const v = { x: 0, y: 0, z: 0 };
+  if (ent.watertype & CONTENTS_CURRENT_0) v.x += 1;
+  if (ent.watertype & CONTENTS_CURRENT_90) v.y += 1;
+  if (ent.watertype & CONTENTS_CURRENT_180) v.x -= 1;
+  if (ent.watertype & CONTENTS_CURRENT_270) v.y -= 1;
+  if (ent.watertype & CONTENTS_CURRENT_UP) v.z += 1;
+  if (ent.watertype & CONTENTS_CURRENT_DOWN) v.z -= 1;
+  let speed = currentSpeed;
+  if (ent.waterlevel === 1 && ent.groundentity) {
+    speed *= 0.5;
+  }
+  const velocity = ent.velocity;
+  velocity.x += v.x * speed;
+  velocity.y += v.y * speed;
+  velocity.z += v.z * speed;
+}
+
 // src/physics/movement.ts
 var WATER_FRICTION = 2;
 var WATER_GRAVITY_SCALE = 0.1;
@@ -4604,6 +4698,9 @@ function runStep(ent, system, imports, gravity, frametime) {
   if (!isFlying) {
     ent.velocity = addVec3(ent.velocity, scaleVec3(gravity, ent.gravity * frametime));
   }
+  if (ent.waterlevel > 0) {
+    SV_AddCurrents(ent);
+  }
   let timeLeft = frametime;
   let velocity = { ...ent.velocity };
   for (let i = 0; i < 4; i++) {
@@ -4781,71 +4878,6 @@ function runPush(pusher, system, imports, frametime) {
   return true;
 }
 
-// src/physics/fluid.ts
-init_esm();
-function checkWater2(ent, system, imports) {
-  const origin = ent.origin;
-  const mins = ent.mins;
-  const maxs = ent.maxs;
-  if (!origin || !mins || !maxs) {
-    return;
-  }
-  const point = {
-    x: origin.x + (mins.x + maxs.x) * 0.5,
-    y: origin.y + (mins.y + maxs.y) * 0.5,
-    z: origin.z + mins.z + 1
-  };
-  let cont = imports.pointcontents(point);
-  if ((cont & MASK_WATER) === 0) {
-    if (ent.waterlevel > 0) {
-      playLeaveWaterSound(ent, system);
-      ent.flags &= ~2 /* Swim */;
-    }
-    ent.waterlevel = 0;
-    ent.watertype = 0;
-    return;
-  }
-  ent.watertype = cont;
-  ent.waterlevel = 1;
-  const viewheight = ent.viewheight || (maxs.z - mins.z) * 0.8;
-  const waist = origin.z + (mins.z + maxs.z) * 0.5;
-  const feetZ = origin.z + mins.z + 1;
-  const waistZ = origin.z + mins.z + (maxs.z - mins.z) * 0.5;
-  const headZ = origin.z + maxs.z - 1;
-  const waistPoint = { ...point, z: waistZ };
-  cont = imports.pointcontents(waistPoint);
-  if (cont & MASK_WATER) {
-    ent.waterlevel = 2;
-    const headPoint = { ...point, z: headZ };
-    cont = imports.pointcontents(headPoint);
-    if (cont & MASK_WATER) {
-      ent.waterlevel = 3;
-    }
-  }
-  if ((ent.flags & 2 /* Swim */) === 0) {
-    playEnterWaterSound(ent, system);
-    ent.flags |= 2 /* Swim */;
-  }
-}
-function playEnterWaterSound(ent, system) {
-  if (ent.watertype & CONTENTS_LAVA) {
-    system.sound(ent, 0, "player/lava_in.wav", 1, 1, 0);
-  } else if (ent.watertype & CONTENTS_SLIME) {
-    system.sound(ent, 0, "player/watr_in.wav", 1, 1, 0);
-  } else if (ent.watertype & CONTENTS_WATER) {
-    system.sound(ent, 0, "player/watr_in.wav", 1, 1, 0);
-  }
-}
-function playLeaveWaterSound(ent, system) {
-  if (ent.watertype & CONTENTS_LAVA) {
-    system.sound(ent, 0, "player/lava_out.wav", 1, 1, 0);
-  } else if (ent.watertype & CONTENTS_SLIME) {
-    system.sound(ent, 0, "player/watr_out.wav", 1, 1, 0);
-  } else if (ent.watertype & CONTENTS_WATER) {
-    system.sound(ent, 0, "player/watr_out.wav", 1, 1, 0);
-  }
-}
-
 // src/entities/pool.ts
 var MAX_EDICTS = 2048;
 var WORLD_INDEX = 0;
@@ -25772,23 +25804,47 @@ init_esm();
 var PNOISE_SELF = 0;
 var PNOISE_WEAPON = 1;
 var PNOISE_IMPACT = 2;
+function player_noise(ent, context) {
+  ent.classname = "player_noise";
+  ent.movetype = 0 /* None */;
+  ent.solid = 0 /* Not */;
+  ent.svflags |= 1 /* NoClient */;
+  ent.mins = { x: -8, y: -8, z: -8 };
+  ent.maxs = { x: 8, y: 8, z: 8 };
+  ent.owner = null;
+}
 function PlayerNoise(who, where, type, context) {
+  if (!who || !who.client) {
+    return;
+  }
+  if (who.flags & 32 /* NoTarget */) {
+    return;
+  }
+  if (!who.client.player_noise_entity) {
+    const noise2 = context.spawn();
+    player_noise(noise2, context);
+    noise2.owner = who;
+    who.client.player_noise_entity = noise2;
+  }
+  const noise = who.client.player_noise_entity;
+  noise.origin = { ...where };
+  context.linkentity(noise);
   const awareness = context.targetAwareness;
   if (!awareness) return;
   if (type === PNOISE_WEAPON) {
-    if (awareness.soundEntity === who) {
+    if (awareness.soundEntity === noise) {
       awareness.soundEntityFrame = awareness.frameNumber;
     } else {
       awareness.sound2Entity = awareness.soundEntity;
       awareness.sound2EntityFrame = awareness.soundEntityFrame;
-      awareness.soundEntity = who;
+      awareness.soundEntity = noise;
       awareness.soundEntityFrame = awareness.frameNumber;
     }
   } else if (type === PNOISE_SELF) {
-    if (awareness.sightEntity === who) {
+    if (awareness.sightEntity === noise) {
       awareness.sightEntityFrame = awareness.frameNumber;
     } else {
-      awareness.sightClient = who;
+      awareness.sightClient = noise;
     }
   }
 }
@@ -26933,6 +26989,7 @@ function createGame(imports, engine, options) {
   pickupPowerArmor,
   pickupPowerup,
   pickupWeapon,
+  player_noise,
   range,
   rangeTo,
   registerCallback,