@adatechnology/game-test-room 0.12.0 → 0.13.0

package/dist/index.d.ts

@@ -156,6 +156,11 @@ interface HudState {
  * that fits it, such as `createPlayerAvatar` of `@adatechnology/game-characters-three`), and no character code is imported here.
  */
 
+interface RoomAvatarItemUse {
+    readonly id: string;
+    readonly position: readonly [number, number, number];
+    readonly rotation: readonly [number, number, number];
+}
 /** What the room tells the avatar every frame. */
 interface RoomAvatarState {
     /** Ground speed of the player, m/s (from the movement of the feet, jumps ignored). */
@@ -168,6 +173,10 @@ interface RoomAvatarState {
     armed: boolean;
     /** Camera pitch, radians, positive looking up (the room's own convention). */
     pitch: number;
+    /** Whether the player is carrying an item in hand. */
+    holding?: boolean;
+    /** Active scripted item use (`drink`, `sip`, `chug`, `pour`, `open`, `close`, `tilt`). */
+    itemUse?: RoomAvatarItemUse | null;
 }
 /** What the room tells the first-person arms every frame, after the modules have placed the tool in the hands. */
 interface RoomFirstPersonState {
@@ -397,6 +406,10 @@ interface TestRoomOptions {
      * supplies the real model; where it answers nothing the room draws a plain primitive (a sphere, a cylinder, a box).
      */
     projectileModel?: (query: ProjectileQuery) => ProjectileModel | null | undefined;
+    /** Keys (`KeyboardEvent.code`) that crouch while held; default `['KeyC']`. Ctrl is left out on purpose: Ctrl+W closes the tab. */
+    crouch?: {
+        keys?: string[];
+    };
     /** Spawn these catalogue ids on start, in a row in front of the player. */
     initial?: string[];
     /** Open on one catalogue group (`furniture`, `structure`, `weapons`…): see `TestRoom.openArea`. */

package/dist/index.global.js

@@ -4276,13 +4276,14 @@ var GameTestRoom = (() => {
       const crackLen = clamp2(0.03 + ratio * 0.2, 0.03, 0.8);
       let exitPoint;
       if (penetrated) {
-        exitPoint = vec.madd(entry, d, Math.min(pathLen, effM + layersThickness(p.layers, face) / slant + layersThickness(p.layers, -face) / slant));
+        const exitDist = p.spec.contains || p.spec.fill !== void 0 && p.spec.fill < 0.5 || p.thickness < pathLen * 0.5 ? pathLen : Math.min(pathLen, effM + layersThickness(p.layers, face) / slant + layersThickness(p.layers, -face) / slant);
+        exitPoint = vec.madd(entry, d, exitDist);
         const hole = addHole(o, p, entry, n, caliber / 1e3 * (mat.ductility >= 0.3 ? 1 : 1.5), true, exitPoint, src);
         if (p.layers.length > 0) spallOuter(o, p, exitPoint, -face, vec.scale(n, -1), Math.max(0.03, caliber / 1e3 * 4), src);
         addBreach(o, p, entry, Math.PI * (hole.diameter / 2) * (hole.diameter / 2), E, d, src);
         if (mat.ductility >= 0.5 && p.thickness <= THIN_SHEET_DISHING) addDent(o, p, entry, n, Math.max(caliber * 3 / 1e3, 0.012), clamp2(E * 2e-5, 1e-3, 0.03), src);
         if (brittle && mat.fracture === "shatter") addCrack(o, p, entry, n, crackLen, src);
-        if (p.spec.contains && (p.st.liters ?? 0) > 0) {
+        if (p.spec.contains && (p.st.liters ?? 0) > 1e-4) {
           emit2({
             ...base(o, src),
             type: "leak",
@@ -16728,7 +16729,8 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
         depthWrite: false,
         polygonOffset: true,
         polygonOffsetFactor: -4,
-        polygonOffsetUnits: -4
+        polygonOffsetUnits: -4,
+        side: this.THREE.DoubleSide
       }));
     }
     /** Opaque patch in the colour of what shows under a spalled coat. */
@@ -17120,6 +17122,27 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     }
     addHole(mv, worldPoint, worldNormal, diameter) {
       const { s, pos, quat: quat2 } = this.decalPose(mv.mesh, worldPoint, worldNormal, 25e-4);
+      const work = mv.host ? mv.host.work : mv.work;
+      if (work && mv.touched) {
+        const ln = worldNormal.clone().transformDirection(this.m4.copy(mv.mesh.matrixWorld).invert()).normalize();
+        let minDistSq = Infinity;
+        let nearestDisp = 0;
+        const from = mv.range ? mv.range[0] * 3 : 0;
+        const to = mv.range ? mv.range[1] * 3 : work.length;
+        for (let i = from; i < to; i += 3) {
+          const dx = work[i] - pos.x;
+          const dy = work[i + 1] - pos.y;
+          const dz = work[i + 2] - pos.z;
+          const d2 = dx * dx + dy * dy + dz * dz;
+          if (d2 < minDistSq) {
+            minDistSq = d2;
+            nearestDisp = dx * ln.x + dy * ln.y + dz * ln.z;
+          }
+        }
+        if (minDistSq < (0.06 / s) ** 2 && nearestDisp < 0) {
+          pos.addScaledVector(ln, nearestDisp);
+        }
+      }
       const disc = new this.THREE.Mesh(this.kit.discGeometry(), this.kit.discMaterial());
       disc.position.copy(pos);
       disc.quaternion.copy(quat2);
@@ -17589,7 +17612,13 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     gas: 15921906,
     sap: 12098362,
     acid: 10211900,
-    blood: 9046538
+    blood: 9046538,
+    soda: 3808786,
+    coffee: 3875860,
+    beer: 14259516,
+    milk: 16052714,
+    wine: 7016479,
+    juice: 15238923
   };
   var SMOKE_TONES = { white: 15132390, grey: 9079434, black: 2763306 };
   var DEFAULT_SPEED = {
@@ -18114,13 +18143,39 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
         }
         case "leak": {
           const key = `${ev.object}|${ev.part}`;
+          const b = this.bounds.get(ev.object);
+          let localPoint;
+          let localDirection;
+          if (b) {
+            b.root.updateWorldMatrix(true, false);
+            const inv = new this.THREE.Matrix4().copy(b.root.matrixWorld).invert();
+            const lp = this.v1.set(ev.point[0], ev.point[1], ev.point[2]).applyMatrix4(inv);
+            const ld = this.v2.set(ev.direction[0], ev.direction[1], ev.direction[2]).transformDirection(inv).normalize();
+            localPoint = [lp.x, lp.y, lp.z];
+            localDirection = [ld.x, ld.y, ld.z];
+          }
           const same = this.leaks.find((l) => l.object === ev.object && l.part === ev.part && Math.hypot(l.point[0] - ev.point[0], l.point[1] - ev.point[1], l.point[2] - ev.point[2]) < 0.03);
           if (same) {
             same.rate = ev.rate;
             same.direction = ev.direction;
+            if (localPoint) same.localPoint = localPoint;
+            if (localDirection) same.localDirection = localDirection;
           } else {
             if (this.leaks.length >= 24) this.leaks.shift();
-            this.leaks.push({ object: ev.object, part: ev.part, fluid: ev.fluid, point: ev.point, direction: ev.direction, rate: ev.rate, pressurized: ev.pressurized, acc: 0, opened: this.world.part(ev.object, ev.part)?.holes.some((h) => h.through) ?? false });
+            this.leaks.push({
+              object: ev.object,
+              part: ev.part,
+              fluid: ev.fluid,
+              point: ev.point,
+              direction: ev.direction,
+              rate: ev.rate,
+              pressurized: ev.pressurized,
+              acc: 0,
+              opened: this.world.part(ev.object, ev.part)?.holes.some((h) => h.through) ?? false,
+              localPoint,
+              localDirection,
+              life: 0
+            });
           }
           void key;
           break;
@@ -18556,21 +18611,44 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     updateLeaks(dt) {
       for (let i = this.leaks.length - 1; i >= 0; i--) {
         const l = this.leaks[i];
+        const b = this.bounds.get(l.object);
         const ps = this.world.part(l.object, l.part);
-        if (!ps || ps.liters === void 0 || ps.liters <= 0 || l.opened && !ps.holes.some((h) => h.through)) {
+        if (!b || !ps || ps.liters === void 0 || ps.liters <= 1e-4 || l.opened && !ps.holes.some((h) => h.through)) {
           this.leaks.splice(i, 1);
           continue;
         }
+        l.life = (l.life ?? 0) + dt;
+        if (l.pressurized && l.life > 0.8) l.pressurized = false;
+        if (l.lastLiters !== void 0 && Math.abs(ps.liters - l.lastLiters) < 1e-5) {
+          l.idleSeconds = (l.idleSeconds ?? 0) + dt;
+          if (l.idleSeconds > 0.4) {
+            this.leaks.splice(i, 1);
+            continue;
+          }
+        } else {
+          l.idleSeconds = 0;
+          l.lastLiters = ps.liters;
+        }
+        let pt2 = l.point;
+        let dir = l.direction;
+        if (l.localPoint && l.localDirection) {
+          b.root.updateWorldMatrix(true, false);
+          const wp = this.v1.set(l.localPoint[0], l.localPoint[1], l.localPoint[2]).applyMatrix4(b.root.matrixWorld);
+          const wd = this.v2.set(l.localDirection[0], l.localDirection[1], l.localDirection[2]).transformDirection(b.root.matrixWorld).normalize();
+          pt2 = [wp.x, wp.y, wp.z];
+          dir = [wd.x, wd.y, wd.z];
+          l.point = pt2;
+          l.direction = dir;
+        }
         l.acc += clamp6(20 + l.rate * 400, 15, 120) * dt;
         const color = FLUID_COLORS[l.fluid] ?? 11184810;
-        const d = l.direction;
-        const dl = Math.hypot(d[0], d[1], d[2]) || 1;
+        const dl = Math.hypot(dir[0], dir[1], dir[2]) || 1;
         const sp = l.pressurized ? 2.5 + this.rng() * 1.5 : 0.3 + this.rng() * 0.3;
         while (l.acc >= 1) {
           l.acc -= 1;
-          const vel = [d[0] / dl * sp + (this.rng() - 0.5) * 0.25, d[1] / dl * sp + (this.rng() - 0.5) * 0.25, d[2] / dl * sp + (this.rng() - 0.5) * 0.25];
-          if (l.fluid === "gas") this.vfx.spawn("steam", l.point, vel, { color, size: 0.5, alpha: 0.5 });
-          else this.vfx.spawn("drips", l.point, vel, { color, tag: this.rng() < 0.03 ? this.tagOf(l.object) : 0, owner: this.owner });
+          const vel = [dir[0] / dl * sp + (this.rng() - 0.5) * 0.25, dir[1] / dl * sp + (this.rng() - 0.5) * 0.25, dir[2] / dl * sp + (this.rng() - 0.5) * 0.25];
+          if (l.fluid === "gas") this.vfx.spawn("steam", pt2, vel, { color, size: 0.5, alpha: 0.5 });
+          else this.vfx.spawn("drips", pt2, vel, { color, tag: this.rng() < 0.03 ? this.tagOf(l.object) : 0, owner: this.owner });
         }
       }
     }
@@ -39658,6 +39736,9 @@ void main(){
   var EYE = 1.7;
   var PLAYER_RADIUS = 0.3;
   var WALK = 3.4;
+  var CROUCH_DROP = 0.55;
+  var CROUCH_WALK = 1.7;
+  var CROUCH_RATE = 9;
   var RUN = 6.2;
   var JUMP = 4.6;
   var GRAVITY4 = 13;
@@ -39668,17 +39749,20 @@ void main(){
     let pitch = 0;
     let y = 0;
     let eye = EYE;
+    let crouch = 0;
     let vy2 = 0;
     let walked = 0;
     let running = false;
     const px = { x: o.start[0], z: o.start[2] };
     let locked = false;
     const keys = /* @__PURE__ */ new Set();
+    const crouchKeys = o.crouchKeys ?? ["KeyC"];
+    const isCrouchHeld = () => crouchKeys.some((code) => keys.has(code));
     const euler = new THREE.Euler(0, 0, 0, "YXZ");
     const apply = () => {
       euler.set(pitch, yaw, 0, "YXZ");
       cam.quaternion.setFromEuler(euler);
-      cam.position.set(px.x, eye + y, px.z);
+      cam.position.set(px.x, eye + y - CROUCH_DROP * crouch, px.z);
       cam.updateMatrixWorld(true);
     };
     apply();
@@ -39705,6 +39789,20 @@ void main(){
     };
     const onLockChange = () => {
       locked = document.pointerLockElement === o.dom;
+      if (locked) {
+        try {
+          const nav = typeof navigator !== "undefined" ? navigator : null;
+          nav?.keyboard?.lock?.().catch(() => {
+          });
+        } catch {
+        }
+      } else {
+        try {
+          const nav = typeof navigator !== "undefined" ? navigator : null;
+          nav?.keyboard?.unlock?.();
+        } catch {
+        }
+      }
     };
     const onMouseDown = (e) => {
       o.dom.focus?.();
@@ -39774,6 +39872,10 @@ void main(){
     const onKeyDown = (e) => {
       if (typing(e)) return;
       if (e.code === "Space" || e.code === "Tab") e.preventDefault();
+      const isControlHeld = e.ctrlKey || e.metaKey || keys.has("ControlLeft") || keys.has("ControlRight");
+      if (isControlHeld || e.altKey && locked) {
+        if (!/^F\d+$/.test(e.code)) e.preventDefault();
+      }
       if (!e.repeat) keys.add(e.code);
       o.hooks.key(e.code, true, e);
     };
@@ -39784,6 +39886,11 @@ void main(){
     };
     const onContext = (e) => e.preventDefault();
     const onBlur = () => keys.clear();
+    const onBeforeUnload = (e) => {
+      if (!locked && !keys.has("ControlLeft") && !keys.has("ControlRight")) return;
+      e.preventDefault();
+      e.returnValue = "";
+    };
     o.dom.addEventListener("mousedown", onMouseDown);
     window.addEventListener("mouseup", onMouseUp);
     window.addEventListener("mousemove", onMouseMove);
@@ -39793,6 +39900,7 @@ void main(){
     window.addEventListener("keydown", onKeyDown);
     window.addEventListener("keyup", onKeyUp);
     window.addEventListener("blur", onBlur);
+    window.addEventListener("beforeunload", onBeforeUnload);
     return {
       get yaw() {
         return yaw;
@@ -39821,12 +39929,18 @@ void main(){
       get running() {
         return running;
       },
+      get crouching() {
+        return isCrouchHeld();
+      },
       keys,
       update(dt) {
-        const run = keys.has("ShiftLeft") || keys.has("ShiftRight");
+        const crouched = isCrouchHeld();
+        crouch += ((crouched ? 1 : 0) - crouch) * Math.min(1, dt * CROUCH_RATE);
+        if (!crouched && crouch < 1e-3) crouch = 0;
+        const run = !crouched && (keys.has("ShiftLeft") || keys.has("ShiftRight"));
         const fromX = px.x;
         const fromZ = px.z;
-        const speed = run ? RUN : WALK;
+        const speed = crouched ? CROUCH_WALK : run ? RUN : WALK;
         let f = 0;
         let r = 0;
         if (keys.has("KeyW") || keys.has("ArrowUp")) f += 1;
@@ -39902,13 +40016,14 @@ void main(){
         window.removeEventListener("keydown", onKeyDown);
         window.removeEventListener("keyup", onKeyUp);
         window.removeEventListener("blur", onBlur);
+        window.removeEventListener("beforeunload", onBeforeUnload);
         if (document.pointerLockElement === o.dom) document.exitPointerLock?.();
       }
     };
   }
 
   // src/avatar.ts
-  var DEFAULT_STRIKE_CLIPS = { fists: "punch_right", shove: "shove_two_hands", kick: "front_kick" };
+  var DEFAULT_STRIKE_CLIPS = { hand: "punch_right", fists: "punch_right", shove: "shove_two_hands", kick: "front_kick" };
   var DEFAULT_HAND_STANCES = { fists: "fists" };
   var THIRD_PERSON_DEFAULTS = {
     back: 3.8,
@@ -40149,7 +40264,7 @@ void main(){
       "hud.throw": "throw",
       "hud.tilt": "tilt (hold)",
       "hud.equip": "equip {weapon}",
-      "ui.help": "Click: look \xB7 WASD: walk \xB7 Shift: run \xB7 Space: jump \xB7 1-0 / wheel: tool \xB7 LMB: use \xB7 E: grab/drop \xB7 G or RMB: throw \xB7 R: reload \xB7 Q: fire mode \xB7 X: clear a jam \xB7 B: safety \xB7 Y: detonate charges set down \xB7 Tab: panels \xB7 Esc: free the mouse",
+      "ui.help": "Click: look \xB7 WASD: walk \xB7 Shift: run \xB7 C: crouch \xB7 Space: jump \xB7 1-0 / wheel: tool \xB7 LMB: use \xB7 E: grab/drop \xB7 G or RMB: throw \xB7 R: reload \xB7 Q: fire mode \xB7 X: clear a jam \xB7 B: safety \xB7 Y: detonate charges set down \xB7 Tab: panels \xB7 Esc: free the mouse",
       "ui.help.camera": "V: 1st/3rd person (Shift+V: kick)",
       "camera.first": "1st person",
       "camera.third": "3rd person",
@@ -40170,6 +40285,8 @@ void main(){
       "ui.slow": "Slow motion 0.25\xD7",
       "ui.fast": "Time \xD710",
       "ui.tap": "Tap",
+      "ui.fullscreen": "Full screen",
+      "ui.fullscreen.hint": "Full screen opened from here keeps the whole keyboard in the game, Ctrl+W included (F11 does not)",
       "ui.blast.shelter": "Shelter",
       "ui.blast.fragmentHits": "Fragments",
       "ui.blast.confinement": "Confinement",
@@ -40428,7 +40545,7 @@ void main(){
       "hud.throw": "arremessar",
       "hud.tilt": "inclinar (segurar)",
       "hud.equip": "equipar {weapon}",
-      "ui.help": "Clique: olhar \xB7 WASD: andar \xB7 Shift: correr \xB7 Espa\xE7o: pular \xB7 1-0 / roda: ferramenta \xB7 bot\xE3o esquerdo: usar \xB7 E: pegar/soltar \xB7 G ou bot\xE3o direito: arremessar \xB7 R: recarregar \xB7 Q: modo de tiro \xB7 X: destravar \xB7 B: trava \xB7 Y: detonar cargas postas \xB7 Tab: pain\xE9is \xB7 Esc: soltar o mouse",
+      "ui.help": "Clique: olhar \xB7 WASD: andar \xB7 Shift: correr \xB7 C: agachar \xB7 Espa\xE7o: pular \xB7 1-0 / roda: ferramenta \xB7 bot\xE3o esquerdo: usar \xB7 E: pegar/soltar \xB7 G ou bot\xE3o direito: arremessar \xB7 R: recarregar \xB7 Q: modo de tiro \xB7 X: destravar \xB7 B: trava \xB7 Y: detonar cargas postas \xB7 Tab: pain\xE9is \xB7 Esc: soltar o mouse",
       "ui.help.camera": "V: 1\xAA/3\xAA pessoa (Shift+V: chute)",
       "camera.first": "1\xAA pessoa",
       "camera.third": "3\xAA pessoa",
@@ -40449,6 +40566,8 @@ void main(){
       "ui.slow": "C\xE2mera lenta 0,25\xD7",
       "ui.fast": "Tempo \xD710",
       "ui.tap": "Torneira",
+      "ui.fullscreen": "Tela cheia",
+      "ui.fullscreen.hint": "A tela cheia aberta por aqui segura o teclado todo no jogo, inclusive Ctrl+W (o F11 n\xE3o)",
       "ui.blast.shelter": "Abrigo",
       "ui.blast.fragmentHits": "Estilha\xE7os",
       "ui.blast.confinement": "Confinamento",
@@ -40876,6 +40995,19 @@ void main(){
     e.style.setProperty("--tr-thumb", `url("${thumbSource(thumbnail)}")`);
     return e;
   };
+  async function toggleFullscreen() {
+    const keyboard = navigator.keyboard;
+    try {
+      if (document.fullscreenElement) {
+        keyboard?.unlock?.();
+        await document.exitFullscreen();
+        return;
+      }
+      await document.documentElement.requestFullscreen();
+      await keyboard?.lock?.();
+    } catch {
+    }
+  }
   function createUi(o) {
     const { t } = o;
     const style = mk2("style");
@@ -41087,6 +41219,8 @@ void main(){
       o.onFast(fast);
     });
     const tapBtn = ctl(t("ui.tap"), () => o.onTap());
+    const fullscreenBtn = ctl(t("ui.fullscreen"), () => void toggleFullscreen());
+    fullscreenBtn.title = t("ui.fullscreen.hint");
     const blastBtns = ["shelter", "fragmentHits", "confinement"].map((key) => ({ key, b: ctl(t(`ui.blast.${key}`), () => o.onBlast(key)) }));
     for (const { key, b } of blastBtns) b.title = t(`ui.blast.${key}.hint`);
     const qSel = mk2("select");
@@ -41640,6 +41774,7 @@ void main(){
       blockers,
       limit: arenaSize,
       start: arena.playerStart,
+      crouchKeys: options.crouch?.keys,
       hooks: {
         primaryDown: () => {
           useHeld = true;
@@ -41892,6 +42027,7 @@ void main(){
     const third = { ...THIRD_PERSON_DEFAULTS, ...options.thirdPerson };
     let avatar = null;
     let cameraMode = options.cameraMode ?? "first";
+    let crouchForced = false;
     const avatarState = { speed: 0, running: false, crouch: false, down: false, armed: false, pitch: 0 };
     let feetPrev = null;
     let armedForced = null;
@@ -41945,9 +42081,12 @@ void main(){
         if (avatarState.speed < 0.02) avatarState.speed = 0;
       }
       feetPrev = [x, z];
-      avatarState.running = player.keys.has("ShiftLeft") || player.keys.has("ShiftRight");
+      avatarState.running = !player.crouching && (player.keys.has("ShiftLeft") || player.keys.has("ShiftRight"));
+      avatarState.crouch = crouchForced || player.crouching;
       avatarState.armed = armedForced ?? tool.def.action.kind === "firearm";
       avatarState.pitch = player.pitch;
+      avatarState.holding = heldPiece !== null;
+      avatarState.itemUse = useItemPlayer ? { id: useItemName, ...useItemPlayer.pose() } : heldPiece && heldTilt > 0.01 ? { id: "tilt", position: [0.2, -0.1, -0.38], rotation: [-heldTilt, 0, 0] } : null;
       avatar.root.position.set(x, player.feet, z);
       avatar.root.rotation.set(0, player.yaw + Math.PI, 0);
       avatar.update(dt, avatarState);
@@ -42403,7 +42542,11 @@ void main(){
     const useTool = (dt, held) => {
       aim();
       const cat = tool.def.category;
-      if (cat === "hand") return;
+      if (cat === "hand") {
+        if (strikes.some((strike) => strike.key === "hand" || strike.key === "fists")) return;
+        strikeUse({ kind: "melee", damage: "blunt", energy: 25, radius: 0.1, reach: 0.8, origin: [aimO[0], aimO[1], aimO[2]], direction: [aimD[0], aimD[1], aimD[2]] }, "hand");
+        return;
+      }
       if (strikes.some((strike) => strike.key === toolId)) return;
       const res = tool.trigger([aimO[0], aimO[1], aimO[2]], [aimD[0], aimD[1], aimD[2]], dt, held, "player");
       flushEvents(toolId, tool, res.recoil);
@@ -42496,6 +42639,7 @@ void main(){
     let heldTilt = 0;
     let tiltKey = 0;
     const heldLocal = new THREE.Vector3();
+    const heldSize = new THREE.Vector3(0.2, 0.2, 0.2);
     let heldRadius = 0.2;
     const heldVel = [0, 0, 0];
     let useItemPlayer = null;
@@ -42541,12 +42685,15 @@ void main(){
       heldName = nameOf(r.object);
       piece.held = true;
       piece.sleeping = false;
+      const savedQ = piece.root.quaternion.clone();
+      piece.root.quaternion.identity();
+      piece.root.updateMatrixWorld(true);
       const box2 = new THREE.Box3().setFromObject(piece.root);
-      const c = box2.getCenter(new THREE.Vector3());
+      box2.getCenter(heldLocal).sub(piece.root.position);
+      box2.getSize(heldSize);
+      piece.root.quaternion.copy(savedQ);
       piece.root.updateMatrixWorld(true);
-      heldLocal.copy(c).sub(piece.root.position);
-      heldLocal.applyQuaternion(piece.root.quaternion.clone().invert());
-      heldRadius = box2.getSize(new THREE.Vector3()).length() / 3;
+      heldRadius = heldSize.length() / 3;
       heldYaw = 0;
       heldTilt = 0;
       heldVel[0] = heldVel[1] = heldVel[2] = 0;
@@ -42567,18 +42714,43 @@ void main(){
       fire("throw", { objectId: id, speed });
       return true;
     };
-    const carriedTargets = (root) => {
+    const carriedTargets = (root, gripQ) => {
+      const width2 = Math.max(heldSize.x, heldSize.z);
+      const sideGrip = heldSize.y > width2 * 1.04 && width2 <= 0.22;
+      if (sideGrip) {
+        const center2 = heldLocal.clone().applyQuaternion(root.quaternion).add(root.position);
+        const radius = Math.min(heldSize.x, heldSize.z) * 0.5;
+        const handX = new THREE.Vector3(-0.35, 0, -0.94).normalize().applyQuaternion(gripQ);
+        const handY = new THREE.Vector3(0.94, 0, -0.35).normalize().applyQuaternion(gripQ);
+        const handZ = new THREE.Vector3().crossVectors(handX, handY).normalize();
+        const q2 = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().makeBasis(handX, handY, handZ));
+        const up = new THREE.Vector3(0, 1, 0).applyQuaternion(gripQ);
+        const palm = center2.clone().addScaledVector(handY, radius + CARRY_PALM).addScaledVector(handX, -0.022).addScaledVector(up, heldSize.y > 0.16 ? -heldSize.y * 0.08 : -5e-3);
+        if (useItemName === "open" || useItemName === "close") {
+          const leftX = new THREE.Vector3(0.35, 0, -0.94).normalize().applyQuaternion(gripQ);
+          const leftY = new THREE.Vector3(-0.94, 0, -0.35).normalize().applyQuaternion(gripQ);
+          const leftZ = new THREE.Vector3().crossVectors(leftX, leftY).normalize();
+          const lq = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().makeBasis(leftX, leftY, leftZ));
+          const leftPalm = center2.clone().addScaledVector(up, heldSize.y * 0.45).addScaledVector(leftY, radius * 0.65 + CARRY_PALM).addScaledVector(leftX, -0.018);
+          return {
+            R: { position: [palm.x, palm.y, palm.z], quaternion: [q2.x, q2.y, q2.z, q2.w] },
+            L: { position: [leftPalm.x, leftPalm.y, leftPalm.z], quaternion: [lq.x, lq.y, lq.z, lq.w] },
+            grip: 0.85,
+            gripL: 0.8
+          };
+        }
+        return { R: { position: [palm.x, palm.y, palm.z], quaternion: [q2.x, q2.y, q2.z, q2.w] }, grip: 0.85 };
+      }
       const box2 = new THREE.Box3().setFromObject(root);
       const center = box2.getCenter(new THREE.Vector3());
-      const forward = camera2.getWorldDirection(new THREE.Vector3());
-      forward.y = 0;
-      if (forward.lengthSq() < 1e-6) forward.set(0, 0, -1);
-      forward.normalize();
-      const back = new THREE.Vector3(0, -1, 0);
-      const z = forward.clone().cross(back).normalize();
-      const q = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().makeBasis(forward, back, z));
+      const forward = new THREE.Vector3(0, 0, -1).applyQuaternion(gripQ).normalize();
+      const back = new THREE.Vector3(0, -1, 0).applyQuaternion(gripQ).normalize();
+      const z = new THREE.Vector3().crossVectors(forward, back).normalize();
+      const y = new THREE.Vector3().crossVectors(z, forward).normalize();
+      const q = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().makeBasis(forward, y, z));
       return { R: { position: [center.x, box2.min.y - CARRY_PALM, center.z], quaternion: [q.x, q.y, q.z, q.w] }, grip: CARRY_GRIP };
     };
+    const gripQuat = new THREE.Quaternion();
     const followHeld = (dt) => {
       const piece = heldPiece;
       carriedHand = null;
@@ -42588,21 +42760,47 @@ void main(){
       let pos;
       const targetQ = tmpQ;
       const hand = thirdActive() ? avatar?.hand?.("R") : void 0;
+      const isDrink = useItemName === "drink" || useItemName === "sip" || useItemName === "chug";
       if (hand) {
-        pos = hand.getWorldPosition(tmpHand);
-        targetQ.setFromAxisAngle(new THREE.Vector3(0, 1, 0), player.yaw + heldYaw);
-        targetQ.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), -heldTilt));
+        const handWorld = hand.getWorldPosition(tmpHand);
+        const yawQ = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), player.yaw);
+        const pose = useItemPlayer?.pose();
+        const rx = pose ? isDrink ? Math.abs(pose.rotation[0]) * 0.9 : pose.rotation[0] : -heldTilt;
+        const ry = pose ? pose.rotation[1] : 0;
+        const rz = pose ? pose.rotation[2] : 0;
+        gripQuat.copy(yawQ).multiply(new THREE.Quaternion().setFromEuler(new THREE.Euler(Math.max(-1.35, Math.min(1.25, rx)), ry, rz, "XYZ")));
+        targetQ.copy(yawQ).multiply(new THREE.Quaternion().setFromEuler(new THREE.Euler(rx, ry, rz, "XYZ")));
+        targetQ.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), heldYaw));
+        const gripOffset = new THREE.Vector3(-0.02, 0.015, -0.04).applyQuaternion(gripQuat);
+        pos = tmpV2.copy(handWorld).add(gripOffset);
       } else if (useItemPlayer) {
         const pose = useItemPlayer.pose();
-        const handQ = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), player.yaw);
-        pos = tmpV2.set(pose.position[0], pose.position[1], pose.position[2]).applyQuaternion(handQ).add(camera2.position);
-        const eq2 = new THREE.Quaternion().setFromEuler(new THREE.Euler(pose.rotation[0], pose.rotation[1], pose.rotation[2], "XYZ"));
-        targetQ.copy(handQ).multiply(eq2);
+        const frameQ = avatar?.firstPerson ? camera2.quaternion : new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), player.yaw);
+        const raise = isDrink ? Math.max(0, Math.min(1, (pose.position[1] + 0.2) / 0.22)) : 0;
+        const px2 = pose.position[0] + (isDrink ? 0.02 * raise : 0);
+        const py2 = pose.position[1] - (isDrink ? 0.08 * raise : 0);
+        const pz2 = pose.position[2] - (isDrink ? 0.05 * raise : 0);
+        pos = tmpV2.set(px2, py2, pz2).applyQuaternion(frameQ).add(camera2.position);
+        const rx = isDrink ? Math.abs(pose.rotation[0]) * 0.85 : pose.rotation[0];
+        const eq2 = new THREE.Quaternion().setFromEuler(new THREE.Euler(rx, pose.rotation[1], pose.rotation[2], "XYZ"));
+        const wristEq = new THREE.Quaternion().setFromEuler(new THREE.Euler(Math.max(-1.35, Math.min(1.25, rx)), pose.rotation[1], pose.rotation[2], "XYZ"));
+        gripQuat.copy(frameQ).multiply(wristEq);
+        targetQ.copy(frameQ).multiply(eq2);
         targetQ.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), heldYaw));
       } else {
-        pos = tmpV2.set(0.05, -0.28, avatar?.firstPerson ? -Math.min(1.15, CARRY_NEAR + heldRadius) : -1.15).applyMatrix4(camera2.matrixWorld);
+        const small = heldRadius < 0.22;
+        const holdX = avatar?.firstPerson ? small ? 0.22 : 0.08 : 0.05;
+        const holdY = avatar?.firstPerson ? small ? -0.2 : -0.26 : -0.28;
+        const holdZ = avatar?.firstPerson ? small ? -0.42 : -Math.min(1.15, CARRY_NEAR + heldRadius) : -1.15;
+        pos = tmpV2.set(holdX, holdY, holdZ).applyMatrix4(camera2.matrixWorld);
+        const baseQ = avatar?.firstPerson && small ? camera2.quaternion : new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), player.yaw);
+        gripQuat.copy(baseQ).multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), Math.max(-1.35, -heldTilt)));
         targetQ.setFromAxisAngle(new THREE.Vector3(0, 1, 0), player.yaw + heldYaw);
-        targetQ.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), -heldTilt));
+        if (avatar?.firstPerson && small && heldTilt <= 1e-4) {
+          targetQ.copy(camera2.quaternion).multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), heldYaw));
+        } else {
+          targetQ.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), -heldTilt));
+        }
       }
       const k = Math.min(1, (useItemPlayer ? 30 : 16) * dt);
       const px = root.position.x;
