@adatechnology/game-test-room 0.12.0 → 0.14.0

package/dist/index.js

@@ -9,6 +9,9 @@ import { createGroundField, createVfx } from "@adatechnology/game-vfx";
 import { createGroundPatch, createVfxRenderer } from "@adatechnology/game-vfx-three";
 import { checkAnimation, checkBench, checkDestructible, checkSpec, createEnvironmentBus, shotExtras, useToHit } from "@adatechnology/game-contracts";
 
+// src/arena.ts
+import { markKitOrigin } from "@adatechnology/game-contracts";
+
 // src/items.ts
 var box = (id, material, size, position, extra = {}) => ({ id, material, shape: { kind: "box", size }, position, ...extra });
 var joint = (a, b, kind, extra = {}) => ({ a, b, kind, ...extra });
@@ -110,7 +113,7 @@ function resolveScenery(scenery) {
   return [...merged.entries()].map(([id, o]) => ({ id, spec: o.spec, position: o.position, rotationY: o.rotationY ?? 0, colors: o.colors, build: o.build, label: o.label, top: o.top, spout: o.spout }));
 }
 function createArena(THREE, size, scene, scenery, tapOption) {
-  const group = new THREE.Group();
+  const group = markKitOrigin(new THREE.Group(), { owner: "game-test-room", kind: "room" });
   group.name = "test-room-arena";
   scene.background = new THREE.Color(10466504);
   group.add(new THREE.HemisphereLight(13624319, 7037527, 0.75));
@@ -1706,6 +1709,9 @@ function createNarrator(c) {
 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 GRAVITY = 13;
@@ -1716,17 +1722,20 @@ function createPlayer(THREE, o) {
   let pitch = 0;
   let y = 0;
   let eye = EYE;
+  let crouch = 0;
   let vy = 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();
@@ -1753,6 +1762,20 @@ function createPlayer(THREE, o) {
   };
   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?.();
@@ -1822,6 +1845,10 @@ function createPlayer(THREE, o) {
   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);
   };
@@ -1832,6 +1859,11 @@ function createPlayer(THREE, o) {
   };
   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);
@@ -1841,6 +1873,7 @@ function createPlayer(THREE, o) {
   window.addEventListener("keydown", onKeyDown);
   window.addEventListener("keyup", onKeyUp);
   window.addEventListener("blur", onBlur);
+  window.addEventListener("beforeunload", onBeforeUnload);
   return {
     get yaw() {
       return yaw;
@@ -1869,12 +1902,18 @@ function createPlayer(THREE, o) {
     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;
@@ -1950,13 +1989,14 @@ function createPlayer(THREE, o) {
       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,
@@ -2197,7 +2237,7 @@ var en = {
     "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",
@@ -2218,6 +2258,8 @@ var en = {
     "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",
@@ -2476,7 +2518,7 @@ var ptBR = {
     "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",
@@ -2497,6 +2539,8 @@ var ptBR = {
     "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",
@@ -2924,6 +2968,19 @@ var thumb = (thumbnail, credit) => {
   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");
@@ -3135,6 +3192,8 @@ function createUi(o) {
     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");
@@ -3688,6 +3747,7 @@ function createTestRoom(options) {
     blockers,
     limit: arenaSize,
     start: arena.playerStart,
+    crouchKeys: options.crouch?.keys,
     hooks: {
       primaryDown: () => {
         useHeld = true;
@@ -3940,6 +4000,7 @@ function createTestRoom(options) {
   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;
@@ -3993,9 +4054,12 @@ function createTestRoom(options) {
       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);
@@ -4451,7 +4515,11 @@ function createTestRoom(options) {
   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);
@@ -4544,6 +4612,7 @@ function createTestRoom(options) {
   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;
@@ -4589,12 +4658,15 @@ function createTestRoom(options) {
     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;
@@ -4615,18 +4687,43 @@ function createTestRoom(options) {
     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 = camera.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;
@@ -4636,21 +4733,47 @@ function createTestRoom(options) {
     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 = tmpV.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 = tmpV.set(pose.position[0], pose.position[1], pose.position[2]).applyQuaternion(handQ).add(camera.position);
-      const eq = new THREE.Quaternion().setFromEuler(new THREE.Euler(pose.rotation[0], pose.rotation[1], pose.rotation[2], "XYZ"));
-      targetQ.copy(handQ).multiply(eq);
+      const frameQ = avatar?.firstPerson ? camera.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 = tmpV.set(px2, py2, pz2).applyQuaternion(frameQ).add(camera.position);
+      const rx = isDrink ? Math.abs(pose.rotation[0]) * 0.85 : pose.rotation[0];
+      const eq = 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(eq);
       targetQ.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), heldYaw));
     } else {
-      pos = tmpV.set(0.05, -0.28, avatar?.firstPerson ? -Math.min(1.15, CARRY_NEAR + heldRadius) : -1.15).applyMatrix4(camera.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 = tmpV.set(holdX, holdY, holdZ).applyMatrix4(camera.matrixWorld);
+      const baseQ = avatar?.firstPerson && small ? camera.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(camera.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;
@@ -4665,7 +4788,7 @@ function createTestRoom(options) {
       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;
@@ -4675,11 +4798,13 @@ function createTestRoom(options) {
     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 } });
@@ -4801,7 +4926,7 @@ function createTestRoom(options) {
         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]);
@@ -4893,6 +5018,7 @@ function createTestRoom(options) {
   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);
@@ -4901,7 +5027,8 @@ function createTestRoom(options) {
       const p = tmpV.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 = () => {
@@ -5625,6 +5752,7 @@ function createTestRoom(options) {
     },
     equip,
     openArea,
+    modules: () => [...modules.values()].map((m) => ({ id: m.id, name: m.name, group: m.group, hasArea: typeof m.area === "function" })),
     openAreaAsync: (area) => loading.busy(t("loading.open_area", { area: areaLabel(area) }), () => openArea(area)),
     loading,
     busy: (label, work, busyOptions) => loading.busy(label, work, busyOptions),
@@ -5652,7 +5780,10 @@ function createTestRoom(options) {
       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;
     },