@adatechnology/game-test-room 0.15.0 → 0.16.0

package/dist/index.js

@@ -110,7 +110,7 @@ function resolveScenery(scenery) {
     if (!position) throw new Error(`game-test-room: scenery "${id}" is new, so it needs a position`);
     merged.set(id, { ...obj, position });
   }
-  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 }));
+  return [...merged.entries()].map(([id, o]) => ({ id, spec: o.spec, position: o.position, rotationY: o.rotationY ?? 0, colors: o.colors, build: o.build, follow: o.follow, label: o.label, top: o.top, spout: o.spout, free: o.free }));
 }
 function createArena(THREE, size, scene, scenery, tapOption) {
   const group = markKitOrigin(new THREE.Group(), { owner: "game-test-room", kind: "room" });
@@ -2346,6 +2346,9 @@ var en = {
     "act.strike.leg": "{weapon}: {clip} with the {leg} leg begins, impact in {seconds} s",
     "leg.left": "left",
     "leg.right": "right",
+    "act.strike.hand": "{weapon}: {clip} with the {hand} hand begins, impact in {seconds} s",
+    "hand.left": "left",
+    "hand.right": "right",
     "act.flame.hit": "{weapon}: flame at {temp} \xB0C on {where}",
     "act.flame.air": "{weapon}: flame, nothing in range",
     "act.heat.hit": "{weapon}: heating {where} at {temp} \xB0C",
@@ -2377,6 +2380,7 @@ var en = {
     "loading.open_area": "Opening {area}\u2026",
     "loading.spawn": "Building {name}\u2026",
     "act.loosened": "{name} was heavy but free: the blast moved it",
+    "act.shoved": "{name} stands free: the shots moved it",
     "act.impact": "{name} hit {where} at {speed} m/s: {energy} J of blunt damage",
     "act.use_item": "{name}: {use}",
     "act.tap.on": "Tap opened",
@@ -2653,6 +2657,9 @@ var ptBR = {
     "act.strike.leg": "{weapon}: {clip} com a perna {leg} come\xE7a, impacto em {seconds} s",
     "leg.left": "esquerda",
     "leg.right": "direita",
+    "act.strike.hand": "{weapon}: {clip} com a m\xE3o {hand} come\xE7a, impacto em {seconds} s",
+    "hand.left": "esquerda",
+    "hand.right": "direita",
     "act.flame.hit": "{weapon}: chama a {temp} \xB0C em {where}",
     "act.flame.air": "{weapon}: chama, nada ao alcance",
     "act.heat.hit": "{weapon}: esquentando {where} a {temp} \xB0C",
@@ -2684,6 +2691,7 @@ var ptBR = {
     "loading.open_area": "Abrindo {area}\u2026",
     "loading.spawn": "Montando {name}\u2026",
     "act.loosened": "{name} \xE9 pesado mas estava solto: a explos\xE3o o moveu",
+    "act.shoved": "{name} estava solto no ch\xE3o: os tiros o moveram",
     "act.impact": "{name} bateu em {where} a {speed} m/s: {energy} J de dano de impacto",
     "act.use_item": "{name}: {use}",
     "act.tap.on": "Abriu a torneira",
@@ -3147,7 +3155,7 @@ function createTestTablePanel(table, t) {
   relay.type = "button";
   relay.onclick = () => table.relay();
   trials.appendChild(relay);
-  element.append(head, search, found, sub, list, trials);
+  element.append(head, search, found, sub, trials, list);
   const groups = () => {
     const keep = select.value;
     select.textContent = "";
@@ -3794,6 +3802,7 @@ function createUi(o) {
 
 // src/room.ts
 var FIXED_DT = 1 / 60;
+var SHOVE_SPEED = 0.04;
 var METRICS_INTERVAL_S = 0.25;
 var CARRY_NEAR = 0.62;
 var CARRY_PALM = 0.012;
@@ -4156,7 +4165,9 @@ function createTestRoom(options) {
       scene.add(root);
       root.updateMatrixWorld(true);
       world.add(structuredCloneSpec(o.spec), { id: o.id, position: o.position, ...o.rotationY ? { rotation: [0, Math.sin(o.rotationY / 2), 0, Math.cos(o.rotationY / 2)] } : {} });
-      registerEntry(o.id, o.id, root, o.spec, o.label ?? S.text[`arena.${o.id}`] ?? o.id, void 0, void 0, true, false);
+      const e = registerEntry(o.id, o.id, root, o.spec, o.label ?? S.text[`arena.${o.id}`] ?? o.id, void 0, void 0, true, false);
+      if (o.free) e.free = true;
+      e.follower = o.follow?.(root, world, o.id) || null;
     }
   };
   addArena();
@@ -4251,6 +4262,7 @@ function createTestRoom(options) {
       renderer.unbind(id);
     } catch {
     }
+    e.follower?.dispose?.();
     if (world.has(id)) world.remove(id);
     e.so.root.removeFromParent();
     letGo(e.so.root);
@@ -4285,6 +4297,7 @@ function createTestRoom(options) {
     for (const e of entries.values()) {
       world.reset(e.so.objectId);
       renderer.restore(e.so.objectId);
+      e.follower?.restore?.();
     }
     renderer.clear();
     vfx.world.clear();
@@ -4306,6 +4319,7 @@ function createTestRoom(options) {
       if (heldEntry === e) continue;
       world.reset(e.so.objectId);
       renderer.restore(e.so.objectId);
+      e.follower?.restore?.();
       if (e.containerId) {
         const c = fluids.container(e.containerId);
         const f = e.item?.fluid?.container;
@@ -4609,6 +4623,19 @@ function createTestRoom(options) {
     if (!rendererPieces.has(objectId)) return;
     renderer.impulse(objectId, [dir[0] * momentum, dir[1] * momentum, dir[2] * momentum], point);
   };
+  const shoveFree = (pushes) => {
+    for (const [objectId, push] of pushes) {
+      const e = entries.get(objectId);
+      if (!e || e.piece || !e.free) continue;
+      const mass = Math.max(0.2, massOfObject(objectId));
+      if (Math.hypot(...push.impulse) / mass < SHOVE_SPEED) continue;
+      const piece = renderer.makePiece(objectId, { mass });
+      e.piece = piece;
+      rendererPieces.set(objectId, piece);
+      action("loosened", t("act.shoved", { name: e.name }), { objectId, itemId: e.so.itemId });
+      renderer.impulse(objectId, push.impulse, push.point);
+    }
+  };
   const fireShots = (shots, recoil) => {
     if (shots.length === 0) return;
     const w = toolName();
@@ -4618,6 +4645,7 @@ function createTestRoom(options) {
     let hits = 0;
     let first = null;
     let energy = 0;
+    const pushes = /* @__PURE__ */ new Map();
     withoutHeld(() => {
       for (const s of shots) {
         energy = Math.max(energy, s.energy);
@@ -4629,11 +4657,16 @@ function createTestRoom(options) {
           end = r0.point;
           if (!first) first = { object: r0.object, part: r0.part, point: r0.point, normal: [0, 1, 0], distance: dist3(s.origin, r0.point) };
           const speed = Math.max(80, s.speed);
-          pushPiece(r0.object, s.direction, 2 * s.energy / speed, r0.point);
+          const momentum = 2 * s.energy / speed;
+          pushPiece(r0.object, s.direction, momentum, r0.point);
+          const push = pushes.get(r0.object) ?? { impulse: [0, 0, 0], point: r0.point };
+          for (let k = 0; k < 3; k++) push.impulse[k] += s.direction[k] * momentum;
+          pushes.set(r0.object, push);
         }
         if (shots.length <= 3 || rnd() < 0.34) tracer(m, end);
       }
     });
+    shoveFree(pushes);
     player.kick(recoil[0], recoil[1]);
     const f = first;
     const d = f ? num(f.distance, 1) : "";
@@ -4725,16 +4758,25 @@ function createTestRoom(options) {
   let strikes = [];
   const kickLeg = options.kickLeg ?? "alternate";
   let nextLeg = "right";
+  const punchHand = options.punchHand ?? "alternate";
+  const punchTools = new Set(options.punchTools ?? ["hand", "fists"]);
+  let nextHand = "right";
   const strikeUse = (u, id = toolId) => {
     const clip = strikeClips[id];
     const leg = id === "kick" ? kickLeg === "alternate" ? nextLeg : kickLeg : void 0;
-    const seconds = clip === void 0 ? null : avatar?.strike?.(clip, leg ? { leg } : void 0) ?? null;
+    const hand = punchTools.has(id) ? punchHand === "alternate" ? nextHand : punchHand : void 0;
+    const side = leg ? { leg } : hand ? { hand } : void 0;
+    const seconds = clip === void 0 ? null : avatar?.strike?.(clip, side) ?? null;
     if (leg && seconds !== null && kickLeg === "alternate") nextLeg = leg === "right" ? "left" : "right";
+    if (hand && seconds !== null && punchHand === "alternate") nextHand = hand === "right" ? "left" : "right";
     if (clip === void 0 || seconds === null) {
       meleeUse(u, id);
       return;
     }
-    action("strike", t(leg ? "act.strike.leg" : "act.strike", { weapon: toolName(id), clip, seconds: num(seconds, 2), leg: leg ? t(`leg.${leg}`) : "" }), { data: { weapon: id, clip, impactIn: seconds, ...leg ? { leg } : {} } });
+    const text = leg ? "act.strike.leg" : hand ? "act.strike.hand" : "act.strike";
+    action("strike", t(text, { weapon: toolName(id), clip, seconds: num(seconds, 2), leg: leg ? t(`leg.${leg}`) : "", hand: hand ? t(`hand.${hand}`) : "" }), {
+      data: { weapon: id, clip, impactIn: seconds, ...leg ? { leg } : {}, ...hand ? { hand } : {} }
+    });
     strikes.push({
       key: id,
       remaining: seconds,