@adatechnology/game-test-room 0.24.0 → 0.25.1

package/dist/index.js

@@ -2,7 +2,7 @@
 import { createDestruction, JOINT_DEFAULTS, resolveStrings as resolveDestructionStrings } from "@adatechnology/game-destruction";
 import { createAudioEngine, createAudioSink, loadKitSamples, loadUserSamples } from "@adatechnology/game-audio";
 import { createDestructionRenderer, createDestructionSound, dragSoundKey, impactKey, impactSoundKeys, specFromObject3D } from "@adatechnology/game-destruction-three";
-import { bodyMass, KNOCK_CHEST, knockOf, surfaceOfMaterial } from "@adatechnology/game-contracts";
+import { bodyMass, KNOCK_CHEST, KNOCK_DOWN_SPEED, knockOf, surfaceOfMaterial } from "@adatechnology/game-contracts";
 
 // src/body-sounds.ts
 import { BODY_FOLEY_BANK } from "@adatechnology/game-audio";
@@ -812,7 +812,17 @@ function createExplosives(context) {
     if (onPlayer.zone !== "none") {
       action("blast_player", translate("act.blast_player", { weapon: weaponName, zone: translate(`blast.zone.${onPlayer.zone}`), distance: format(onPlayer.distance, 1), stun: format(onPlayer.stunSeconds, 1) }), { data: { ...onPlayer } });
     }
-    context.emitHost({ type: "explosion", source: projectile.weapon, point: detonation.point, energy: detonation.energy, radius: reach, cause: detonation.cause, explosive: detonation.explosive });
+    context.emitHost({
+      type: "explosion",
+      source: projectile.weapon,
+      point: detonation.point,
+      energy: detonation.energy,
+      radius: reach,
+      cause: detonation.cause,
+      explosive: detonation.explosive,
+      lethalRadius: detonation.lethalRadius,
+      ...detonation.tnt !== void 0 ? { tnt: detonation.tnt } : {}
+    });
     if (detonation.fire) context.startFire(projectile.weapon, detonation.point, detonation.fire, detonation.cause === "impact");
   };
   const detonateBare = (projectile, isImpact) => {
@@ -2148,6 +2158,9 @@ var LYING_EYE = 0.3;
 var LYING_PITCH = 1.05;
 var LYING_ROLL = 0.35;
 var LYING_PITCH_FACE_DOWN = -1.05;
+var STUN_PITCH = 0.05;
+var STUN_ROLL = 0.08;
+var STUN_FULL = 2;
 function createPlayer(THREE, o) {
   const cam = o.camera;
   let yaw = 0;
@@ -2187,11 +2200,16 @@ function createPlayer(THREE, o) {
   };
   let knocked = null;
   let knockedForward = false;
+  let stunLeft = 0;
+  let stunPhase = 0;
   let rollSide = 1;
   const apply = () => {
     const lying = knocked?.lying ?? 0;
     const fallen = lying * lying * (3 - 2 * lying);
-    euler.set(pitch + ((knockedForward ? LYING_PITCH_FACE_DOWN : LYING_PITCH) - pitch) * fallen, yaw, LYING_ROLL * rollSide * fallen, "YXZ");
+    const sway = Math.min(1, stunLeft / STUN_FULL);
+    const swayPitch = STUN_PITCH * sway * Math.sin(stunPhase * 1.3);
+    const swayRoll = STUN_ROLL * sway * Math.sin(stunPhase * 0.9 + 1);
+    euler.set(pitch + ((knockedForward ? LYING_PITCH_FACE_DOWN : LYING_PITCH) - pitch) * fallen + swayPitch, yaw, LYING_ROLL * rollSide * fallen + swayRoll, "YXZ");
     cam.quaternion.setFromEuler(euler);
     const standing = eye - CROUCH_DROP * crouch - bend;
     cam.position.set(px.x, floorLevel + y + standing + (LYING_EYE - standing) * fallen, px.z);
@@ -2465,11 +2483,15 @@ function createPlayer(THREE, o) {
         knocked.velocity = [knocked.velocity[0] + next.velocity[0], knocked.velocity[1] + next.velocity[1], knocked.velocity[2] + next.velocity[2]];
         knocked.airborne || (knocked.airborne = next.airborne);
         knocked.down || (knocked.down = next.down);
+        knocked.wounded || (knocked.wounded = next.wounded);
+        knocked.lieLeft = Math.max(knocked.lieLeft, next.lieLeft);
       } else knocked = { ...next, velocity: [...next.velocity] };
+      stunLeft = Math.max(stunLeft, next.stunSeconds ?? 0);
       if (next.down) {
-        const right = Math.cos(yaw) * next.velocity[0] - Math.sin(yaw) * next.velocity[2];
+        const away = next.away && (next.away[0] !== 0 || next.away[2] !== 0) ? next.away : next.velocity;
+        const right = Math.cos(yaw) * away[0] - Math.sin(yaw) * away[2];
         rollSide = right >= 0 ? -1 : 1;
-        knockedForward = -Math.sin(yaw) * next.velocity[0] - Math.cos(yaw) * next.velocity[2] > 0;
+        knockedForward = -Math.sin(yaw) * away[0] - Math.cos(yaw) * away[2] > 0;
         crouchLatched = false;
       }
       if (knocked.airborne) vy = Math.max(vy, knocked.velocity[1]);
@@ -2480,7 +2502,14 @@ function createPlayer(THREE, o) {
     get knockedForward() {
       return knockedForward;
     },
+    get stunned() {
+      return stunLeft;
+    },
     update(dt) {
+      if (stunLeft > 0) {
+        stunLeft = Math.max(0, stunLeft - dt);
+        stunPhase += dt * 2.4;
+      }
       if (knocked) {
         stepKnocked(dt);
         return;
@@ -3520,6 +3549,9 @@ var en = {
     "act.player_slammed": "The player was thrown into {what} at {speed} m/s",
     "act.player_fell": "The player hit the floor at {speed} m/s",
     "act.player_shoved": "The blast pushed the player at {speed} m/s ({reach}% got through the cover)",
+    "act.player_wounded": "The blast felled the player where they stood, {distance} m from it: badly wounded, stunned for {stun} s ({reach}% got through the cover)",
+    "act.player_thrown_wounded": "The blast threw the player at {speed} m/s, {distance} m from it: badly wounded, stunned for {stun} s ({reach}% got through the cover)",
+    "act.player_stunned": "The blast stunned the player for {stun} s, {distance} m from it: dizzy, ears ringing",
     "act.came_apart": "{name} came apart: what stayed is loose and falls",
     "act.shoved": "{name} stands free: the shots moved it",
     "act.impact": "{name} hit {where} at {speed} m/s: {energy} J of blunt damage",
@@ -3882,6 +3914,9 @@ var ptBR = {
     "act.player_slammed": "O jogador foi arremessado contra {what} a {speed} m/s",
     "act.player_fell": "O jogador bateu no ch\xE3o a {speed} m/s",
     "act.player_shoved": "A explos\xE3o empurrou o jogador a {speed} m/s ({reach}% passou pela cobertura)",
+    "act.player_wounded": "A explos\xE3o derrubou o jogador onde estava, a {distance} m dela: ferido gravemente, atordoado por {stun} s ({reach}% passou pela cobertura)",
+    "act.player_thrown_wounded": "A explos\xE3o arremessou o jogador a {speed} m/s, a {distance} m dela: ferido gravemente, atordoado por {stun} s ({reach}% passou pela cobertura)",
+    "act.player_stunned": "A explos\xE3o atordoou o jogador por {stun} s, a {distance} m dela: tonto, com os ouvidos zumbindo",
     "act.came_apart": "{name} se desmontou: o que ficou est\xE1 solto e cai",
     "act.shoved": "{name} estava solto no ch\xE3o: os tiros o moveram",
     "act.impact": "{name} bateu em {where} a {speed} m/s: {energy} J de dano de impacto",
@@ -5611,7 +5646,19 @@ function createTestRoom(options) {
     for (const ev of batch) {
       if (ev.type === "leak") puncture(ev);
       else if (ev.type === "ignite") igniteNear(ev.point, 0.9);
-      else if (ev.type === "explode") emitHost({ type: "explosion", source: ev.object, point: ev.point, energy: ev.energy, radius: ev.radius, cause: "part", ...ev.effect !== void 0 ? { explosive: ev.effect } : {} });
+      else if (ev.type === "explode") {
+        emitHost({
+          type: "explosion",
+          source: ev.object,
+          point: ev.point,
+          energy: ev.energy,
+          radius: ev.radius,
+          cause: "part",
+          ...ev.effect !== void 0 ? { explosive: ev.effect } : {},
+          ...ev.tnt !== void 0 ? { tnt: ev.tnt } : {},
+          ...ev.lethalRadius !== void 0 ? { lethalRadius: ev.lethalRadius } : {}
+        });
+      }
       fire("event", ev);
       options.onEvent?.(ev);
     }
@@ -6307,14 +6354,27 @@ function createTestRoom(options) {
   const knockPlayer = (event) => {
     if (seating.seat) return;
     const feet = [player.x, player.feet, player.z];
-    const reach = world.blastReach(event.point, [feet[0], feet[1] + KNOCK_CHEST, feet[2]], event.source ? { ignore: [event.source] } : {});
-    const knock = knockOf({ point: event.point, energy: event.energy, radius: event.radius, reach }, feet, playerMass, options.blastShove);
+    const chest = [feet[0], feet[1] + KNOCK_CHEST, feet[2]];
+    const reach = world.blastReach(event.point, chest, event.source ? { ignore: [event.source] } : {});
+    const blast = {
+      point: event.point,
+      energy: event.energy,
+      radius: event.radius,
+      reach,
+      ...event.tnt !== void 0 ? { tnt: event.tnt } : {},
+      ...event.lethalRadius !== void 0 ? { lethalRadius: event.lethalRadius } : {}
+    };
+    const knock = knockOf(blast, feet, playerMass, options.blastShove, options.blastImpulse);
     if (!knock) return;
     player.knock(knock);
     const speed = Math.hypot(knock.velocity[0], knock.velocity[1], knock.velocity[2]);
-    action(knock.down ? "player_knocked_down" : "player_shoved", t(knock.down ? "act.knocked_down" : "act.player_shoved", { speed: num(speed, 1), reach: num(reach * 100, 0) }), {
-      data: { speed, reach, down: knock.down, source: event.source }
-    });
+    const distance = Math.hypot(chest[0] - event.point[0], chest[1] - event.point[1], chest[2] - event.point[2]);
+    const data = { speed, reach, distance, down: knock.down, wounded: Boolean(knock.wounded), stunSeconds: knock.stunSeconds ?? 0, source: event.source };
+    const values = { speed: num(speed, 1), reach: num(reach * 100, 0), distance: num(distance, 1), stun: num(knock.stunSeconds ?? 0, 1) };
+    if (knock.wounded) action("player_wounded", t(speed >= KNOCK_DOWN_SPEED ? "act.player_thrown_wounded" : "act.player_wounded", values), { data });
+    else if (knock.down) action("player_knocked_down", t("act.knocked_down", values), { data });
+    else if (speed > 0) action("player_shoved", t("act.player_shoved", values), { data });
+    else action("player_stunned", t("act.player_stunned", values), { data });
   };
   const avatarState = { speed: 0, running: false, crouch: false, down: false, armed: false, pitch: 0 };
   let feetPrev = null;
@@ -8274,6 +8334,8 @@ function createTestRoom(options) {
     let handle = null;
     return {
       id: `vfx:${id}`,
+      // the room was drawn in every fog state just before: each frame of a blast draws the effects alone
+      root: () => vfx.root,
       play() {
         handle = vfx.play({ effect: id, point: [0, 0.1, -4], direction: [0, 1, 0], normal: [0, 1, 0] });
       },