@adatechnology/game-weapons-three 0.12.0 → 0.13.0

package/dist/{chunk-ZVLG34JN.js → chunk-NQELXT56.js}

@@ -2164,6 +2164,75 @@ var reloadCueSteps = (id, profile = DEFAULT_SOUND_PROFILE, table = RELOAD_CUES)
   });
 };
 
+// src/audio/samples.ts
+import { sampleBankFromManifest } from "@adatechnology/game-audio";
+
+// src/data/reload-sample-hits.json
+var reload_sample_hits_default = {
+  $comment: "Seconds from the start of each recorded reload step to its hit (median of its takes), measured on the converted files by tools/sfx-sources/hits.mjs. The reload clip starts the sound that much early, so the hit lands on the frame the part reaches its stop.",
+  hits: {
+    bolt_lift: 0.072,
+    bolt_lock: 0.078,
+    bolt_pull: 0.128,
+    bolt_push: 0.054,
+    charging_handle_pull: 0.074,
+    charging_handle_release: 0.048,
+    cylinder_close: 0.024,
+    cylinder_eject: 0.394,
+    cylinder_open: 0.07,
+    lever_close: 0.147,
+    lever_open: 0.095,
+    mag_out: 0.012,
+    mag_seat: 0.094,
+    pump_back: 0.094,
+    pump_forward: 0.118,
+    shell_insert: 0.21,
+    slide_release: 0.031,
+    speedloader: 0.089
+  }
+};
+
+// src/audio/samples.ts
+var GUNSHOT_SAMPLE_IDS = [...Object.keys(gunshot_profiles_default.profiles), "suppressed_pistol", "suppressed_rifle"];
+var GUNSHOT_SAMPLE = {
+  bus: "weapons",
+  gain: 1,
+  pitch: 0.04,
+  crossover: { from: 20, to: 90 },
+  falloff: { model: "inverse_square", k: 5e-4, minGain: 6e-4 },
+  cutoffK: 0.04,
+  priority: 3
+};
+var SUPPRESSED_SAMPLE = { ...GUNSHOT_SAMPLE, gain: 0.55, crossover: { from: 10, to: 50 }, falloff: { model: "inverse_square", k: 4e-3, minGain: 8e-4 } };
+var RELOAD_SAMPLE = { bus: "weapons", gain: 0.32, pitch: 0.05, falloff: { model: "inverse_square", k: 0.05, minGain: 2e-3 }, cutoffK: 0.02, priority: 2 };
+var CASING_SAMPLE = { bus: "weapons", gain: 0.22, pitch: 0.06, falloff: { model: "inverse_square", k: 0.08, minGain: 3e-3 }, cutoffK: 0.03, priority: 1 };
+var casingSampleId = (sample) => sample.replace(/_(pistol|rifle|shell)$/, "");
+var RELOAD_SAMPLE_HITS = reload_sample_hits_default.hits;
+var WEIGHT_INTENSITY = { light: 0.1, medium: 0.5, heavy: 0.9 };
+var CUES_IN_SAMPLE = { mag_release: "mag_out", mag_insert: "mag_seat" };
+var isGunshot = (id) => GUNSHOT_SAMPLE_IDS.includes(id);
+function weaponSampleDefaults(sound3, overrides = {}) {
+  if (sound3.category !== "armas") return void 0;
+  const base = sound3.id.startsWith("suppressed_") ? SUPPRESSED_SAMPLE : isGunshot(sound3.id) ? GUNSHOT_SAMPLE : sound3.id.startsWith("casing_drop_") ? CASING_SAMPLE : RELOAD_SAMPLE;
+  return { ...base, ...overrides[sound3.id] };
+}
+function weaponSampleBank(options) {
+  const bank = sampleBankFromManifest(options.manifest, { id: "weapons_three_samples", ...options.url ? {} : { baseUrl: options.baseUrl ?? "" }, defaults: (sound3) => weaponSampleDefaults(sound3, options.sounds) });
+  const url = options.url;
+  const remap = (refs) => refs && url ? refs.map((ref) => ({ ...ref, url: url(ref.url) })) : refs ? [...refs] : void 0;
+  const samples = (bank.samples ?? []).map((sample) => {
+    const tiers = sample.tiers?.map((tier) => ({ ...tier, close: remap(tier.close) ?? [], ...tier.far ? { far: remap(tier.far) ?? [] } : {} }));
+    return {
+      ...sample,
+      close: remap(sample.close) ?? [],
+      ...sample.far ? { far: remap(sample.far) ?? [] } : {},
+      ...tiers ? { tiers } : {},
+      ...isGunshot(sample.id) ? { choke: { voices: 3, fade: 0.06 } } : {}
+    };
+  });
+  return { id: bank.id, samples };
+}
+
 // src/audio.ts
 var NOISE_SECONDS = 1.5;
 var DEFAULT_SEED = 1;
