@adatechnology/game-weapons-three 0.16.0 → 0.17.1

package/dist/index.global.js

@@ -44,6 +44,8 @@ var GameWeaponsThree = (() => {
     P13_VALVE_MESH: () => P13_VALVE_MESH,
     RELOAD_SAMPLE: () => RELOAD_SAMPLE,
     RELOAD_SAMPLE_HITS: () => RELOAD_SAMPLE_HITS,
+    VIEW_HOLD: () => VIEW_HOLD,
+    VIEW_MOTION: () => VIEW_MOTION,
     WEAPON_ITEM_PREFIX: () => WEAPON_ITEM_PREFIX,
     WEAPON_THUMBNAILS: () => WEAPON_THUMBNAILS,
     WEIGHT_INTENSITY: () => WEIGHT_INTENSITY,
@@ -91,6 +93,7 @@ var GameWeaponsThree = (() => {
     registerWeaponItemModel: () => registerWeaponItemModel,
     rigStock: () => rigStock,
     rigUnderbarrel: () => rigUnderbarrel,
+    toWorldLens: () => toWorldLens,
     weaponProp: () => weaponProp,
     weaponSampleBank: () => weaponSampleBank,
     weaponSampleDefaults: () => weaponSampleDefaults,
@@ -165,6 +168,7 @@ var GameWeaponsThree = (() => {
     const flame = flameBase * (1 - rules.flameFillInfluence * (1 - k));
     return 1 - (1 - Math.min(1, Math.max(0, spark))) * (1 - Math.min(1, Math.max(0, flame)));
   };
+  var FIRST_PERSON_LAYER = 9;
   var TOOL_CLIP = {
     DRAW: "draw",
     SHOT: "shot",
@@ -12148,7 +12152,9 @@ var GameWeaponsThree = (() => {
       dimensions: {
         length: 0.801,
         barrel: 0.559,
-        emptyMass: 39
+        emptyMass: 39,
+        barrels: 6,
+        barrelMass: 2
       },
       archetype: "rifle_7_62x39",
       sources: [
@@ -13128,19 +13134,41 @@ var GameWeaponsThree = (() => {
     }
   };
   var DEFAULT_HEAT = {
-    cap: 140,
-    displayMax: 120,
-    decayBase: 1.6,
-    decayPerPoint: 0.03,
-    faultFrom: 60,
-    faultSpan: 40,
-    perShot: { shell: 3, big: 6, tiny: 0.5, pistol: 1.2, rifle: 2 },
+    cap: 900,
+    displayMax: 750,
+    faultFrom: 350,
+    faultSpan: 200,
+    specificHeat: 490,
+    barrelShare: { shell: 0.48, big: 0.48, tiny: 0.3, pistol: 0.3, rifle: 0.48 },
+    barrelKilogramsPerMetre: {
+      pistol: 1,
+      revolver: 1.4,
+      smg: 1.2,
+      carbine: 1.6,
+      rifle: 1.6,
+      dmr: 2.4,
+      sniper: 2.4,
+      hunting: 2.4,
+      machine_gun: 3,
+      shotgun: 1.1
+    },
+    barrelFallback: { metres: 0.4, kilogramsPerMetre: 1.6 },
+    cooling: { baseSeconds: 30, secondsPerKilogram: 250 },
     perRocket: 35,
-    visual: { smokeFrom: 70, smokeSeconds: 2.5, glowFrom: 80, glowSpan: 40 }
+    visual: { smokeFrom: 250, smokeSpan: 300, smokeSeconds: 2.5, glowFrom: 450, glowSpan: 300 }
   };
   var GALLERY_HEAT = {
     ...DEFAULT_HEAT,
-    perShot: { shell: 6, big: 9, tiny: 1.2, pistol: 3, rifle: 4.5 }
+    cap: 140,
+    displayMax: 120,
+    faultFrom: 60,
+    faultSpan: 40,
+    visual: { smokeFrom: 70, smokeSpan: 100, smokeSeconds: 2.5, glowFrom: 80, glowSpan: 40 },
+    gallery: {
+      perShot: { shell: 6, big: 9, tiny: 1.2, pistol: 3, rifle: 4.5 },
+      decayBase: 1.6,
+      decayPerPoint: 0.03
+    }
   };
   var defaultFaultChance = (context) => {
     const factor = context.def.action.kind === "firearm" ? context.def.action.faultFactor ?? 1 : 1;
@@ -13423,17 +13451,76 @@ var GameWeaponsThree = (() => {
       ...explosive.stunSeconds !== void 0 ? { stunSeconds: explosive.stunSeconds } : {}
     };
   };
+  var EPS2 = 1e-9;
+  var MANUAL_MODES = /* @__PURE__ */ new Set(["pump", "bolt", "lever"]);
+  var weaponSpeed = (action, caliber) => action.muzzleSpeed ?? caliber.muzzleSpeed * (action.barrel ?? 1);
+  var weaponNoise = (action, caliber) => action.noise ?? caliber.noise ?? 0;
+  var timingsOf = (action) => "timings" in action ? action.timings : void 0;
+  var drawSeconds = (action, rules) => timingsOf(action)?.draw ?? rules.draw;
+  var clearSeconds = (action, rules) => timingsOf(action)?.clear ?? rules.clear;
+  var manualCycleSeconds = (action, mode) => MANUAL_MODES.has(mode) ? action.timings?.cycle ?? 0 : 0;
+  var planRounds = (action, mode, ammo, firstAt, frameEnd) => {
+    const interval = 60 / action.rpm;
+    const times = [];
+    if (mode === "auto") {
+      for (let t = firstAt; times.length < ammo && (times.length === 0 ? t <= frameEnd + EPS2 : t < frameEnd - EPS2); t += interval) times.push(t);
+      return times;
+    }
+    if (mode === "burst") {
+      const count = Math.min(action.burst ?? 3, ammo);
+      for (let k = 0; k < count; k++) times.push(firstAt + k * interval);
+      return times;
+    }
+    if (mode === "volley") return Array.from({ length: Math.min(action.magazine, ammo) }, () => firstAt);
+    return [firstAt];
+  };
   var SUBSTEP_SECONDS = 1 / 60;
-  var decayHeat = (heat, seconds, rules) => {
+  var MAX_ROUNDS_SEARCHED = 1e5;
+  var barrelMassOf = (def, rules) => {
+    const dimensions = def.dimensions;
+    const kilogramsPerMetre = rules.barrelKilogramsPerMetre[def.category] ?? rules.barrelFallback.kilogramsPerMetre;
+    const single = dimensions?.barrelMass ?? (dimensions?.barrel ?? rules.barrelFallback.metres) * kilogramsPerMetre;
+    return single * (dimensions?.barrels ?? 1);
+  };
+  var coolingTimeConstant = (barrelMass, rules) => rules.cooling.baseSeconds + rules.cooling.secondsPerKilogram * barrelMass;
+  var decayHeat = (heat, seconds, barrelMass, rules) => {
+    if (heat <= 0) return 0;
+    if (rules.gallery) return decayGallery(heat, seconds, rules.gallery);
+    return heat * Math.exp(-seconds / coolingTimeConstant(barrelMass, rules));
+  };
+  var decayGallery = (heat, seconds, gallery) => {
     const steps = Math.max(1, Math.ceil(seconds / SUBSTEP_SECONDS - 1e-9));
     const step = seconds / steps;
     let current = heat;
-    for (let i = 0; i < steps && current > 0; i++) current = Math.max(0, current - step * (rules.decayBase + current * rules.decayPerPoint));
+    for (let i = 0; i < steps && current > 0; i++) current = Math.max(0, current - step * (gallery.decayBase + current * gallery.decayPerPoint));
     return current;
   };
-  var heatPerRound = (action, caliber, rules) => {
+  var heatPerRound = ({ action, caliber, energy, barrelMass, rules }) => {
     if (action.kind === "launcher") return rules.perRocket;
-    return caliber?.caseType ? rules.perShot[caliber.caseType] : 0;
+    const caseType = caliber?.caseType;
+    if (!caseType) return 0;
+    if (rules.gallery) return rules.gallery.perShot[caseType];
+    return rules.barrelShare[caseType] * energy / (barrelMass * rules.specificHeat);
+  };
+  var roundsToWarning = ({ def, caliber, energy, rpm, rules }) => {
+    if (def.action.kind !== "firearm" || rpm <= 0) return Infinity;
+    const barrelMass = barrelMassOf(def, rules);
+    const perRound = heatPerRound({ action: def.action, caliber, energy: energy * (caliber.pellets ?? 1), barrelMass, rules });
+    const interval = 60 / rpm;
+    let heat = 0;
+    for (let round5 = 1; round5 <= MAX_ROUNDS_SEARCHED; round5++) {
+      heat = decayHeat(heat, round5 === 1 ? 0 : interval, barrelMass, rules) + perRound;
+      if (heat >= rules.faultFrom) return round5;
+    }
+    return Infinity;
+  };
+  var roundsToWarningOf = (arsenal, weaponId) => {
+    const def = arsenal.weapons.get(weaponId);
+    if (!def || def.action.kind !== "firearm") return Infinity;
+    const caliber = arsenal.calibers.get(def.action.caliber);
+    if (!caliber) return Infinity;
+    const energy = 0.5 * (caliber.bulletGrams / 1e3) * weaponSpeed(def.action, caliber) ** 2;
+    return roundsToWarning({ def, caliber, energy, rpm: def.action.rpm, rules: arsenal.rules.heat });
   };
   var burstNoise = (base, recentShots, rules) => base * (1 + Math.min(rules.cap, rules.step * recentShots));
   var magazineOut = { stage: "magazine_out", at: 0 };
@@ -13560,29 +13647,6 @@ var GameWeaponsThree = (() => {
     return roll2.ammoQuality.faultChance > 0 && roll2.random() < roll2.ammoQuality.faultChance ? "misfire" : null;
   };
   var isDudWithoutJam = (action, fault) => fault === "misfire" && action.kind === "firearm" && MISFIRE_ONLY.has(action.family);
-  var EPS2 = 1e-9;
-  var MANUAL_MODES = /* @__PURE__ */ new Set(["pump", "bolt", "lever"]);
-  var weaponSpeed = (action, caliber) => action.muzzleSpeed ?? caliber.muzzleSpeed * (action.barrel ?? 1);
-  var weaponNoise = (action, caliber) => action.noise ?? caliber.noise ?? 0;
-  var timingsOf = (action) => "timings" in action ? action.timings : void 0;
-  var drawSeconds = (action, rules) => timingsOf(action)?.draw ?? rules.draw;
-  var clearSeconds = (action, rules) => timingsOf(action)?.clear ?? rules.clear;
-  var manualCycleSeconds = (action, mode) => MANUAL_MODES.has(mode) ? action.timings?.cycle ?? 0 : 0;
-  var planRounds = (action, mode, ammo, firstAt, frameEnd) => {
-    const interval = 60 / action.rpm;
-    const times = [];
-    if (mode === "auto") {
-      for (let t = firstAt; times.length < ammo && (times.length === 0 ? t <= frameEnd + EPS2 : t < frameEnd - EPS2); t += interval) times.push(t);
-      return times;
-    }
-    if (mode === "burst") {
-      const count = Math.min(action.burst ?? 3, ammo);
-      for (let k = 0; k < count; k++) times.push(firstAt + k * interval);
-      return times;
-    }
-    if (mode === "volley") return Array.from({ length: Math.min(action.magazine, ammo) }, () => firstAt);
-    return [firstAt];
-  };
   var activeParts = (fitted, catalogue) => fitted.flatMap((part) => {
     const def = catalogue.get(part.id);
     const isOn = def?.kind !== "light" && def?.kind !== "laser" ? true : part.on === true;
@@ -13815,6 +13879,10 @@ var GameWeaponsThree = (() => {
     get safety() {
       return this._safety;
     }
+    /** Kg of steel that heat up with the shots. */
+    get barrelMass() {
+      return barrelMassOf(this.def, this.rules.heat);
+    }
     get heat() {
       return this._heat;
     }
@@ -13867,7 +13935,7 @@ var GameWeaponsThree = (() => {
     }
     advance(seconds) {
       if (seconds <= 0) return;
-      this._heat = decayHeat(this._heat, seconds, this.rules.heat);
+      this._heat = decayHeat(this._heat, seconds, this.barrelMass, this.rules.heat);
       this.clock += seconds;
     }
     /** Complete what falls at or before `t`: scheduled events and the reload steps. */
@@ -14419,7 +14487,7 @@ var GameWeaponsThree = (() => {
         res.shots.push(shot);
       }
       this._ammo -= 1;
-      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound(a, cal, this.rules.heat) * this.load.heatFactor);
+      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound({ action: a, caliber: cal, energy: energy * pellets, barrelMass: this.barrelMass, rules: this.rules.heat }) * this.load.heatFactor);
       this.readyAt = t + 60 / a.rpm;
       this.extra = Math.min(bloomNow + (a.bloomDeg ?? 0), a.spreadDeg * (BLOOM_CAP - 1));
       this.extraClock = t;
@@ -14508,7 +14576,7 @@ var GameWeaponsThree = (() => {
       }
       const t = Math.max(start, this.readyAt);
       this._ammo -= 1;
-      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound(a, null, this.rules.heat));
+      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound({ action: a, caliber: null, energy: 0, barrelMass: this.barrelMass, rules: this.rules.heat }));
       this.emit({ type: "shot", shots: 0, rounds: 1, mode: this.mode, at: t });
       return result("ok", { uses: launcherUses(a, this.explosive, origin, dir), recoil: [a.recoil[0], a.recoil[1]], noise: a.noise ?? 0, rounds: 1, roundTimes: [t - start] });
     }
@@ -37549,6 +37617,9 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
       signature = "";
     });
     return {
+      get aimProgress() {
+        return aimProgress;
+      },
       handleChange(change) {
         if (change.kind === "action") return act(change.id);
         if (change.kind === "control" && change.id === SUPPORTED_CONTROL_ID && typeof change.value === "boolean") {
@@ -43589,6 +43660,8 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     shoulderGripTo: 0.34,
     /** The farthest apart two hands hold a long gun (a support hand past it slides back along the gun, toward the grip). */
     supportSpan: 0.5,
+    /** A gun carried at the hip (`carry: 'hip'`): its rear grip low at the right hip, a little ahead of it. */
+    hipGrip: [0.25, -0.5, -0.24],
     /** How much of the aim's pitch a tool held low in one hand follows. */
     toolPitch: 0.5
   };
@@ -43600,6 +43673,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     holder.scale.setScalar(1);
     hand.position.set(...frame2.position);
     hand.quaternion.set(...frame2.quaternion);
+    if (placement.hip) return placeAtHip(placement);
     const shouldered = !placement.handgun && placement.left !== null && placement.lengthMetres >= BODY_HOLD.shoulderedFrom;
     if (shouldered) {
       holder.position.set(0, BODY_HOLD.boreAbove, placement.rear);
@@ -43623,6 +43697,21 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     hand.position.add(want.sub(now));
     hand.updateMatrixWorld(true);
   };
+  var placeAtHip = (placement) => {
+    const { THREE, hand, holder } = placement;
+    scratch.a ?? (scratch.a = new THREE.Vector3());
+    scratch.b ?? (scratch.b = new THREE.Vector3());
+    scratch.euler ?? (scratch.euler = new THREE.Euler());
+    const turn2 = scratch.euler.setFromQuaternion(hand.quaternion, "YXZ");
+    hand.quaternion.setFromEuler(turn2.set(turn2.x * BODY_HOLD.toolPitch, turn2.y, 0, "YXZ"));
+    holder.position.set(0, 0, 0);
+    hand.updateMatrixWorld(true);
+    if (!placement.right) return;
+    const want = scratch.a.set(...BODY_HOLD.hipGrip).applyQuaternion(hand.quaternion).add(hand.position);
+    const now = placement.right.part.localToWorld(scratch.b.copy(placement.right.offset));
+    hand.position.add(want.sub(now));
+    hand.updateMatrixWorld(true);
+  };
   var limitSupportSpan = (targets) => {
     const right = targets.R?.position;
     const left = targets.L?.position;
@@ -43646,6 +43735,57 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     };
   };
 
+  // src/fx/view-hold.ts
+  var VIEW_HOLD = {
+    long: { grip: [0.2, -0.28, -0.38], fov: 84, sights: { distance: 0.34, fromRear: 0.3 } },
+    handgun: { grip: [0.13, -0.15, -0.33], fov: 76, sights: { distance: 0.42, fromRear: 0.02 } },
+    launcher: { grip: [0.2, -0.14, -0.3], fov: 84, sights: { distance: 0.18, fromRear: 0.25 } },
+    tool: { grip: [0.21, -0.31, -0.36], fov: 84, sights: { distance: 0.3, fromRear: 0.1 }, tilt: 0.3 },
+    // the gun at the hip, its rear grip low and to the right, the barrels ahead of the body; it has no sights to bring to the eye
+    hip: { grip: [0.44, -0.32, -0.42], fov: 84, sights: { distance: 0.6, fromRear: 0.1 } }
+  };
+  var NO_GRIP_REAR = [0.2, -0.24, -0.12];
+  var SIGHT_UNDER_EYE = 0.02;
+  var scratch2 = { grip: null, hip: null, aimed: null, tilt: null };
+  var ease = (k) => k * k * (3 - 2 * k);
+  function placeInView(placement) {
+    const { THREE, hand, holder, camera: camera2, right, box: box5, kind } = placement;
+    const hold = VIEW_HOLD[kind];
+    holder.scale.setScalar(1);
+    hand.position.copy(camera2.position);
+    hand.quaternion.copy(camera2.quaternion);
+    if (hold.tilt) {
+      scratch2.tilt ?? (scratch2.tilt = new THREE.Quaternion());
+      hand.quaternion.multiply(scratch2.tilt.setFromAxisAngle(new THREE.Vector3(1, 0, 0), hold.tilt));
+    }
+    hand.scale.setScalar(1);
+    holder.position.set(0, 0, 0);
+    hand.updateMatrixWorld(true);
+    scratch2.hip ?? (scratch2.hip = new THREE.Vector3());
+    const hip = scratch2.hip;
+    if (right) {
+      scratch2.grip ?? (scratch2.grip = new THREE.Vector3());
+      const grip = hand.worldToLocal(right.part.localToWorld(scratch2.grip.copy(right.offset)));
+      hip.set(hold.grip[0] - grip.x, hold.grip[1] - grip.y, hold.grip[2] - grip.z);
+    } else hip.set(NO_GRIP_REAR[0], NO_GRIP_REAR[1], NO_GRIP_REAR[2] + box5.min.x);
+    const k = ease(Math.max(0, Math.min(1, placement.aim)));
+    if (k > 0) {
+      const along = box5.min.x + hold.sights.fromRear;
+      scratch2.aimed ?? (scratch2.aimed = new THREE.Vector3());
+      hip.lerp(scratch2.aimed.set(0, -SIGHT_UNDER_EYE - box5.max.y, along - hold.sights.distance), k);
+    }
+    holder.position.copy(hip).add(placement.offset);
+    hand.updateMatrixWorld(true);
+  }
+  function toWorldLens(camera2, point, worldFov, lensFov) {
+    const k = Math.tan(worldFov * Math.PI / 360) / Math.tan(lensFov * Math.PI / 360);
+    camera2.updateMatrixWorld();
+    camera2.worldToLocal(point);
+    point.x *= k;
+    point.y *= k;
+    return camera2.localToWorld(point);
+  }
+
   // src/fx/hand-hold.ts
   var HAND_HOLD = {
     /** Half the width of a pistol grip, the palm sits this far (plus the palm) off its middle. */
@@ -43724,6 +43864,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     const toRoot = (x, y, z) => V(THREE, inner.position.x + x * inner.scale.x, y, z);
     const handgun = parts.family === "pistol" || parts.family === "revolver";
     root.updateWorldMatrix(true, true);
+    if (parts.holdRight || parts.holdLeft) return namedHold(THREE, model, holderScale);
     let gripAt;
     let up;
     if (parts.grip) {
@@ -43770,6 +43911,18 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
       gripLeft: HAND_HOLD.forend
     };
   }
+  function namedHold(THREE, model, holderScale) {
+    const { parts } = model;
+    const on = (mark, fingers) => mark ? { part: mark, offset: V(THREE, 0, HAND_HOLD.palm, 0), quaternion: handFrame(THREE, fingers, V(THREE, 0, 1, 0)) } : null;
+    return {
+      right: on(parts.holdRight, V(THREE, 1, 0, 0)),
+      left: on(parts.holdLeft, V(THREE, 0, 0, 1)),
+      leftMagazine: null,
+      scale: holderScale,
+      grip: HAND_HOLD.closed,
+      gripLeft: HAND_HOLD.closed
+    };
+  }
   function holdOfProp(THREE, group, category, scale) {
     const handle = group.getObjectByName("handle") ?? group.getObjectByName("body") ?? group;
     const head = group.getObjectByName("head");
@@ -51237,6 +51390,15 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     const q2 = new THREE.Quaternion();
     const pointForward = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), Math.PI / 2);
     const frontOf = new THREE.Vector3();
+    const restBox = new THREE.Box3();
+    const noMotion = new THREE.Vector3();
+    let inLens = false;
+    const setLens = (on) => {
+      if (on !== inLens) options.viewmodelFov?.(on ? VIEW_HOLD.tool.fov : null);
+      inLens = on;
+      const layer3 = on ? FIRST_PERSON_LAYER : 0;
+      hand.traverse((node) => node.layers.set(layer3));
+    };
     const equip = (weapon) => {
       if (model) hand.remove(model);
       model = null;
@@ -51244,6 +51406,8 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
       def = arsenal.weapons.get(weapon) ?? null;
       if (!def || BODY_ACTIONS.has(def.id)) return;
       model = buildWeaponModel(THREE, def, options.items);
+      restBox.setFromObject(model);
+      inLens = false;
       const length2 = new THREE.Box3().setFromObject(model).getSize(v).x;
       rear = new THREE.Box3().setFromObject(model).min.x;
       lengthMetres = length2;
@@ -51344,6 +51508,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     return {
       unequip() {
         if (model) hand.remove(model);
+        if (inLens) setLens(false);
         model = null;
         inHand = null;
         hold = null;
@@ -51352,6 +51517,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
         if (!model || !def || !SPOUTS.has(def.action.kind)) return null;
         hand.updateMatrixWorld(true);
         const at3 = model.localToWorld(v.copy(frontOf));
+        if (inLens) toWorldLens(camera2, at3, camera2.fov ?? 72, VIEW_HOLD.tool.fov);
         const along = v2.set(1, 0, 0).applyQuaternion(model.getWorldQuaternion(q2)).normalize();
         return { position: [at3.x, at3.y, at3.z], direction: [along.x, along.y, along.z], drawsFlash: false };
       },
@@ -51374,7 +51540,13 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
       update(dt) {
         kick *= Math.exp(-dt * 14);
         dip += ((reloading ? 1 : 0) - dip) * Math.min(1, dt * 8);
-        if (inHand && model) {
+        if (inHand && model && options.firstPerson?.()) {
+          setLens(true);
+          placeInView({ THREE, hand, holder: model, camera: camera2, right: hold?.right ?? null, box: restBox, kind: "tool", aim: 0, offset: noMotion });
+          hand.position.add(v.set(0, -0.12 * dip, 0.05 * kick).applyQuaternion(camera2.quaternion));
+          hand.updateMatrixWorld(true);
+        } else if (inHand && model) {
+          if (inLens) setLens(false);
           const handgun = def?.category === "pistol" || def?.category === "revolver";
           placeOnBody({ THREE, hand, holder: model, frame: options.bodyHold?.() ?? eyeFrame(), rear, lengthMetres, handgun, right: hold?.right ?? null, left: hold?.left ?? null });
           hand.position.add(v.set(0, -0.12 * dip, 0.05 * kick).applyQuaternion(camera2.quaternion));
@@ -53915,6 +54087,9 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
       cylinderZ(group, 0.016, 0.07, M.poly, 0.06, -0.01, side * 0.2, 14);
     }
     parts.trigger = box5(group, 0.012, 0.02, 0.016, M.dark, 0.1, 0.085, 0.14, 0.3);
+    parts.holdRight = kit.mark(group, 0.06, 6e-3, 0.2);
+    parts.holdLeft = kit.mark(group, 0.22, 0.164, 0);
+    parts.carry = "hip";
     parts.safety = box5(group, 0.014, 6e-3, 0.01, M.dark, 0.2, 0.073, -0.076, 0.4);
   }
   function buildFeed(kit, parts, group) {
@@ -54346,7 +54521,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
   var ROOT = "root";
   var AXIS_INDEX = { x: 0, y: 1, z: 2 };
   var EASE_STEPS = 10;
-  var ease = (progress) => progress < 0.5 ? 2 * progress * progress : 1 - (-2 * progress + 2) ** 2 / 2;
+  var ease2 = (progress) => progress < 0.5 ? 2 * progress * progress : 1 - (-2 * progress + 2) ** 2 / 2;
   var move = (part, axis2, start, duration, from, to) => ({ part, channel: "position", axis: axis2, start, duration, from, to });
   var turn = (part, axis2, start, duration, from, to) => ({ part, channel: "rotation", axis: axis2, start, duration, from, to });
   var cue = (t, type, data) => ({ t, type, ...data ? { data } : {} });
@@ -54360,7 +54535,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     for (const tween of tweens) {
       if (tween.start > t || tween.duration === 0 && (tween.start === t ? !includeInstants : false)) continue;
       if (tween.duration === 0 || t >= tween.start + tween.duration) value = tween.to;
-      else value = tween.from + (tween.to - tween.from) * ease((t - tween.start) / tween.duration);
+      else value = tween.from + (tween.to - tween.from) * ease2((t - tween.start) / tween.duration);
     }
     return value;
   };
@@ -57287,7 +57462,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
   var round4 = call("round");
   var clamp3 = call("clamp");
   var lerp2 = call("lerp");
-  var ease2 = call("ease");
+  var ease3 = call("ease");
   var lt = call("lt");
   var gt = call("gt");
   var le = call("le");
@@ -60972,7 +61147,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
     const { core, def, random, x, y, z } = context;
     const mark = def.mark;
     const keepsMarks = !core.marklessAt?.(x, z);
-    if (keepsMarks && mark.crater && mark.dent && y < 1.2) {
+    if (keepsMarks && mark.crater && mark.dent && y < 1.2 && (core.cratersAt?.(x, z) ?? true)) {
       core.emit({ type: "crater", x, z, radius: mark.crater, depth: mark.dent });
       core.trace?.crater?.(x, z, mark.crater, mark.dent);
       addCrater(core.marks, core.ground, random, { x, z, radius: mark.crater, depth: mark.dent, marks: core.layers.mark });
@@ -62730,6 +62905,7 @@ uniform mat4 uNodes[${nodes.length}]; attribute float aNodeIndex; attribute vec3
       clock: { time: 0, lastBlast: -1, lod: 1, forcedLod: null },
       groundAt,
       ...options.marklessAt ? { marklessAt: options.marklessAt } : {},
+      ...options.cratersAt ? { cratersAt: options.cratersAt } : {},
       emit: (request) => options.onRequest?.(request)
     };
     function definitionOf(id) {
@@ -64419,38 +64595,6 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     };
   }
 
-  // src/fx/view-hold.ts
-  var VIEW_HOLD = {
-    /** The right hand's grip, from the eye. */
-    grip: [0.2, -0.2, -0.3],
-    /** A handgun's grip: higher and nearer the middle, the arms out in front. */
-    handgunGrip: [0.13, -0.15, -0.33],
-    /** A rocket launcher's grip: its tube rides on the shoulder, so the hands are higher. */
-    launcherGrip: [0.2, -0.14, -0.3],
-    /** A gun with no grip anchor: the rear of its bore, from the eye. */
-    rear: [0.2, -0.24, -0.12]
-  };
-  var scratch2 = { grip: null };
-  function placeInView(placement) {
-    const { THREE, hand, holder, camera: camera2, right } = placement;
-    holder.scale.setScalar(1);
-    hand.position.copy(camera2.position);
-    hand.quaternion.copy(camera2.quaternion);
-    hand.scale.setScalar(1);
-    holder.position.set(0, 0, 0);
-    hand.updateMatrixWorld(true);
-    if (!right) {
-      holder.position.set(VIEW_HOLD.rear[0], VIEW_HOLD.rear[1], VIEW_HOLD.rear[2] + placement.rear);
-      hand.updateMatrixWorld(true);
-      return;
-    }
-    scratch2.grip ?? (scratch2.grip = new THREE.Vector3());
-    const grip = hand.worldToLocal(right.part.localToWorld(scratch2.grip.copy(right.offset)));
-    const [x, y, z] = placement.kind === "handgun" ? VIEW_HOLD.handgunGrip : placement.kind === "launcher" ? VIEW_HOLD.launcherGrip : VIEW_HOLD.grip;
-    holder.position.set(x - grip.x, y - grip.y, z - grip.z);
-    hand.updateMatrixWorld(true);
-  }
-
   // src/fx/heavy.ts
   var PI14 = Math.PI;
   var ROCKET_LIGHT_NAME = "rocket-light";
@@ -64835,11 +64979,12 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       switch (event.type) {
         case "muzzle_flash":
           if (data.at === "ugl") {
-            if (parts.uglMuzzle && world.layers.muzzleFlash) effects.muzzleFlash(positionOf3(parts.uglMuzzle), root.getWorldQuaternion(new THREE.Quaternion()), UGL_FLASH);
+            if (parts.uglMuzzle && world.layers.muzzleFlash) world.afterPose(() => parts.uglMuzzle && effects.muzzleFlash(positionOf3(parts.uglMuzzle), root.getWorldQuaternion(new THREE.Quaternion()), UGL_FLASH));
           } else if (parts.muzzle && world.layers.muzzleFlash && (session.def.action.kind === "firearm" || session.def.action.kind === "launcher")) {
             const profile = muzzleSmokeOf({ caliber: session.caliber, weapon: session.def, suppressed: session.suppressed });
             const size = session.def.action.kind === "launcher" ? 2.2 : FLASH_BY_CASE[session.caseType];
-            effects.muzzleFlash(positionOf3(parts.muzzle), root.getWorldQuaternion(new THREE.Quaternion()), size, profile);
+            const muzzle2 = parts.muzzle;
+            world.afterPose(() => effects.muzzleFlash(positionOf3(muzzle2), root.getWorldQuaternion(new THREE.Quaternion()), size, profile));
           }
           break;
         case "eject_casing":
@@ -65377,7 +65522,9 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
 
   // src/fx/viewmodel.ts
   var PI16 = Math.PI;
-  var HEAT_DISPLAY_MAX_FALLBACK = 120;
+  var HEAT_DISPLAY_MAX_FALLBACK = 750;
+  var SMOKE_WISPS_PER_SECOND = 10;
+  var SMOKE_THICKNESS_GAIN = 1.7;
   var WALL_PULL = { margin: 0.03, max: 1.2, rate: 14, probe: 3 };
   var HAND_IN_VIEW = { floor: -0.88, max: 0.3, rate: 10 };
   var LAUNCH_VOLUME = 0.6;
@@ -65396,6 +65543,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     const held = sinceShot < TRIGGER_FINGER.burstSeconds ? TRIGGER_FINGER.pulled - TRIGGER_FINGER.tremor * (0.5 + 0.5 * Math.sin(sinceShot * 220)) : 0;
     return Math.max(ready + (TRIGGER_FINGER.pulled - ready) * pull, held);
   };
+  var VIEW_MOTION = { sway: 6e-3, swayMax: 0.02, swayRate: 9, bobX: 6e-3, bobY: 8e-3, run: 1.6, fullSpeed: 4, frequency: 3.2 };
   function createViewmodel(options) {
     const { THREE, scene, camera: camera2, arsenal, groundAt, audio } = options;
     const kit = modelKit(THREE);
@@ -65403,6 +65551,11 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     const layers = options.layers ?? createLayers();
     const distance3 = () => options.soundDistance?.() ?? 0;
     const particles = createParticles(THREE, scene, groundAt, options.particleLimit);
+    const spawnParticle = particles.spawn.bind(particles);
+    particles.spawn = (object2, velocity, particleOptions) => {
+      if (lens2) toWorldLens(camera2, object2.position, worldFovOf(), lens2.fov);
+      spawnParticle(object2, velocity, particleOptions);
+    };
     particles.onBounce = (kind, hit) => {
       if (!audio || kind !== "casing" && kind !== "magazine") return;
       const surface = hit ? options.surfaceAt?.(hit.object.position.x, hit.object.position.z) : void 0;
@@ -65415,7 +65568,16 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     };
     if (!options.effects) warnOnce("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");
     const ownVfx = options.effects ? void 0 : createVfxRenderer(THREE, { scene, camera: camera2, vfx: { profile: "medium" }, ...options.lights ? { lights: options.lights } : {} });
-    const effects = createEffects(THREE, options.effects ?? ownVfx, random);
+    const worldSink = options.effects ?? ownVfx;
+    const lensSink = worldSink ? {
+      play: (request) => {
+        if (!lens2 || !request.point) return worldSink.play(request);
+        const at3 = toWorldLens(camera2, lensPoint.set(...request.point), worldFovOf(), lens2.fov);
+        return worldSink.play({ ...request, point: [at3.x, at3.y, at3.z] });
+      },
+      stop: (handle) => worldSink.stop(handle)
+    } : void 0;
+    const effects = createEffects(THREE, lensSink, random);
     const hand = new THREE.Group();
     hand.name = VIEWMODEL_NODE_NAME;
     scene.add(hand);
@@ -65441,6 +65603,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     const rootQuaternion = new THREE.Quaternion();
     const muzzleAt = new THREE.Vector3();
     const muzzleAlong = new THREE.Vector3();
+    const posed = [];
     const world = {
       kit,
       scene,
@@ -65454,13 +65617,17 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
         const played = audio?.cue(cue3, profile, lead);
         options.onSound?.({ weapon, cue: cue3, profile, ...played ? { played } : {} });
       },
-      schedule: (delay, seconds, step, done) => void tasks.push({ delay, seconds, elapsed: 0, step: (progress) => step(ease(progress)), done })
+      afterPose: (emit2) => void posed.push(emit2),
+      schedule: (delay, seconds, step, done) => void tasks.push({ delay, seconds, elapsed: 0, step: (progress) => step(ease2(progress)), done })
     };
     const heatMax = arsenal.rules.heat.displayMax || HEAT_DISPLAY_MAX_FALLBACK;
     const visual = arsenal.rules.heat.visual;
     const hasSuppressor = (parts) => parts.some((part) => arsenal.attachments.get(part.id)?.kind === "suppressor");
     const release = () => {
       if (!session) return;
+      if (lens2) options.viewmodelFov?.(null);
+      lens2 = null;
+      lensLayer = -1;
       session.attachments?.dispose();
       discardObject3D(session.model.root);
       player = null;
@@ -65500,6 +65667,9 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       const modelBox = new THREE.Box3().setFromObject(model.root);
       const length2 = modelBox.getSize(new THREE.Vector3()).x;
       modelRear = modelBox.min.x;
+      restBox.copy(modelBox);
+      lens2 = null;
+      lensLayer = -1;
       holder.add(model.root);
       const caliber = caliberOf(arsenal, def);
       const dims = caliber?.cartridge;
@@ -65562,6 +65732,42 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     let reach = 0;
     let pull = 0;
     let lift = 0;
+    const restBox = new THREE.Box3();
+    let lens2 = null;
+    let lensLayer = -1;
+    const lensPoint = new THREE.Vector3();
+    const worldFovOf = () => camera2.fov ?? 72;
+    const setLens = (kind) => {
+      const fov = kind ? VIEW_HOLD[kind].fov : null;
+      if ((lens2?.fov ?? null) !== fov) options.viewmodelFov?.(fov);
+      lens2 = kind && fov !== null ? { kind, fov } : null;
+      const layer3 = lens2 ? FIRST_PERSON_LAYER : 0;
+      if (layer3 === lensLayer && !lens2) return;
+      lensLayer = layer3;
+      hand.traverse((node) => node.layers.set(layer3));
+    };
+    const motion = { phase: 0, swayX: 0, swayY: 0, lastYaw: Number.NaN, lastPitch: Number.NaN };
+    const motionEuler = new THREE.Euler(0, 0, 0, "YXZ");
+    const motionOffset = new THREE.Vector3();
+    const viewMotion = (dt, aim) => {
+      const moving = options.motion?.() ?? { speed: 0, running: false };
+      const calm = 1 - 0.8 * Math.max(0, Math.min(1, aim));
+      motionEuler.setFromQuaternion(camera2.quaternion, "YXZ");
+      const turnYaw = Number.isNaN(motion.lastYaw) || dt <= 0 ? 0 : Math.atan2(Math.sin(motionEuler.y - motion.lastYaw), Math.cos(motionEuler.y - motion.lastYaw)) / dt;
+      const turnPitch = Number.isNaN(motion.lastPitch) || dt <= 0 ? 0 : (motionEuler.x - motion.lastPitch) / dt;
+      motion.lastYaw = motionEuler.y;
+      motion.lastPitch = motionEuler.x;
+      const follow = Math.min(1, dt * VIEW_MOTION.swayRate);
+      motion.swayX += (Math.max(-VIEW_MOTION.swayMax, Math.min(VIEW_MOTION.swayMax, turnYaw * VIEW_MOTION.sway)) - motion.swayX) * follow;
+      motion.swayY += (Math.max(-VIEW_MOTION.swayMax, Math.min(VIEW_MOTION.swayMax, -turnPitch * VIEW_MOTION.sway)) - motion.swayY) * follow;
+      const stride = Math.min(1, moving.speed / VIEW_MOTION.fullSpeed) * (moving.running ? VIEW_MOTION.run : 1);
+      motion.phase += dt * moving.speed * VIEW_MOTION.frequency;
+      return motionOffset.set(
+        (motion.swayX + Math.sin(motion.phase) * VIEW_MOTION.bobX * stride) * calm,
+        (motion.swayY - Math.abs(Math.cos(motion.phase)) * VIEW_MOTION.bobY * stride) * calm,
+        0
+      );
+    };
     const ahead = new THREE.Vector3();
     const up = new THREE.Vector3();
     const seen = new THREE.Vector3();
@@ -65594,13 +65800,17 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       const family = session.model.parts.family;
       session.holderScale = 1;
       if (options.firstPerson?.()) {
-        placeInView({ THREE, hand, holder, camera: camera2, right: hold?.right ?? null, rear: modelRear, kind: family === "pistol" || family === "revolver" ? "handgun" : family === "rocket" ? "launcher" : "long" });
+        const kind = session.model.parts.carry === "hip" ? "hip" : family === "pistol" || family === "revolver" ? "handgun" : family === "rocket" ? "launcher" : "long";
+        const aim = kind === "hip" ? 0 : options.aim?.() ?? 0;
+        placeInView({ THREE, hand, holder, camera: camera2, right: hold?.right ?? null, box: restBox, kind, aim, offset: viewMotion(dt, aim) });
+        setLens(kind);
         lift = 0;
-        pullFromWall(dt);
+        pull = 0;
         return;
       }
+      setLens(null);
       hand.scale.set(1, 1, 1);
-      placeOnBody({ THREE, hand, holder, frame: options.bodyHold?.() ?? eyeFrame(), rear: modelRear, lengthMetres: session.lengthMetres, handgun: family === "pistol" || family === "revolver", right: hold?.right ?? null, left: hold?.left ?? null });
+      placeOnBody({ THREE, hand, holder, frame: options.bodyHold?.() ?? eyeFrame(), rear: modelRear, lengthMetres: session.lengthMetres, handgun: family === "pistol" || family === "revolver", hip: session.model.parts.carry === "hip", right: hold?.right ?? null, left: hold?.left ?? null });
       hand.updateMatrixWorld(true);
       lift += (liftToKeepInView() - lift) * Math.min(1, dt * HAND_IN_VIEW.rate);
       if (lift > 1e-4) hand.position.addScaledVector(up.set(0, 1, 0).applyQuaternion(camera2.quaternion), lift);
@@ -65676,6 +65886,10 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
         if (session) {
           place(dt);
           player?.update(dt);
+          if (posed.length) {
+            hand.updateMatrixWorld(true);
+            for (const emit2 of posed.splice(0)) emit2();
+          }
           const wantsMagazine = reloading || options.tool?.().reloading === true;
           magazineHand += ((wantsMagazine ? 1 : 0) - magazineHand) * Math.min(1, dt * HAND_HOLD.magRate);
           const tool2 = options.tool?.();
@@ -65691,10 +65905,11 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
           }
           secondsSinceShot += dt;
           if (tool2 && tool2.heat !== void 0 && tool2.heat * heatMax > visual.smokeFrom && secondsSinceShot < visual.smokeSeconds && session.model.parts.muzzle) {
-            smokeDebt += dt * (tool2.heat * heatMax - visual.smokeFrom) * 0.1;
+            const smokeLevel = Math.min(1, (tool2.heat * heatMax - visual.smokeFrom) / visual.smokeSpan);
+            smokeDebt += dt * smokeLevel * SMOKE_WISPS_PER_SECOND;
             while (smokeDebt > 1) {
               smokeDebt -= 1;
-              const k = 0.5 + (tool2.heat * heatMax - visual.smokeFrom) / 60;
+              const k = 0.5 + smokeLevel * SMOKE_THICKNESS_GAIN;
               effects.smoke(worldPositionOf(session, session.model.parts.muzzle, new THREE.Vector3()), new THREE.Vector3((random() - 0.5) * 0.015, 0.07 + random() * 0.08, (random() - 0.5) * 0.015), 4e-3 * k, 1.2 + random() * 0.6, Math.min(0.18, 0.06 + k * 0.04));
             }
           }
@@ -65721,6 +65936,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
         if (!session || !mark) return null;
         hand.updateMatrixWorld(true);
         const at3 = worldPositionOf(session, mark, muzzleAt);
+        if (lens2) toWorldLens(camera2, at3, worldFovOf(), lens2.fov);
         const along = muzzleAlong.set(1, 0, 0).applyQuaternion(session.model.root.getWorldQuaternion(rootQuaternion)).normalize();
         const kind = session.def.action.kind;
         return { position: [at3.x, at3.y, at3.z], direction: [along.x, along.y, along.z], drawsFlash: kind === "firearm" || kind === "launcher" };
@@ -65730,7 +65946,8 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
         hand.updateMatrixWorld(true);
         const targets = targetsOf(THREE, hold, session.model.root.getWorldQuaternion(rootQuaternion), magazineHand, hold.works ? workWeights(hold.works, player?.running ?? []) : void 0);
         const trigger = session.model.parts.trigger;
-        if (trigger) targets.fingers = { index: indexCurl(trigger.rotation.z - triggerRest, clock - lastShot) };
+        if (session.model.parts.carry === "hip") targets.fingers = { index: 1 };
+        else if (trigger) targets.fingers = { index: indexCurl(trigger.rotation.z - triggerRest, clock - lastShot) };
         return limitSupportSpan(targets);
       },
       get inHand() {
@@ -65780,6 +65997,9 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       ...options.contact ? { contact: options.contact } : {},
       ...options.bodyHold ? { bodyHold: options.bodyHold } : {},
       ...options.firstPerson ? { firstPerson: options.firstPerson } : {},
+      ...options.viewmodelFov ? { viewmodelFov: options.viewmodelFov } : {},
+      ...options.aim ? { aim: options.aim } : {},
+      ...options.motion ? { motion: options.motion } : {},
       ...options.effects ? { effects: options.effects } : {},
       ...options.flyRocket === void 0 ? {} : { flyRocket: options.flyRocket },
       ...options.particleLimit ? { particleLimit: options.particleLimit } : {},
@@ -66895,7 +67115,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       fuseLength: "Dynamite fuse length",
       fuseLengthHint: "Metres of safety fuse (131 s per metre): a long one is set down lit, for a delayed trap",
       layers: { muzzle_flash: "Muzzle flash", casings: "Ejected casings", magazines: "Dropped magazines" },
-      metrics: { casings_live: "Casings in the scene", magazines_live: "Magazines in the scene", heat: "Barrel heat" }
+      metrics: { casings_live: "Casings in the scene", magazines_live: "Magazines in the scene", heat: "Barrel temperature above ambient", rounds_to_warning: "Rounds to the heat warning (cyclic rate, from cold)" }
     },
     "pt-BR": {
       group: "Armas",
@@ -66931,7 +67151,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       fuseLength: "Pavio da dinamite",
       fuseLengthHint: "Metros de pavio de seguran\xE7a (131 s por metro): um longo \xE9 posto no ch\xE3o aceso, para armadilha com atraso",
       layers: { muzzle_flash: "Clar\xE3o do cano", casings: "C\xE1psulas ejetadas", magazines: "Pentes que caem" },
-      metrics: { casings_live: "C\xE1psulas na cena", magazines_live: "Pentes na cena", heat: "Calor do cano" }
+      metrics: { casings_live: "C\xE1psulas na cena", magazines_live: "Pentes na cena", heat: "Temperatura do cano acima do ambiente", rounds_to_warning: "Tiros at\xE9 o aviso de calor (cad\xEAncia, a frio)" }
     }
   };
   var textOf = (locale) => TEXT[locale] ?? TEXT.en;
@@ -67055,7 +67275,12 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     let host = null;
     let soundDistance = 0;
     let soundIndoors = false;
-    const heatPercent = () => Math.min(100, (host?.tool().heat ?? 0) * 100);
+    const barrelCelsius = () => (host?.tool().heat ?? 0) * arsenal.rules.heat.displayMax;
+    const roundsToWarning2 = () => {
+      const weaponId = host?.tool().weapon;
+      const rounds = weaponId ? roundsToWarningOf(arsenal, weaponId) : Infinity;
+      return Number.isFinite(rounds) ? rounds : "-";
+    };
     return {
       id: "weapons_area",
       name: text.name,
@@ -67108,7 +67333,8 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       metrics: () => [
         { id: "casings_live", name: text.metrics.casings_live, read: () => fx?.casings ?? 0 },
         { id: "magazines_live", name: text.metrics.magazines_live, read: () => fx?.magazines ?? 0 },
-        { id: "heat", name: text.metrics.heat, unit: "%", max: 100, digits: 0, read: heatPercent },
+        { id: "heat", name: text.metrics.heat, unit: "\xB0C", max: arsenal.rules.heat.displayMax, digits: 0, read: barrelCelsius },
+        { id: "rounds_to_warning", name: text.metrics.rounds_to_warning, read: roundsToWarning2 },
         ...accessoryMetrics(accessoryText, () => host?.tool() ?? EMPTY_TOOL)
       ],
       attach(lent) {
@@ -67151,6 +67377,10 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
           contact: createLaserRaycast(lent.THREE, lent.scene, lent.camera, { now: () => simulatedMs }),
           ...lent.holdFrame ? { bodyHold: () => lent.holdFrame?.() ?? null } : {},
           firstPerson: () => lent.player().cameraMode === "first",
+          // the lens of the gun in first person, how far it is brought to the eye (the right button) and how the body moves (the bob and the sway follow it)
+          ...lent.setViewmodelFov ? { viewmodelFov: (degrees) => lent.setViewmodelFov?.(degrees) } : {},
+          aim: () => accessories.aimProgress,
+          motion: () => ({ speed: lent.player().speed, running: lent.player().running }),
           ...lent.effects ? { effects: lent.effects } : {},
           ...lent.particleLimit ? { particleLimit: lent.particleLimit } : {},
           ...isLightBudget(lent.lights) ? { lights: lent.lights } : {},