@adatechnology/game-characters-three 0.8.0 → 0.8.1

package/dist/{chunk-3CHBEUHW.js → chunk-XSMP7T6O.js}

@@ -521,7 +521,7 @@ var createBestBuilder = (host, { types, random = Math.random }) => {
   };
   function build(spec) {
     const ti = Math.max(0, BCARDS.findIndex((x) => x.n === spec.type)), z = BCARDS[ti];
-    const P = Object.assign({}, BASE, TYPES[spec.type] || {}, spec.pose || {}), d = spec.decay ?? 0, life = spec.life ?? 1, cut = spec.cut || {};
+    const P = Object.assign({}, BASE, TYPES[spec.type ?? ""] || {}, spec.pose || {}), d = spec.decay ?? 0, life = spec.life ?? 1, cut = spec.cut || {};
     P.s *= spec.h ?? 1;
     P.bulk *= spec.bulk ?? 1;
     if (life === 0) {
@@ -585,7 +585,7 @@ var createBestBuilder = (host, { types, random = Math.random }) => {
     };
     const ball = (p2, r, m, x, y, z2) => add(p2, SPH(r, SEG, 12), m, x, y, z2);
     topM_ref = topM;
-    const SKM = {}, skM = (c) => SKM[c] || (SKM[c] = new THREE.MeshStandardMaterial({ color: c, roughness: 0.3, metalness: 0, polygonOffset: true, polygonOffsetFactor: -4, polygonOffsetUnits: -4 }));
+    const SKM = {}, skM = (c) => SKM[String(c)] || (SKM[String(c)] = new THREE.MeshStandardMaterial({ color: c, roughness: 0.3, metalness: 0, polygonOffset: true, polygonOffsetFactor: -4, polygonOffsetUnits: -4 }));
     const flat = (p2, x, y, zz, sx, sy, c) => {
       const m = new THREE.Mesh(BLOB, skM(c));
       m.rotation.set(PI / 2, 0, BR() * 6.28);
@@ -1004,7 +1004,7 @@ var createBestBuilder = (host, { types, random = Math.random }) => {
     root.userData.rig = rig;
     return root;
   }
-  const marked = (...args) => markKitOrigin(build(...args), { owner: "game-characters-three", kind: "person" });
+  const marked = (spec) => markKitOrigin(build(spec), { owner: "game-characters-three", kind: "person" });
   return { build: marked, TYPES, setLOD(k) {
     LK = k;
     SEG = Math.max(5, Math.round(16 * k));
@@ -1342,12 +1342,12 @@ var HATS = [
       const o = add(Hd, cap(0.205, PI / 2), c, 0, 1.835, -5e-3);
       o.scale.set(1, 0.98, 1.08);
       add(Hd, new THREE.CylinderGeometry(0.208, 0.212, 0.04, 20), c, 0, 1.84, -5e-3);
-      if (sp.hat.tape) add(Hd, new THREE.CylinderGeometry(0.205, 0.207, 0.035, 20), cmat(sp.hat.tape), 0, 1.9, -5e-3);
-      if (sp.hat.photo) {
+      if (sp.hat?.tape) add(Hd, new THREE.CylinderGeometry(0.205, 0.207, 0.035, 20), cmat(sp.hat.tape), 0, 1.9, -5e-3);
+      if (sp.hat?.photo) {
         add(Hd, Bx(0.07, 0.08, 0.012), cmat(16052448), 0.13, 1.9, 0.14, 0, 0.75, 0);
         add(Hd, Bx(0.05, 0.055, 0.014), cmat(9071184), 0.13, 1.9, 0.141, 0, 0.75, 0);
       }
-      if (sp.hat.nvg) {
+      if (sp.hat?.nvg) {
         add(Hd, Bx(0.07, 0.05, 0.06), cmat(1710618), 0, 2, 0.175);
         for (const s of [-1, 1]) add(Hd, new THREE.CylinderGeometry(0.024, 0.024, 0.09, 10).rotateX(PI / 2), cmat(2767402), s * 0.032, 1.965, 0.235);
       }
@@ -2061,7 +2061,7 @@ var createPersonBuilder = (host, options = {}) => {
       const hg = new THREE.Group();
       hg.position.y = -0.3;
       el.add(hg);
-      const handM = glove ? cmat(glove[1]) : skinM;
+      const handM = glove ? cmat(glove[1] ?? 16777215) : skinM;
       const palm = ball(hg, 0.048, handM, 0, -0.035, 0);
       palm.scale.set(0.6, 1.05, 1);
       const { fingers, th } = buildHand({ THREE, add, hg, handM, s, detailed });
@@ -2073,7 +2073,7 @@ var createPersonBuilder = (host, options = {}) => {
     }
     for (const e of sp.ex || []) {
       const [k, c] = e;
-      const m = c !== void 0 ? cmat(c) : null;
+      const m = c !== void 0 ? cmat(c) : topM;
       EXTRAS[k]?.({ THREE, PI, U, Hd, root, add, Bx, cmat, ring, torsoGeo, legs, arms, fem, topM, m, e, k, headG, fig, upper, skinM, sp, splat, R, ball, cap, hc });
     }
     if (sp.back === "shotgun") {
@@ -2094,10 +2094,11 @@ var createPersonBuilder = (host, options = {}) => {
       const metal = cmat(9080982, { metalness: 0.7, roughness: 0.35 }), dark = cmat(1842463, { metalness: 0.6, roughness: 0.45 }), woodM = cmat(6961692);
       HAND_ITEMS[kind]?.({ THREE, PI, add, Bx, cmat, g, metal, dark, woodM, lights: options.lights, sources: lightSources });
     }
-    item(sp.hand, arms[0].mount);
-    item(sp.lhand, arms[1].mount);
-    if (sp.hand) arms[0].hold = true;
-    if (sp.lhand) arms[1].hold = true;
+    const [rightArm, leftArm] = arms;
+    item(sp.hand, rightArm.mount);
+    item(sp.lhand, leftArm.mount);
+    if (sp.hand) rightArm.hold = true;
+    if (sp.lhand) leftArm.hold = true;
     const zb = [];
     for (let i = 0; i < 4; i++) splat(U, -0.15 + R() * 0.3, 1.2 + R() * 0.25, 0.17, 0.035 + R() * 0.025, 3874068, 3, zb);
     {
@@ -2141,8 +2142,9 @@ var createPersonBuilder = (host, options = {}) => {
       segs["shin" + k] = { node: l.kn, label: "Canela e p\xE9 " + LSIDE[k], hp: 55, r: 0.08, leg: k };
     });
     for (const k in segs) {
-      segs[k].max = segs[k].hp;
-      segs[k].state = "ok";
+      const seg = segs[k];
+      seg.max = seg.hp;
+      seg.state = "ok";
     }
     const mouth = add(Hd, Bx(0.1, 0.04, 0.02), cmat(3803656), 0, 1.69, 0.145);
     mouth.visible = false;
@@ -2210,7 +2212,7 @@ var createPersonBuilder = (host, options = {}) => {
       if (a.fingers) {
         const gr = (a.hold || a.grip ? 1.25 : 0.4) * (z ? 0.5 : 1);
         a.fingers.forEach((f, j) => f.rotation.z = -a.s * gr * (j % 2 ? 1.1 : 0.9));
-        a.th.rotation.z = -a.s * (0.45 + gr * 0.25);
+        if (a.th) a.th.rotation.z = -a.s * (0.45 + gr * 0.25);
         a.hg.rotation.x = reduce ? 0 : -W * Math.sin(ph - 0.6) * 0.15 * a.s;
       }
     });
@@ -2224,7 +2226,7 @@ var createPersonBuilder = (host, options = {}) => {
   }
   function zombify(c, cat) {
     c.skinM.color.copy(c.base).lerp(ZSKIN2, 1);
-    c.eyeM.color.set(EYE[cat || "lento"]);
+    c.eyeM.color.set(EYE[cat || "lento"] ?? EYE.lento);
     c.zb.forEach((b) => b.visible = true);
     c.mouth.visible = true;
     c.bags.material.opacity = 0.9;
@@ -2236,7 +2238,7 @@ var createPersonBuilder = (host, options = {}) => {
       chars.push(c);
       root.add(c.root);
       if (zed && !p2.kid) zombify(c, p2.zcat);
-      c.z = zed && !p2.kid;
+      c.z = !!(zed && !p2.kid);
     }
     (p2.kids || []).forEach((k) => {
       const c = build(k, 0);
@@ -2246,7 +2248,7 @@ var createPersonBuilder = (host, options = {}) => {
       chars.push(c);
       root.add(c.root);
     });
-    chars.forEach((c) => pose(c, c.z, 0, 0));
+    chars.forEach((c) => pose(c, !!c.z, 0, 0));
     return { root, chars };
   }
   const mark = (c) => {
@@ -3646,74 +3648,24 @@ var hitFor = (preset2, origin, y, known) => {
 var hex = (value) => parseInt(value, 16);
 var personSpecOf = (profession) => {
   const { look } = profession;
-  const spec = {
+  const ex = profession.accessories.map((accessory) => accessory.color ? [accessory.id, hex(accessory.color)] : [accessory.id]);
+  return {
     skin: hex(look.skin),
     hair: { s: look.hair.style, c: hex(look.hair.color) },
     top: { c: hex(look.top.color), sl: look.top.sleeve, ...look.top.plaid ? { plaid: hex(look.top.plaid) } : {} },
     pants: { c: hex(look.pants.color) },
     shoes: hex(look.shoes),
-    ex: profession.accessories.map((accessory) => accessory.color ? [accessory.id, hex(accessory.color)] : [accessory.id])
+    ex,
+    ...profession.female ? { fem: 1 } : {},
+    ...look.hat ? { hat: { k: look.hat.kind, c: hex(look.hat.color) } } : {},
+    ...look.face && look.face.length > 0 ? { face: [...look.face] } : {},
+    ...profession.hand ? { hand: profession.hand } : {},
+    ...profession.leftHand ? { lhand: profession.leftHand } : {}
   };
-  if (profession.female) spec.fem = 1;
-  if (look.hat) spec.hat = { k: look.hat.kind, c: hex(look.hat.color) };
-  if (look.face && look.face.length > 0) spec.face = [...look.face];
-  if (profession.hand) spec.hand = profession.hand;
-  if (profession.leftHand) spec.lhand = profession.leftHand;
-  return spec;
 };
 
 // src/test-area/knock.ts
-import { blastShove } from "@adatechnology/game-contracts";
-var KNOCK_DOWN_SPEED = 2.5;
-var KNOCKED_DOWN_ANGLE = 1.35;
-var LIE_SECONDS = 1.6;
-var STAND_UP_PER_SPEED = 0.25;
-var FALL_SECONDS = 0.25;
-var RISE_SECONDS = 0.6;
-var GROUND_FRICTION = 7;
-var GRAVITY2 = 9.81;
-var CHEST = 1.1;
-var bodyMass = (height, build = 1) => 70 * (height / 1.75) ** 2 * build;
-function knockOf(blast, feet, mass, options) {
-  const hit = blastShove(blast, { position: [feet[0], feet[1] + CHEST, feet[2]], mass }, options);
-  if (!hit) return void 0;
-  const [dx, dy, dz] = hit.direction;
-  return { velocity: [dx * hit.speed, Math.max(0, dy * hit.speed), dz * hit.speed], airborne: dy > 0, lying: 0, lieLeft: 0, down: hit.speed >= KNOCK_DOWN_SPEED };
-}
-function stepKnock(knock, position, dt, groundAt, alive) {
-  const v = knock.velocity;
-  position.x += v[0] * dt;
-  position.z += v[2] * dt;
-  const ground = groundAt(position.x, position.z);
-  if (knock.airborne || position.y > ground + 1e-4) {
-    v[1] -= GRAVITY2 * dt;
-    position.y += v[1] * dt;
-    if (position.y <= ground) {
-      position.y = ground;
-      v[1] = 0;
-      knock.airborne = false;
-    }
-  } else position.y = ground;
-  const horizontal = Math.hypot(v[0], v[2]);
-  if (!knock.airborne && horizontal > 0) {
-    const slowed = Math.max(0, horizontal - GROUND_FRICTION * dt);
-    v[0] *= slowed / horizontal;
-    v[2] *= slowed / horizontal;
-  }
-  const moving = horizontal > 0.05 || knock.airborne;
-  if (knock.down) {
-    if (moving) knock.lying = Math.min(1, knock.lying + dt / FALL_SECONDS);
-    else {
-      knock.lying = 1;
-      if (alive) {
-        knock.lieLeft = knock.lieLeft > 0 ? knock.lieLeft : LIE_SECONDS + Math.hypot(v[0], v[2]) * STAND_UP_PER_SPEED;
-        knock.lieLeft -= dt;
-        if (knock.lieLeft <= 0) knock.down = false;
-      }
-    }
-  } else if (knock.lying > 0) knock.lying = Math.max(0, knock.lying - dt / RISE_SECONDS);
-  return !moving && !knock.down && knock.lying === 0;
-}
+import { bodyMass, KNOCK_CHEST, KNOCK_DOWN_SPEED, KNOCKED_DOWN_ANGLE, knockOf, stepKnock } from "@adatechnology/game-contracts";
 
 // src/test-area/scenarios.ts
 import { SEGMENT_IDS } from "@adatechnology/game-characters";
@@ -4359,7 +4311,8 @@ function createCharactersTestModule(options = {}) {
         for (const entry of entries.values()) {
           if (!entry.root.parent) continue;
           const p2 = entry.root.position;
-          const knock = knockOf(event, [p2.x, p2.y, p2.z], bodyMass(entry.character.spec.height, entry.character.spec.build), lent.blastShove);
+          const reach = lent.blastReach?.(event.point, [p2.x, p2.y + KNOCK_CHEST, p2.z], [event.source, entry.id]) ?? 1;
+          const knock = knockOf({ ...event, reach }, [p2.x, p2.y, p2.z], bodyMass(entry.character.spec.height, entry.character.spec.build), lent.blastShove);
           if (knock) entry.knock = entry.knock ? { ...knock, lying: entry.knock.lying } : knock;
         }
       });
@@ -4658,4 +4611,4 @@ export {
   AVATAR_AREA_ID,
   createAvatarTestModule
 };
-//# sourceMappingURL=chunk-3CHBEUHW.js.map
+//# sourceMappingURL=chunk-XSMP7T6O.js.map