@@ -2184,6 +2253,17 @@ function createWeaponAudio(volume = 0.6, options = {}) {
   const channel = shared && options.seed !== void 0 ? shared.channel({ seed }) : engine.channel({});
   engine.register({ id: `weapons_three@${classBurstId(distanceCurve)}`, sounds: weaponRecipes(distanceCurve) });
   const classBurst = classBurstId(distanceCurve);
+  const sampleBank = options.samples ? weaponSampleBank(options.samples) : null;
+  if (sampleBank) engine.register(sampleBank);
+  const sampleIds = new Set((sampleBank?.samples ?? []).map((sample) => sample.id));
+  let sampleLoad = null;
+  const loadSamples = () => sampleLoad ?? (sampleLoad = sampleIds.size > 0 ? engine.loadSamples([...sampleIds]).then(() => void 0, () => void 0) : Promise.resolve());
+  const sampleReady = (id) => {
+    if (!sampleIds.has(id)) return false;
+    if (engine.sampleStatus(id) === "ready") return true;
+    void loadSamples();
+    return false;
+  };
   const burst = (config) => {
     const id = config.filter === "highpass" ? BURST_IDS.highpass : BURST_IDS.lowpass;
     const params = { frequency: config.frequency, q: config.q ?? 0.8, gain: Math.max(config.gain, 2e-4), seconds: config.seconds };
@@ -2232,8 +2312,14 @@ function createWeaponAudio(volume = 0.6, options = {}) {
   };
   const casing = (input) => {
     const sound3 = computeCasingSound({ ...input, pitch: input.pitch ?? 1 + (channel.random() * 2 - 1) * 0.06 });
+    const recorded = sound3.kind === "shell" ? "" : casingSampleId(sound3.sample);
+    if (recorded && sampleReady(recorded)) {
+      if ((input.bounce ?? 0) === 0) channel.play(recorded, { volume: Math.min(1, Math.max(0.2, (input.speed ?? 1.5) / 2.5)) });
+      options.onCasing?.(sound3, "sample");
+      return;
+    }
     for (const voice of sound3.voices) playCasingVoice(voice);
-    options.onCasing?.(sound3);
+    options.onCasing?.(sound3, "synth");
   };
   const lastTake = /* @__PURE__ */ new Map();
   const pitchSpread = options.pitchSpread ?? 0.04;
@@ -2255,8 +2341,25 @@ function createWeaponAudio(volume = 0.6, options = {}) {
         lastTake.set(profile, take);
         const pitch = 1 + (channel.random() * 2 - 1) * pitchSpread;
         const shot = computeGunshot({ ...base, take, pitch }, options.gunshot);
+        const recorded = shot.samples.close;
+        if (shot.audible && sampleReady(recorded)) {
+          const occlusion = Math.min(1, Math.max(0, extras.occlusion ?? 0));
+          const handle = channel.play(recorded, {
+            volume: (extras.volume ?? 1) * (1 - 0.5 * occlusion),
+            environment: base.space === "indoor" ? "indoor" : "outdoor",
+            ...extras.position ? { position: [extras.position[0], extras.position[1], extras.position[2]] } : {},
+            ...extras.distance === void 0 ? {} : { distance: extras.distance },
+            ...shot.delay > 0 ? { delay: shot.delay } : {}
+          });
+          if (base.space === "indoor") {
+            for (const voice of shot.voices) if (voice.group === "tail") playGunshotVoice(voice, extras);
+          }
+          const layers = handle?.kind === "sample" ? handle.plan.layers.map((layer) => ({ role: layer.role, take: layer.take, rate: layer.rate })) : [];
+          options.onGunshot?.(shot, { ...base, take, pitch }, { kind: "sample", id: recorded, layers });
+          return;
+        }
         for (const voice of shot.voices) playGunshotVoice(voice, extras);
-        if (shot.audible) options.onGunshot?.(shot, { ...base, take, pitch });
+        if (shot.audible) options.onGunshot?.(shot, { ...base, take, pitch }, { kind: "synth" });
         return;
       }
       const sound3 = shotSound({ ...extras, energyJ, category });
@@ -2271,9 +2374,17 @@ function createWeaponAudio(volume = 0.6, options = {}) {
       mechanical("dry_fire");
     },
     mechanical,
-    cue(id, profile) {
-      for (const entry of reloadCueSteps(id, profile, cueTable)) step(entry);
+    cue(id, profile, lead = 0) {
+      const carriedBy = CUES_IN_SAMPLE[id];
+      if (carriedBy && sampleReady(carriedBy)) return "carried";
+      if (sampleReady(id)) {
+        channel.play(id, { intensity: WEIGHT_INTENSITY[(profile ?? DEFAULT_SOUND_PROFILE).weight] });
+        return "sample";
+      }
+      for (const entry of reloadCueSteps(id, profile, cueTable)) step(lead > 0 ? { ...entry, at: entry.at + lead } : entry);
+      return "synth";
     },
+    loadSamples,
     event(event) {
       const id = mechanicalSoundOf(event);
       if (id) mechanical(id);
@@ -6048,6 +6159,7 @@ import { createRng as createRng2, muzzleEnergy as muzzleEnergy4 } from "@adatech
 
 // src/animation/clip-builder.ts
 import { STAGE_EVENT } from "@adatechnology/game-contracts";
+var RELOAD_SAMPLE_HITS2 = reload_sample_hits_default.hits;
 var ROOT = "root";
 var AXIS_INDEX = { x: 0, y: 1, z: 2 };
 var EASE_STEPS = 10;
@@ -6055,7 +6167,10 @@ var ease = (progress) => progress < 0.5 ? 2 * progress * progress : 1 - (-2 * pr
 var move = (part, axis, start, duration, from, to) => ({ part, channel: "position", axis, start, duration, from, to });
 var turn = (part, axis, start, duration, from, to) => ({ part, channel: "rotation", axis, start, duration, from, to });
 var cue = (t, type, data) => ({ t, type, ...data ? { data } : {} });
-var sound2 = (t, id) => ({ t, type: "sound", data: { id } });
+var sound2 = (t, id) => {
+  const lead = RELOAD_SAMPLE_HITS2[id];
+  return lead ? { t, type: "sound", data: { id }, lead } : { t, type: "sound", data: { id } };
+};
 var stage = (id, t) => ({ t, type: STAGE_EVENT, data: { stage: id } });
 var valueAt = (tweens, t, includeInstants) => {
   let value = 0;
@@ -7561,7 +7676,7 @@ function createClipEventHandler(world, session) {
         breechRound();
         break;
       case "sound":
-        world.sound(session.id, String(data.id), session.soundProfile);
+        world.sound(session.id, String(data.id), session.soundProfile, typeof data.lead === "number" ? data.lead : void 0);
         break;
       default:
         break;
@@ -8137,9 +8252,9 @@ function createViewmodel(options) {
     audio,
     layers,
     groundAt,
-    sound: (weapon, cue2, profile) => {
-      audio?.cue(cue2, profile);
-      options.onSound?.({ weapon, cue: cue2, profile });
+    sound: (weapon, cue2, profile, lead) => {
+      const played = audio?.cue(cue2, profile, lead);
+      options.onSound?.({ weapon, cue: cue2, profile, ...played ? { played } : {} });
     },
     schedule: (delay, seconds, step, done) => void tasks.push({ delay, seconds, elapsed: 0, step: (progress) => step(ease(progress)), done })
   };
@@ -9536,7 +9651,10 @@ var TEXT = {
     reloadStart: "Reload started: {weapon} ({ammo}/{capacity})",
     reloadClip: "Reload of {weapon}: {kind}, clip {clip} ({seconds} s)",
     soundCue: "Sound: {cue} ({weapon})",
+    cueRecorded: " \xB7 recorded",
+    cueCarried: " \xB7 inside the next recording",
     gunshotSound: "Shot sound: {profile}, take {take}/4, pitch {pitch}, {space}, {distance} m{far}",
+    gunshotRecorded: " \xB7 recorded take {takes}",
     casingSound: "Case lands: {case} on {surface}",
     spaces: { indoor: "indoors", outdoor: "outdoors" },
     surfaces: { hard: "concrete", wood: "wood", metal: "metal", soft: "dirt" },
@@ -9568,7 +9686,10 @@ var TEXT = {
     reloadStart: "Recarga iniciada: {weapon} ({ammo}/{capacity})",
     reloadClip: "Recarga de {weapon}: {kind}, clipe {clip} ({seconds} s)",
     soundCue: "Som: {cue} ({weapon})",
+    cueRecorded: " \xB7 grava\xE7\xE3o",
+    cueCarried: " \xB7 dentro da grava\xE7\xE3o seguinte",
     gunshotSound: "Som do tiro: {profile}, tomada {take}/4, tom {pitch}, {space}, {distance} m{far}",
+    gunshotRecorded: " \xB7 grava\xE7\xE3o, tomada {takes}",
     casingSound: "C\xE1psula caiu: {case} em {surface}",
     spaces: { indoor: "ambiente fechado", outdoor: "ao ar livre" },
     surfaces: { hard: "concreto", wood: "madeira", metal: "metal", soft: "terra" },
@@ -9690,7 +9811,7 @@ function createWeaponsTestModule(options = {}) {
   const accessoryText = accessoryTextOf(locale);
   const seedOption = options.seed === void 0 ? {} : { seed: options.seed };
   let audio;
-  const ownAudio = () => audio === void 0 ? audio = options.sound === false ? null : createWeaponAudio(void 0, seedOption) : audio;
+  const ownAudio = () => audio === void 0 ? audio = options.sound === false ? null : createWeaponAudio(void 0, { ...seedOption, ...options.samples ? { samples: options.samples } : {} }) : audio;
   const weaponDefs = [...arsenal.weapons.values()].filter((def) => !BODY_ACTIONS.has(def.id));
   const thumbnailBase = options.thumbnailBase ?? DEFAULT_THUMBNAIL_BASE;
   const withThumbnail = (item, key) => {
@@ -9777,18 +9898,22 @@ function createWeaponsTestModule(options = {}) {
         audio = createWeaponAudio(void 0, {
           ...seedOption,
           engine: lentEngine,
-          onGunshot: (shot, input) => lent.log(
-            fill(text.gunshotSound, { profile: shot.profile, take: String(shot.take + 1), pitch: `${shot.pitch >= 1 ? "+" : ""}${((shot.pitch - 1) * 100).toFixed(1)} %`, space: text.spaces[input.space ?? "outdoor"], distance: String(Math.round(input.distance ?? 0)), far: shot.closeMix < 1 ? ` (${Math.round((1 - shot.closeMix) * 100)} % far)` : "" }),
-            { profile: shot.profile, take: shot.take, pitch: shot.pitch, space: input.space ?? "outdoor", distance: input.distance ?? 0, closeMix: shot.closeMix, delay: shot.delay, samples: shot.samples },
-            "sound"
-          ),
-          onCasing: (sound3) => lent.log(fill(text.casingSound, { case: sound3.kind, surface: text.surfaces[sound3.surface] }), { case: sound3.kind, surface: sound3.surface, sample: sound3.sample }, "sound")
+          ...options.samples ? { samples: options.samples } : {},
+          onGunshot: (shot, input, played) => {
+            const recorded = played.kind === "sample" && played.layers.length > 0 ? fill(text.gunshotRecorded, { takes: played.layers.map((layer) => `${layer.role} ${layer.take + 1}`).join(", ") }) : "";
+            lent.log(
+              fill(text.gunshotSound, { profile: shot.profile, take: String(shot.take + 1), pitch: `${shot.pitch >= 1 ? "+" : ""}${((shot.pitch - 1) * 100).toFixed(1)} %`, space: text.spaces[input.space ?? "outdoor"], distance: String(Math.round(input.distance ?? 0)), far: shot.closeMix < 1 ? ` (${Math.round((1 - shot.closeMix) * 100)} % far)` : "" }) + recorded,
+              { profile: shot.profile, take: shot.take, pitch: shot.pitch, space: input.space ?? "outdoor", distance: input.distance ?? 0, closeMix: shot.closeMix, delay: shot.delay, samples: shot.samples, played },
+              "sound"
+            );
+          },
+          onCasing: (sound3, played) => lent.log(fill(text.casingSound, { case: sound3.kind, surface: text.surfaces[sound3.surface] }) + (played === "sample" ? text.cueRecorded : ""), { case: sound3.kind, surface: sound3.surface, sample: sound3.sample, played }, "sound")
         });
       }
       let simulatedMs = 0;
       const offClock = lent.onFrame((dt) => simulatedMs += dt * 1e3);
       const created = createWeaponFx({
-        onSound: ({ weapon, cue: cue2, profile }) => lent.log(fill(text.soundCue, { weapon: arsenal.name(weapon), cue: text.soundCues[cue2] ?? cue2 }), { weapon, cue: cue2, weight: profile.weight, material: profile.material }, "sound"),
+        onSound: ({ weapon, cue: cue2, profile, played }) => lent.log(fill(text.soundCue, { weapon: arsenal.name(weapon), cue: text.soundCues[cue2] ?? cue2 }) + (played === "sample" ? text.cueRecorded : played === "carried" ? text.cueCarried : ""), { weapon, cue: cue2, weight: profile.weight, material: profile.material, ...played ? { played } : {} }, "sound"),
         THREE: lent.THREE,
         scene: lent.scene,
         camera: lent.camera,
@@ -9963,6 +10088,7 @@ var EXPLOSIVES_TEXT = {
       push_outward: "Every body inside the reach moved away from the blast ({moved} of {n}, {least} m at the least)",
       push_falloff: "{what}: the nearer one moved more than the farther one ({near} m at {nearDistance} m, {far} m at {farDistance} m)",
       push_person: "{who} at {distance} m was pushed {moved} m away",
+      push_sheltered: "{what} at {distance} m stood behind cover ({cover}% of the blast got through) and moved only {moved} m",
       push_heavy: "{what} (too heavy to grab, not fixed) was moved {moved} m by the blast"
     }
   },
@@ -10048,6 +10174,7 @@ var EXPLOSIVES_TEXT = {
       push_outward: "Todo corpo dentro do alcance se afastou da explos\xE3o ({moved} de {n}, no m\xEDnimo {least} m)",
       push_falloff: "{what}: o mais perto andou mais que o mais longe ({near} m a {nearDistance} m, {far} m a {farDistance} m)",
       push_person: "{who} a {distance} m foi empurrado {moved} m para longe",
+      push_sheltered: "{what} a {distance} m estava atr\xE1s de cobertura ({cover}% da explos\xE3o passou) e andou s\xF3 {moved} m",
       push_heavy: "{what} (pesado demais para pegar, mas solto) foi movido {moved} m pela explos\xE3o"
     }
   }
@@ -10593,6 +10720,10 @@ var PUSH_KINDS = [
 ];
 var PUSH_READ_AT = 0.8;
 var MOVED = 0.15;
+var SHELTERED = 0.5;
+var SHELTERED_MOST = 1;
+var CHEST = 1.1;
+var MIDDLE = 0.3;
 var HEAVY_ITEMS = ["camp_table"];
 var flat = (a, b) => Math.hypot(a[0] - b[0], a[2] - b[2]);
 var bearing = (centre, distance, degrees) => [centre[0] + Math.sin(degrees * Math.PI / 180) * distance, 0, centre[2] + Math.cos(degrees * Math.PI / 180) * distance];
@@ -10609,9 +10740,11 @@ function pushScenario(all, bench, mode) {
     name: mode === "p13" ? text.push_p13 : text.push_grenade,
     run: ({ room, step, expect }) => {
       let centre;
+      let source;
       if (mode === "p13") {
         room.openArea(EXPLOSIVES_AREA_ID);
         const cylinder = room.spawned().find((spawned) => spawned.itemId === CYLINDER_ITEM);
+        source = cylinder?.objectId;
         const at = cylinder?.root?.position;
         centre = [at?.x ?? 0, 0, at?.z ?? -10.66];
       } else {
@@ -10662,6 +10795,14 @@ function pushScenario(all, bench, mode) {
       const blast = bench.lastBlast();
       expect(!!blast, text.push_told, { waited });
       if (!blast) return;
+      const coverOf = new Map(
+        placed.map((body) => {
+          const from = origin.get(body.objectId) ?? body.from;
+          const person = body.kind === "zombie" || body.kind === "survivor";
+          const ignore = source ? [source, body.objectId] : [body.objectId];
+          return [body.objectId, room.world.blastReach?.(blast.point, [from[0], from[1] + (person ? CHEST : MIDDLE), from[2]], { ignore }) ?? 1];
+        })
+      );
       step(PUSH_READ_AT);
       const rows = placed.map((body) => {
         const from = origin.get(body.objectId) ?? body.from;
@@ -10669,10 +10810,15 @@ function pushScenario(all, bench, mode) {
         const distance = flat(from, blast.point);
         const away = Math.max(1e-6, distance);
         const outward = ((now[0] - from[0]) * (from[0] - blast.point[0]) + (now[2] - from[2]) * (from[2] - blast.point[2])) / away;
-        return { ...body, distance, outward, moved: flat(now, from) };
+        return { ...body, distance, outward, moved: flat(now, from), cover: coverOf.get(body.objectId) ?? 1 };
       });
       const torn = (row) => (PUSH_KINDS.some((entry) => entry.kind === row.kind) || HEAVY_ITEMS.includes(row.kind)) && partsOf(row.objectId) < (partsBefore.get(row.objectId) ?? 0);
-      const reached = rows.filter((row) => row.distance < blast.radius * 0.85 && !torn(row));
+      const inReach = rows.filter((row) => row.distance < blast.radius * 0.85 && !torn(row));
+      const sheltered = inReach.filter((row) => row.cover < SHELTERED);
+      for (const row of sheltered) {
+        expect(row.outward < SHELTERED_MOST, fillText2(text.push_sheltered, { what: things[row.kind] ?? row.kind, distance: row.distance.toFixed(1), cover: (row.cover * 100).toFixed(0), moved: Math.max(0, row.outward).toFixed(2) }), { row: { kind: row.kind, distance: row.distance, outward: row.outward, cover: row.cover } });
+      }
+      const reached = inReach.filter((row) => row.cover >= SHELTERED);
       const movedAway = reached.filter((row) => row.outward >= MOVED);
       const least = reached.length === 0 ? 0 : Math.min(...reached.map((row) => row.outward));
       expect(reached.length > 0 && movedAway.length === reached.length, fillText2(text.push_outward, { moved: movedAway.length, n: reached.length, least: least.toFixed(2) }), { rows: reached.map((row) => ({ kind: row.kind, distance: row.distance, outward: row.outward })), torn: rows.filter(torn).map((row) => row.objectId) });
@@ -10842,6 +10988,18 @@ export {
   DEFAULT_ENERGY_CURVE,
   CLASS_REFERENCE_ENERGY,
   computeShotSound,
+  GUNSHOT_PROFILES,
+  computeGunshot,
+  computeCasingSound,
+  computeFlyby,
+  GUNSHOT_SAMPLE_IDS,
+  GUNSHOT_SAMPLE,
+  RELOAD_SAMPLE,
+  RELOAD_SAMPLE_HITS,
+  WEIGHT_INTENSITY,
+  CUES_IN_SAMPLE,
+  weaponSampleDefaults,
+  weaponSampleBank,
   createWeaponAudio,
   BODY_ACTIONS,
   weaponProp,
@@ -10899,4 +11057,4 @@ export {
   DEFAULT_EXPLOSIVES_SCENE,
   createExplosivesTestModule
 };
-//# sourceMappingURL=chunk-ZVLG34JN.js.map
+//# sourceMappingURL=chunk-NQELXT56.js.map