fix: restore minigun carry and isolate item previews

Author: Snoopy147

src/game/builder.test.ts

@@ -2,6 +2,7 @@ import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
 import { Box3, BoxGeometry, Matrix4, Mesh, Vector3 } from 'three'
 import { FULL_MASK, type PlacedPiece, useBoots } from '../store'
 import {
+  builderPreviewActive,
   builderDebug,
   cancelPieceClad,
   CELLS,
@@ -98,6 +99,14 @@ function placed(
   return { id: nextId++, piece, position: [x, y, z], yaw, mask }
 }
 
+describe('builder preview ownership', () => {
+  test('the wall ghost yields while catalog furniture is being placed or moved', () => {
+    expect(builderPreviewActive('builder', false)).toBe(true)
+    expect(builderPreviewActive('builder', true)).toBe(false)
+    expect(builderPreviewActive('minigun', false)).toBe(false)
+  })
+})
+
 // --- Slot-locked ghost: grid targeting × piece-slots authority ---------------
 
 /** Open world: nothing occupied, everything supported (pure grid checks). */

src/game/builder.tsx

@@ -1566,6 +1566,12 @@ function applyEditExitTransform(id: number): void {
   sfx.place()
 }
 
+/** The item catalog and builder share LMB and world-preview space. Once an
+ * item ghost is active it owns both, even if the hammer is still selected. */
+export function builderPreviewActive(weapon: string, itemPreview: boolean): boolean {
+  return weapon === 'builder' && !itemPreview
+}
+
 export function Builder() {
   const ghostRef = useRef<Group>(null)
   const [ghost, setGhost] = useState<GhostState | null>(null)
@@ -1633,10 +1639,14 @@ export function Builder() {
     if (!session) return
     placeCooldown.current -= dt
 
-    if (!active) {
+    // Catalog placement owns the world preview completely. In particular,
+    // moving furniture with L while the builder is the underlying weapon must
+    // not leave a wall ghost between the player and the furniture ghost.
+    if (!builderPreviewActive(weapon, itemGhostActive())) {
       if (ghost) setGhost(null)
       if (edit) {
-        // Weapon-switch closes the edit too — same exit-time confirm.
+        // A weapon switch or catalog placement closes edit mode with the same
+        // exit-time confirmation.
         applyEditExitTransform(edit.id)
         setEdit(null)
       }

src/game/remote-players.test.ts

@@ -73,6 +73,7 @@ import {
   rosterNames,
   SPEAK_SCALE_X,
   twoHanded,
+  usesPosedGripHands,
 } from './remote-players'
 import { presenceDebug, wrapAngle } from './presence'
 import { gripToShoulder, leftGripFor } from './hand-grips'
@@ -517,6 +518,21 @@ describe('articulation — gait, airborne, slump', () => {
     expect(refs.head.current.rotation.y).toBeCloseTo(0.2, 12)
   })
 
+  test('a heavy weapon can keep native hands when no posed replacement is mounted', () => {
+    const mk = () => ({ current: new Group() })
+    const refs = {
+      torso: mk(), head: mk(), armL: mk(), armR: mk(), legL: mk(), legR: mk(),
+      headDetail: mk(), bodyDetail: mk(), handL: mk(), handR: mk(),
+      fistL: { current: null }, fistR: { current: null },
+    }
+    const a = createArticulation()
+    a.gripR = 1
+    a.gripL = 1
+    applyArticulation(refs, a)
+    expect(refs.handR.current.scale.x).toBe(1)
+    expect(refs.handL.current.scale.x).toBe(1)
+  })
+
   test('placeRoot lifts by the bob and sways along the body\'s own +x, whatever the yaw', () => {
     const root = new Group()
     const a = createArticulation()
@@ -1143,6 +1159,11 @@ describe('avatar hands — the first-person grip table on the third-person arms'
     for (const w of ['knife', 'hammer', 'builder', 'paint', '', 'laser-of-the-future']) expect(twoHanded(w)).toBe(false)
   })
 
+  test('minigun retains its centered native-hand carry; the knife gets its exact posed grip', () => {
+    expect(usesPosedGripHands('minigun')).toBe(false)
+    expect(usesPosedGripHands('knife')).toBe(true)
+  })
+
   test('the speaking halo encloses the 0.72 × 0.18 tag with a margin and its inner edge clears the tag', () => {
     const outerX = 0.19 * SPEAK_SCALE_X
     const innerX = 0.16 * SPEAK_SCALE_X

src/game/remote-players.tsx

@@ -824,7 +824,9 @@ export function applyArticulation(refs: AvatarRigRefs, a: AvatarArticulation): v
     fist: { current: Group | null } | undefined,
     grip: number,
   ) => {
-    const gripping = grip > 0.5
+    // A native hand is hidden only when a mounted replacement can take its
+    // place. Some heavy weapons deliberately use the model hands instead.
+    const gripping = grip > 0.5 && fist?.current != null
     // Switch on one threshold: the replacement never overlaps a visible
     // native hand, including during weapon-change interpolation.
     if (bone?.current) bone.current.scale.setScalar(gripping ? HAND_COLLAPSE : 1)
@@ -1711,6 +1713,14 @@ export function twoHanded(weapon: string): boolean {
   return grip !== 'none' && GRIPS[grip].foregrip > 0 && leftGripFor(weapon) !== null
 }
 
+/** The minigun reads better with the Pascaline model's native hands: its
+ * broad two-arm carry already lands both wrists on the grips, while the small
+ * procedural hands make the heavy body look offset to one side. Thin tools
+ * such as the knife still need a posed hand wrapped around their handle. */
+export function usesPosedGripHands(weapon: string): boolean {
+  return weapon !== 'minigun'
+}
+
 /**
  * The held weapon, in THE ARM FRAME: hanging −y from the shoulder, barrel down
  * the arm (weapon-models contract: grip at the origin, barrel down −Z), muzzle
@@ -1737,6 +1747,7 @@ function HeldWeapon({
   const muzzle = refs.fx ? remoteMuzzle(weapon) : null
   const hold = holdFor(weapon)
   const support = twoHanded(weapon) ? hold.left : null
+  const posedHands = usesPosedGripHands(weapon)
   const qR = useMemo(() => gripQuaternion(hold.right, 'R', new Quaternion()), [hold])
   const qL = useMemo(() => (support ? gripQuaternion(support, 'L', new Quaternion()) : null), [support])
   if (!Weapon) return null
@@ -1771,10 +1782,12 @@ function HeldWeapon({
             />
           </group>
         ) : null}
-        <group position={[r[0], r[1], r[2]]} quaternion={qR} ref={refs.fistR} visible={false}>
-          <HandMesh pose={hold.right.pose} side="R" scale={AVATAR_GRIP_HAND_SCALE} />
-        </group>
-        {support && qL ? (
+        {posedHands ? (
+          <group position={[r[0], r[1], r[2]]} quaternion={qR} ref={refs.fistR} visible={false}>
+            <HandMesh pose={hold.right.pose} side="R" scale={AVATAR_GRIP_HAND_SCALE} />
+          </group>
+        ) : null}
+        {posedHands && support && qL ? (
           <group
             position={[support.position[0], support.position[1], support.position[2]]}
             quaternion={qL}