@adatechnology/game-weapons-three 0.15.0 → 0.16.0

package/dist/{chunk-GBO6L7CQ.js → chunk-KWJQO6JS.js}

@@ -1413,6 +1413,10 @@ function computeCasingSound(input) {
   const surfaceName = surface === "hard" ? "concreto" : surface === "soft" ? "terra" : surface === "wood" ? "madeira" : "metal";
   return { surface, kind, sample: `casing_drop_${surfaceName}_${kind}`, voices };
 }
+function magazineDropId(material) {
+  const surface = casingSurfaceOf(material);
+  return `mag_drop_${surface === "hard" ? "concreto" : surface === "soft" ? "terra" : surface === "wood" ? "madeira" : "metal"}`;
+}
 
 // src/audio/flyby.ts
 function computeFlyby(input) {
@@ -2217,7 +2221,7 @@ 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;
+  const base = sound3.id.startsWith("suppressed_") ? SUPPRESSED_SAMPLE : isGunshot(sound3.id) ? GUNSHOT_SAMPLE : sound3.id.startsWith("casing_drop_") || sound3.id.startsWith("mag_drop_") ? CASING_SAMPLE : RELOAD_SAMPLE;
   return { ...base, ...overrides[sound3.id] };
 }
 function weaponSampleBank(options) {
@@ -2268,6 +2272,8 @@ function createWeaponAudio(volume = 0.6, options = {}) {
     void loadSamples();
     return false;
   };
+  const fittedReady = (id) => sampleIds.has(id) && engine.registry.sound(id) === void 0 && engine.registry.set(id) !== void 0;
+  const hostReady = (id) => sampleReady(id) || engine.registry.sound(id) === void 0 && engine.registry.set(id) !== void 0;
   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 };
@@ -2322,6 +2328,11 @@ function createWeaponAudio(volume = 0.6, options = {}) {
       options.onCasing?.(sound3, "sample");
       return;
     }
+    if (recorded && fittedReady(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, "fitted");
+      return;
+    }
     for (const voice of sound3.voices) playCasingVoice(voice);
     options.onCasing?.(sound3, "synth");
   };