@@ -42617,7 +42815,7 @@ void main(){
         heldVel[2] = (root.position.z - pz) / dt;
       }
       root.updateMatrixWorld(true);
-      if (avatar?.firstPerson && cameraMode === "first") carriedHand = carriedTargets(root);
+      if (avatar?.firstPerson && cameraMode === "first") carriedHand = carriedTargets(root, gripQuat);
     };
     const useItem = (useId) => {
       const e = heldEntry;
@@ -42627,11 +42825,13 @@ void main(){
       const c = fluids.container(e.containerId);
       if (!c) return false;
       if (def.liquids && def.liquids.length > 0 && (!c.liquid || !def.liquids.includes(c.liquid))) return false;
-      if ((useId === "drink" || useId === "sip" || useId === "chug" || useId === "pour" || useId === "pour_out") && c.liters <= 1e-6) {
+      const consuming = useId === "drink" || useId === "sip" || useId === "chug" || useId === "pour" || useId === "pour_out";
+      if (consuming && c.liters <= 1e-6) {
         say(t("hud.empty_container", { name: e.name }));
         return false;
       }
       if (useItemPlayer && !useItemPlayer.done) return false;
+      if (consuming && c.closed) fluids.open(e.containerId);
       useItemPlayer = createItemUse(fluids, e.containerId, def);
       useItemName = def.id;
       action("use_item", t("act.use_item", { name: e.name, use: S.text[`use.${def.id}`] ?? def.id }), { objectId: e.so.objectId, itemId: e.so.itemId, data: { use: def.id } });
@@ -42753,7 +42953,7 @@ void main(){
           if (heldEntry?.uses[0]) useItem(heldEntry.uses[0]);
           break;
         case "KeyC":
-          if (heldEntry?.uses[1]) useItem(heldEntry.uses[1]);
+          if (heldEntry?.uses[1] && !(options.crouch?.keys ?? ["KeyC"]).includes("KeyC")) useItem(heldEntry.uses[1]);
           break;
         case "KeyV":
           if (heldEntry?.uses[2]) useItem(heldEntry.uses[2]);
@@ -42845,6 +43045,7 @@ void main(){
     const roomMetrics = createRoomMetrics({ gl, destruction: renderer, fluids: fluidView, effects: vfx.world, ids: roomMetricIds, blast: () => lastBlast });
     let qualityName = quality;
     const syncContainers = (sdt) => {
+      const drinkingHeld = useItemPlayer !== null && (useItemName === "drink" || useItemName === "sip" || useItemName === "chug");
       for (const e of entries.values()) {
         if (!e.containerId) continue;
         const host2 = hostOf(e);
@@ -42853,7 +43054,8 @@ void main(){
         const p = tmpV2.set(e.fluidOffset[0], e.fluidOffset[1], e.fluidOffset[2]).applyMatrix4(host2.root.matrixWorld);
         const vel = sdt > 0 ? [(p.x - e.last[0]) / sdt, (p.y - e.last[1]) / sdt, (p.z - e.last[2]) / sdt] : void 0;
         e.last = [p.x, p.y, p.z];
-        fluids.setTransform(e.containerId, [p.x, p.y, p.z], [q.x, q.y, q.z, q.w], vel);
+        const rot = drinkingHeld && e === heldEntry ? [0, 0, 0, 1] : [q.x, q.y, q.z, q.w];
+        fluids.setTransform(e.containerId, [p.x, p.y, p.z], rot, vel);
       }
     };
     const syncLiters = () => {
@@ -43604,7 +43806,10 @@ void main(){
         return avatar;
       },
       setAvatarState(state) {
-        if (state.crouch !== void 0) avatarState.crouch = state.crouch;
+        if (state.crouch !== void 0) {
+          crouchForced = state.crouch;
+          avatarState.crouch = state.crouch || player.crouching;
+        }
         if (state.down !== void 0) avatarState.down = state.down;
         if (state.armed !== void 0) armedForced = state.armed;
       },