@@ -2346,7 +2357,9 @@ function createWeaponAudio(volume = 0.6, options = {}) {
         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 sample = shot.audible && sampleReady(recorded);
+        const fitted = shot.audible && !sample && fittedReady(recorded);
+        if (sample || fitted) {
           const occlusion = Math.min(1, Math.max(0, extras.occlusion ?? 0));
           const handle = channel.play(recorded, {
             volume: (extras.volume ?? 1) * (1 - 0.5 * occlusion),
@@ -2359,7 +2372,7 @@ function createWeaponAudio(volume = 0.6, options = {}) {
             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 });
+          options.onGunshot?.(shot, { ...base, take, pitch }, fitted ? { kind: "fitted", id: recorded } : { kind: "sample", id: recorded, layers });
           return;
         }
         for (const voice of shot.voices) playGunshotVoice(voice, extras);
@@ -2380,10 +2393,11 @@ function createWeaponAudio(volume = 0.6, options = {}) {
     mechanical,
     cue(id, profile, lead = 0) {
       const carriedBy = CUES_IN_SAMPLE[id];
-      if (carriedBy && sampleReady(carriedBy)) return "carried";
-      if (sampleReady(id)) {
+      if (carriedBy && (sampleReady(carriedBy) || fittedReady(carriedBy))) return "carried";
+      const recorded = sampleReady(id);
+      if (recorded || fittedReady(id)) {
         channel.play(id, { intensity: WEIGHT_INTENSITY[(profile ?? DEFAULT_SOUND_PROFILE).weight] });
-        return "sample";
+        return recorded ? "sample" : "fitted";
       }
       for (const entry of reloadCueSteps(id, profile, cueTable)) step(lead > 0 ? { ...entry, at: entry.at + lead } : entry);
       return "synth";
@@ -2410,7 +2424,12 @@ function createWeaponAudio(volume = 0.6, options = {}) {
     casing,
     flyby(input) {
       const sound3 = computeFlyby({ ...input, pitch: input.pitch ?? 1 + (channel.random() * 2 - 1) * 0.05 });
-      for (const voice of sound3?.voices ?? []) playCasingVoice(voice, input.position);
+      if (!sound3) return;
+      if (hostReady(sound3.sample)) {
+        channel.play(sound3.sample, { volume: Math.min(1, 1 / (1 + input.miss / 1.5)), ...input.position ? { position: [input.position[0], input.position[1], input.position[2]] } : {} });
+        return;
+      }
+      for (const voice of sound3.voices) playCasingVoice(voice, input.position);
     },
     clink() {
       if (options.shotModel !== "game") {
@@ -2421,8 +2440,13 @@ function createWeaponAudio(volume = 0.6, options = {}) {
       const at = 0.25 + channel.random() * 0.2;
       sceneTone({ layer: "scene_tone", at, wave: "sine", f, f2: 3800, d: 0.06, vol: 0.06 });
     },
-    thud() {
-      burst({ seconds: 0.09, gain: 0.35, filter: "lowpass", frequency: 380 });
+    thud(input = {}) {
+      const id = magazineDropId(input.surface);
+      if (hostReady(id)) {
+        if ((input.bounce ?? 0) === 0) channel.play(id, { volume: Math.min(1, Math.max(0.2, (input.speed ?? 1.5) / 2.5)) });
+        return;
+      }
+      burst({ seconds: 0.09, gain: 0.35 * (input.speed === void 0 ? 1 : Math.min(1, Math.max(0.3, input.speed / 2.5))) * ((input.bounce ?? 0) === 0 ? 1 : 0.5), filter: "lowpass", frequency: 380 });
     },
     setVolume(next) {
       const level = Math.max(0, Math.min(1, next));
@@ -8393,10 +8417,13 @@ function createViewmodel(options) {
   const distance = () => options.soundDistance?.() ?? 0;
   const particles = createParticles(THREE, scene, groundAt, options.particleLimit);
   particles.onBounce = (kind, hit) => {
-    if (kind === "magazine") audio?.thud();
-    if (kind !== "casing" || !audio) return;
-    const caseType = hit?.object.userData["caseType"];
+    if (!audio || kind !== "casing" && kind !== "magazine") return;
     const surface = hit ? options.surfaceAt?.(hit.object.position.x, hit.object.position.z) : void 0;
+    if (kind === "magazine") {
+      audio.thud({ ...surface ? { surface } : {}, ...hit ? { speed: hit.speed, bounce: hit.bounce } : {} });
+      return;
+    }
+    const caseType = hit?.object.userData["caseType"];
     audio.casing({ ...caseType ? { caseType } : {}, ...surface ? { surface } : {}, ...hit ? { speed: hit.speed, bounce: hit.bounce } : {} });
   };
   if (!options.effects) warnOnce2("game-weapons-three.own-effects-world", "game-weapons-three made an effects world of its own because the host lent none (options.effects); pass the host effects so the effects share one budget");
@@ -9858,6 +9885,7 @@ var TEXT = {
     reloadClip: "Reload of {weapon}: {kind}, clip {clip} ({seconds} s)",
     soundCue: "Sound: {cue} ({weapon})",
     cueRecorded: " \xB7 recorded",
+    cueFitted: " \xB7 fitted copy of the recording",
     cueCarried: " \xB7 inside the next recording",
     gunshotSound: "Shot sound: {profile}, take {take}/4, pitch {pitch}, {space}, {distance} m{far}",
     gunshotRecorded: " \xB7 recorded take {takes}",
@@ -9893,6 +9921,7 @@ var TEXT = {
     reloadClip: "Recarga de {weapon}: {kind}, clipe {clip} ({seconds} s)",
     soundCue: "Som: {cue} ({weapon})",
     cueRecorded: " \xB7 grava\xE7\xE3o",
+    cueFitted: " \xB7 c\xF3pia medida da 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}",
@@ -10107,20 +10136,20 @@ function createWeaponsTestModule(options = {}) {
           engine: lentEngine,
           ...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(", ") }) : "";
+            const recorded = played.kind === "sample" && played.layers.length > 0 ? fill(text.gunshotRecorded, { takes: played.layers.map((layer) => `${layer.role} ${layer.take + 1}`).join(", ") }) : played.kind === "fitted" ? text.cueFitted : "";
             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")
+          onCasing: (sound3, played) => lent.log(fill(text.casingSound, { case: sound3.kind, surface: text.surfaces[sound3.surface] }) + (played === "sample" ? text.cueRecorded : played === "fitted" ? text.cueFitted : ""), { 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, 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"),
+        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 === "fitted" ? text.cueFitted : 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,
@@ -10170,6 +10199,7 @@ function createWeaponsTestModule(options = {}) {
       const offEvents = lent.on((event) => {
         worldEffects.handle(event, lent.effects);
         if (event.type === "explosion") {
+          if (lentEngine) return;
           const away = Math.hypot(event.point[0] - camera.position.x, event.point[1] - camera.position.y, event.point[2] - camera.position.z);
           ownAudio()?.play("explosion", Math.min(1, EXPLOSION_VOLUME_BASE + event.radius * EXPLOSION_VOLUME_PER_METRE), away);
           return;
@@ -11299,4 +11329,4 @@ export {
   DEFAULT_EXPLOSIVES_SCENE,
   createExplosivesTestModule
 };
-//# sourceMappingURL=chunk-GBO6L7CQ.js.map
+//# sourceMappingURL=chunk-KWJQO6JS.js.map