@developerz.ai/ts23d 0.1.0 → 0.2.0

package/dist/{chunk-1ypfs7ga.js → chunk-8j4c28jt.js}

@@ -13,16 +13,16 @@ import {
   dot2,
   cross2,
   normalize2
-} from "./chunk-4ddzsqtc.js";
+} from "./chunk-hg7pf34j.js";
 import {
   split2,
   parseWhyte2
-} from "./chunk-ravbb06q.js";
+} from "./chunk-dxvypr7y.js";
 import {
-  stripRect2,
+  hex2,
   DEFAULT_SHEET2,
-  hex2
-} from "./chunk-kvcep7ft.js";
+  stripRect2
+} from "./chunk-y63c6zcv.js";
 import {
   box2,
   lathe2,
@@ -38,10 +38,10 @@ import {
   arcLengths2,
   transportFrames2,
   sweep2
-} from "./chunk-wtqhq529.js";
+} from "./chunk-d1fv6hrm.js";
 import {
   bakeAo2
-} from "./chunk-xnt2sdhf.js";
+} from "./chunk-drna2rny.js";
 
 // src/kinds/faces.ts
 var EPS = 0.000000001;
@@ -531,17 +531,189 @@ function beardEdits(p, l) {
   return out;
 }
 
+// src/kinds/head-torso.ts
+var sub = (a, b) => [a[0] - b[0], a[1] - b[1], a[2] - b[2]];
+var mid = (a, b) => [(a[0] + b[0]) / 2, (a[1] + b[1]) / 2, (a[2] + b[2]) / 2];
+var dist = (a, b) => Math.hypot(...sub(a, b));
+var PLINTH = 0.17;
+function frameOf(p, l) {
+  const m = p.bust.mass ?? 0.5;
+  const b = l.base + 0.06 + 0.1 * m;
+  const nz = b + 0.6;
+  return {
+    cx: l.cranium.at[0] + p.jaw.muzzle * 0.3,
+    s: p.bust.shoulders,
+    b,
+    floor: l.base,
+    nz,
+    m,
+    n: p.neck.radius,
+    trapZ: nz + 0.12 + (l.hinge[1] - 0.2 - nz - 0.12) * m,
+    cutZ: l.base + PLINTH + 0.06 + 0.1 * m
+  };
+}
+function torsoForms(f, g = 0) {
+  const { cx, s, b, m, n } = f;
+  const grow = (r) => [r[0] + g, r[1] + g, r[2] + g];
+  const top = [cx - 0.12, n * 0.5, f.trapZ];
+  const acromion = [cx - 0.05, s * 0.78, b + 0.62 + 0.05 * m];
+  return [
+    {
+      shape: "ellipsoid",
+      at: [cx - 0.05, 0, b + 0.36],
+      size: grow([0.25 + 0.07 * m, s * 0.66, 0.38])
+    },
+    {
+      shape: "ellipsoid",
+      at: [cx + 0.1 + 0.05 * m, s * 0.27, b + 0.46 + 0.02 * m],
+      size: grow([0.09 + 0.06 * m, s * 0.27, 0.11 + 0.03 * m]),
+      rotate: [-12, 0, 16],
+      blend: 0.05
+    },
+    {
+      shape: "ellipsoid",
+      at: [cx - 0.03, s * 0.8, b + 0.5 + 0.03 * m],
+      size: grow([0.13 + 0.06 * m, 0.11 + 0.05 * m, 0.16 + 0.05 * m]),
+      rotate: [-18, 0, 0],
+      blend: 0.08
+    },
+    {
+      shape: "ellipsoid",
+      at: mid(top, acromion),
+      size: [dist(top, acromion) / 2 + 0.08 + g, 0.11 + 0.12 * m + g, 0.05 + 0.1 * m + g],
+      rotate: alongX(sub(acromion, top)),
+      blend: 0.08 + 0.08 * m
+    },
+    {
+      shape: "capsule",
+      at: [cx - 0.04, s * 0.8, b + 0.55],
+      to: [cx - 0.02, s * 0.9, b + 0.05],
+      size: 0.12 + 0.05 * m + g,
+      blend: 0.06
+    },
+    {
+      shape: "capsule",
+      at: [cx + 0.2 + 0.04 * m, 0.045, f.nz - 0.03],
+      to: [cx + 0, s * 0.68, b + 0.6 + 0.04 * m],
+      size: 0.02 + 0.006 * (1 - m) + g,
+      blend: 0.035
+    },
+    {
+      shape: "ellipsoid",
+      at: [cx - 0.1, s * 0.55, b + 0.3],
+      size: grow([0.17 + 0.05 * m, 0.12 + 0.1 * m, 0.2]),
+      blend: 0.08
+    },
+    {
+      shape: "ellipsoid",
+      at: [cx - 0.18, 0, f.nz + 0.04 + 0.08 * m],
+      size: grow([0.12 + 0.06 * m, s * 0.32, 0.16 + 0.12 * m]),
+      blend: 0.1
+    }
+  ];
+}
+function cutField(f) {
+  const rz = 0.64;
+  const ry = f.s * 1.08;
+  const cz = f.cutZ + rz;
+  const e = sd2.ellipsoid([f.cx, 0, cz], [1.6, ry, rz]);
+  const box = sd2.box([f.cx, 0, cz + 1], [3.2, ry * 2, 2]);
+  return (q) => Math.min(e(q), box(q));
+}
+function bustCut(f, g = 0) {
+  const rz = 0.64;
+  const ry = f.s * 1.08 + g;
+  const cz = f.cutZ + rz - g;
+  return {
+    group: [
+      { shape: "ellipsoid", at: [f.cx, 0, cz], size: [1.6, ry, rz] },
+      { shape: "roundBox", at: [f.cx, 0, cz + 1], size: [3.2, ry * 2, 2] }
+    ],
+    op: "intersect",
+    blend: 0.012
+  };
+}
+function bodyEdits(p, f, color) {
+  const { cx, b, m, nz } = f;
+  const shade = p.colors.shade;
+  return [
+    {
+      group: [
+        ...torsoForms(f),
+        {
+          shape: "sphere",
+          at: [cx + 0.24 + 0.04 * m, 0, nz - 0.04],
+          size: 0.035,
+          op: "subtract",
+          blend: 0.04,
+          color: shade
+        },
+        {
+          shape: "capsule",
+          at: [cx + 0.26 + 0.06 * m, 0, b + 0.5],
+          to: [cx + 0.26 + 0.05 * m, 0, b + 0.22],
+          size: 0.01 + 0.006 * m,
+          op: "subtract",
+          blend: 0.04,
+          color: shade
+        },
+        bustCut(f)
+      ],
+      color
+    }
+  ];
+}
+var cylinder = (at, r, z0, z1) => ({
+  group: [
+    { shape: "capsule", at: [at[0], at[1], z0 - r], to: [at[0], at[1], z1 + r], size: r },
+    {
+      shape: "roundBox",
+      at: [at[0], at[1], (z0 + z1) / 2],
+      size: [4, 4, z1 - z0],
+      op: "intersect"
+    }
+  ]
+});
+function plinthEdits(p, f, minT = 0) {
+  const c = p.colors.plinth ?? [0.16, 0.15, 0.15];
+  const light = [c[0] * 1.35, c[1] * 1.35, c[2] * 1.35];
+  const x = f.cx - 0.04;
+  const R = 0.3 + 0.08 * f.s;
+  if (minT > 0.07)
+    return [
+      { ...cylinder([x, 0, 0], R * 1.05, f.floor - 0.1, f.cutZ + 0.02), color: c, mirror: false }
+    ];
+  const disc = f.floor + 0.07;
+  return [
+    { ...cylinder([x, 0, 0], R, f.floor - 0.1, disc), color: c, mirror: false },
+    {
+      shape: "torus",
+      at: [x, 0, disc],
+      size: [R - 0.03, 0.025],
+      color: light,
+      blend: 0.01,
+      mirror: false
+    },
+    {
+      ...cylinder([x, 0, 0], R * 0.62, disc, f.cutZ + 0.02),
+      color: c,
+      blend: 0.02,
+      mirror: false
+    }
+  ];
+}
+
 // src/kinds/head-armour.ts
 var RAD2 = Math.PI / 180;
 var shade = (c, k) => [c[0] * k, c[1] * k, c[2] * k];
-var above = (p, deg, op = "intersect") => {
+var above = (p, deg) => {
   const n = [0, -Math.sin(deg * RAD2), Math.cos(deg * RAD2)];
   return {
     shape: "roundBox",
     at: [p[0] + n[0], p[1] + n[1], p[2] + n[2]],
     size: [4, 4, 2],
     rotate: [deg, 0, 0],
-    op
+    op: "intersect"
   };
 };
 var slab = (p, deg, t) => ({
@@ -551,73 +723,97 @@ var slab = (p, deg, t) => ({
   rotate: [deg, 0, 0],
   op: "intersect"
 });
-var chestOf = (cx, s, b) => ({
-  at: [cx - 0.04, 0, b + 0.2],
-  r: [0.36, s * 0.75, 0.42]
+var ell = (at, r, g, roll) => ({
+  shape: "ellipsoid",
+  at,
+  size: [r[0] + g, r[1] + g, r[2] + g],
+  rotate: [roll, 0, 0]
 });
-function armour(p, cx, s, b, nz) {
+function plate(at, r, roll, cut, tilt, c, t) {
+  return [
+    {
+      group: [
+        ell(at, r, 0, roll),
+        ...t < Math.min(...r) * 0.6 ? [{ ...ell(at, r, -t, roll), op: "subtract" }] : [],
+        above(cut, tilt)
+      ],
+      color: c,
+      blend: 0.006
+    },
+    {
+      group: [
+        ell(at, r, 0.022, roll),
+        ...t < Math.min(...r) * 0.6 ? [{ ...ell(at, r, -t * 0.8, roll), op: "subtract" }] : [],
+        slab(cut, tilt, 0.05)
+      ],
+      color: shade(c, 1.3),
+      blend: 0.006
+    }
+  ];
+}
+function armour(p, f, cell = 0) {
+  const t = Math.max(0.085, cell * 2.5);
   const c = p.colors;
+  const { cx, s, b, nz } = f;
   const metal = c.metal;
   const out = [];
-  for (let k = 0;k < 3; k++) {
-    const at = [cx - 0.03, s * (0.78 + k * 0.1), b + 0.53 - k * 0.12];
-    const r = [0.31 - k * 0.02, 0.27 - k * 0.03, 0.19 - k * 0.02];
-    const tilt = -(28 + k * 14);
-    const cut = [at[0], at[1], at[2] - r[2] * 0.35];
-    out.push({
-      group: [{ shape: "ellipsoid", at, size: r }, above(cut, tilt)],
-      color: shade(metal, 1 - k * 0.12),
-      blend: 0.008
-    }, {
-      group: [
-        { shape: "ellipsoid", at, size: [r[0] + 0.018, r[1] + 0.018, r[2] + 0.018] },
-        slab(cut, tilt, 0.035)
-      ],
-      color: shade(metal, 0.55),
-      blend: 0.004
-    });
+  const cap = [cx - 0.04, s * 0.8, b + 0.66];
+  for (let k = 1;k >= 0; k--) {
+    const at = [cap[0], cap[1] + k * 0.07 * s, cap[2] - k * 0.17];
+    const r = k === 0 ? [0.27, 0.29, 0.25] : [0.23, 0.25, 0.19];
+    const tilt = -(38 + k * 14);
+    const cut = [at[0], at[1], at[2] - r[2] * 0.45];
+    out.push(...plate(at, r, -25 - k * 10, cut, tilt, shade(metal, 1 - k * 0.15), t));
     for (let j = 0;j < 4; j++) {
-      const t = (j - 1.5) * 0.11;
+      const x = at[0] + (j - 1.5) * 0.12;
       out.push({
         shape: "sphere",
-        at: [at[0] + t, at[1] + Math.sin(-tilt * RAD2) * r[1] * 0.55, cut[2] + 0.03],
-        size: 0.016,
-        color: shade(metal, 1.4),
+        at: [x, at[1] + r[1] * 0.62, cut[2] + 0.02 - r[1] * 0.62 * Math.tan(-tilt * RAD2) * 0.4],
+        size: 0.017,
+        color: shade(metal, 1.35),
         blend: 0.004
       });
     }
   }
+  const crest = [cap[0], cap[1] - 0.03, cap[2] + 0.25];
+  out.push({
+    shape: "ellipsoid",
+    at: crest,
+    size: [0.25, 0.028, 0.07],
+    rotate: [-22, 0, 0],
+    color: shade(metal, 0.75),
+    blend: 0.02
+  });
   for (let k = 0;k < 3; k++)
     out.push({
       shape: "cone",
-      at: [cx - 0.17 + k * 0.14, s * 0.84, b + 0.68 - Math.abs(k - 1) * 0.03],
-      size: [0.065, 0.006, 0.26 - Math.abs(k - 1) * 0.08],
-      rotate: alongZ(unit([(k - 1) * 0.35, 0.45, 1])),
+      at: [crest[0] - 0.14 + k * 0.14, crest[1] + 0.01, crest[2] + 0.02 - Math.abs(k - 1) * 0.03],
+      size: [0.075, 0.012, 0.36 - Math.abs(k - 1) * 0.12],
+      rotate: alongZ(unit([(k - 1) * 0.3, 0.55, 1])),
       color: c.teeth,
-      blend: 0.01
+      blend: 0.015
     });
-  const chest = chestOf(cx, s, b);
-  const grow = (g) => [chest.r[0] + g, chest.r[1] + g, chest.r[2] + g];
-  const band = [cx, 0, b + 0.28];
+  const band = [cx, 0, b + 0.36];
   out.push({
-    group: [{ shape: "ellipsoid", at: chest.at, size: grow(0.03) }, slab(band, 52, 0.17)],
+    group: [{ group: torsoForms(f, 0.03) }, slab(band, 50, 0.15), bustCut(f)],
     color: c.leather,
     blend: 0.006,
     mirror: false
   }, {
     group: [
-      { shape: "ellipsoid", at: chest.at, size: grow(0.055) },
+      { group: torsoForms(f, 0.055) },
+      bustCut(f),
       {
         shape: "roundBox",
-        at: [cx + 0.3, 0.02, b + 0.3],
-        size: [0.3, 0.15, 0.15],
-        rotate: [52, 0, 0],
+        at: [cx + 0.3, 0.02, b + 0.38],
+        size: [0.3, 0.14, 0.14],
+        rotate: [50, 0, 0],
         op: "intersect"
       },
       {
         shape: "ellipsoid",
-        at: [cx + 0.42, 0.02, b + 0.3],
-        size: [0.1, 0.045, 0.045],
+        at: [cx + 0.42, 0.02, b + 0.38],
+        size: [0.1, 0.04, 0.04],
         op: "subtract"
       }
     ],
@@ -626,60 +822,193 @@ function armour(p, cx, s, b, nz) {
     mirror: false
   });
   const fur = c.fur ?? c.leather;
-  const R = p.neck.radius + 0.1;
-  out.push({
-    shape: "torus",
-    at: [cx - 0.08, 0, nz + 0.02],
-    size: [R, 0.07],
-    color: shade(fur, 0.75),
-    blend: 0.04
-  });
-  for (let row = 0;row < 2; row++)
-    for (let i = 0;i < 10; i++) {
-      const a = (-85 + i * 20 + row * 10) * RAD2;
-      const rr = R + row * 0.05;
+  const R = f.n + 0.08;
+  for (let row = 0;row < 3; row++)
+    for (let i = 0;i < 8; i++) {
+      const a = (-80 + i * 22 + row * 11) * RAD2;
+      const rr = R + row * 0.07;
       const root = [
-        cx - 0.08 + Math.cos(a) * rr,
-        Math.abs(Math.sin(a)) * rr + 0.015,
-        nz + 0.07 - row * 0.06
+        cx - 0.1 - Math.abs(Math.cos(a)) * rr * 0.9,
+        Math.abs(Math.sin(a)) * rr + 0.02,
+        nz + 0.16 - row * 0.05
       ];
-      const dir = unit([Math.cos(a), Math.abs(Math.sin(a)), -0.5 - (i + row) % 2 * 0.35]);
+      const dir = unit([-0.7, Math.abs(Math.sin(a)) * 0.8, -0.55 - (i + row) % 2 * 0.3]);
       out.push({
         shape: "cone",
         at: root,
-        size: [0.07 - row * 0.01, 0.012, 0.13 + (i + row) % 3 * 0.03],
+        size: [0.075 - row * 0.008, 0.012, 0.16 + (i + row) % 3 * 0.04],
         rotate: alongZ(dir),
-        color: (i + row) % 2 ? fur : shade(fur, 0.7),
-        blend: 0.03
+        color: (i + row) % 2 ? fur : shade(fur, 0.72),
+        blend: 0.035
       });
     }
   return out;
 }
 
-// src/kinds/head-bust.ts
-function torso(p, cx, b) {
+// src/kinds/head-garb.ts
+var shade2 = (c, k) => [c[0] * k, c[1] * k, c[2] * k];
+function vest(p, f) {
   const c = p.colors;
-  return [
+  const { cx, s, b, nz, n } = f;
+  const scarf = c.scarf ?? c.cloth;
+  const hood = c.cape ?? shade2(c.cloth, 0.8);
+  const out = [
     {
-      shape: "ellipsoid",
-      at: [cx + 0.17, 0.16, b + 0.32],
-      size: [0.16, 0.19, 0.12],
-      rotate: [0, 0, 12],
-      color: c.skin,
-      blend: 0.07
+      group: [
+        { group: torsoForms(f, 0.032) },
+        {
+          shape: "ellipsoid",
+          at: [cx + 0.32, 0, nz + 0.01],
+          size: [0.2, 0.07, 0.11],
+          op: "subtract",
+          blend: 0.01
+        },
+        bustCut(f)
+      ],
+      color: c.cloth,
+      blend: 0.006
     },
     {
-      shape: "capsule",
-      at: [cx + 0.33, 0, b + 0.42],
-      to: [cx + 0.34, 0, b + 0.1],
-      size: 0.012,
-      op: "subtract",
+      group: [
+        { group: torsoForms(f, 0.065) },
+        {
+          shape: "roundBox",
+          at: [cx + 0.4, 0, b + 0.3],
+          size: [0.5, 0.3, 1],
+          rotate: [0, -8, 0],
+          round: 0.08,
+          op: "subtract",
+          blend: 0.02
+        },
+        {
+          shape: "sphere",
+          at: [cx - 0.03, s * 0.98, b + 0.42],
+          size: 0.17,
+          op: "subtract",
+          blend: 0.02
+        },
+        bustCut(f)
+      ],
+      color: c.leather,
+      blend: 0.006
+    },
+    {
+      group: [
+        { group: torsoForms(f, 0.088) },
+        {
+          shape: "roundBox",
+          at: [cx, 0, b + 0.38],
+          size: [4, 4, 0.08],
+          rotate: [-48, 0, 0],
+          op: "intersect"
+        },
+        bustCut(f)
+      ],
+      color: shade2(c.leather, 0.65),
+      blend: 0.004,
+      mirror: false
+    },
+    {
+      group: [
+        { group: torsoForms(f, 0.105) },
+        {
+          shape: "roundBox",
+          at: [cx + 0.3, -0.06, b + 0.32],
+          size: [0.3, 0.1, 0.1],
+          rotate: [-48, 0, 0],
+          op: "intersect"
+        },
+        {
+          shape: "roundBox",
+          at: [cx + 0.4, -0.06, b + 0.32],
+          size: [0.16, 0.05, 0.05],
+          rotate: [-48, 0, 0],
+          op: "subtract"
+        }
+      ],
+      color: c.metal,
+      blend: 0.003,
+      mirror: false
+    },
+    {
+      group: [
+        {
+          shape: "torus",
+          at: [cx - 0.1, 0, nz + 0.03],
+          size: [n + 0.12, 0.06],
+          rotate: [0, -28, 0]
+        },
+        {
+          shape: "roundBox",
+          at: [cx - 1.04, 0, nz],
+          size: [2, 4, 4],
+          op: "intersect",
+          blend: 0.04
+        }
+      ],
+      color: hood,
+      blend: 0.03
+    },
+    {
+      group: [
+        { shape: "ellipsoid", at: [cx - 0.33, 0, nz - 0.04], size: [0.13, s * 0.5, 0.25] },
+        {
+          shape: "cone",
+          at: [cx - 0.36, 0, nz - 0.12],
+          size: [0.1, 0.015, 0.34],
+          rotate: alongZ(unit([-0.35, 0, -1])),
+          blend: 0.05
+        },
+        {
+          shape: "ellipsoid",
+          at: [cx - 0.3, 0, nz + 0.12],
+          size: [0.08, s * 0.36, 0.1],
+          op: "subtract",
+          blend: 0.02,
+          color: shade2(hood, 0.35)
+        }
+      ],
+      color: hood,
       blend: 0.04,
-      color: c.shade,
       mirror: false
+    },
+    {
+      shape: "torus",
+      at: [cx - 0.04, 0, nz + 0.17],
+      size: [n + 0.05, 0.065],
+      rotate: [0, -12, 0],
+      color: scarf,
+      blend: 0.02
     }
   ];
+  const knot = [cx + n * 0.8, n + 0.04, nz + 0.13];
+  out.push({
+    shape: "ellipsoid",
+    at: knot,
+    size: [0.05, 0.06, 0.05],
+    color: shade2(scarf, 0.85),
+    blend: 0.02,
+    mirror: false
+  });
+  for (const [dy, len, tw] of [
+    [0.3, 0.2, 0.045],
+    [0.6, 0.16, 0.04]
+  ]) {
+    const dir = unit([0.3, dy, -1]);
+    out.push({
+      shape: "cone",
+      at: [knot[0] + 0.01, knot[1] + dy * 0.04, knot[2] - 0.02],
+      size: [tw, tw * 0.7, len],
+      rotate: alongZ(dir),
+      color: dy > 0.5 ? scarf : shade2(scarf, 0.8),
+      blend: 0.015,
+      mirror: false
+    });
+  }
+  return out;
 }
+
+// src/kinds/head-bust.ts
 function hood(p, cx, nz) {
   const c = p.colors;
   return [
@@ -725,14 +1054,17 @@ function hood(p, cx, nz) {
     }
   ];
 }
-function tunic(p, cx, s, b, nz) {
+function tunic(p, f) {
   const c = p.colors;
-  const chest = chestOf(cx, s, b);
-  const shell = (g) => ({
-    shape: "ellipsoid",
-    at: chest.at,
-    size: [chest.r[0] + g, chest.r[1] + g, chest.r[2] + g]
-  });
+  const { cx, s, b, nz } = f;
+  const shell = (g) => ({ group: torsoForms(f, g) });
+  const torso = sculptField2(torsoForms(f), { color: c.cloth, mirror: "y" }).field;
+  const front = (z) => {
+    let x = cx + 0.7;
+    for (let i = 0;i < 300 && torso([x, 0, z]) > 0; i++)
+      x -= 0.004;
+    return x;
+  };
   const n = p.neck.radius;
   const axis = (z) => [cx - 0.08, 0, z];
   const mantle = (g) => ({
@@ -760,7 +1092,8 @@ function tunic(p, cx, s, b, nz) {
       group: [
         mantle(0),
         { shape: "roundBox", at: [0, 0, b + 0.3 + 1], size: [4, 4, 2], op: "intersect" },
-        opening
+        opening,
+        bustCut(f)
       ],
       color: c.cape ?? c.leather,
       blend: 0.01
@@ -796,66 +1129,41 @@ function tunic(p, cx, s, b, nz) {
       blend: 0.004,
       mirror: false
     },
-    ...[0.42, 0.3, 0.18].map((z) => ({
-      group: [
-        shell(0.03),
-        { shape: "sphere", at: [cx + 0.3, 0, b + z], size: 0.03, op: "intersect" }
-      ],
+    ...[0.5, 0.38, 0.26].map((z) => ({
+      shape: "sphere",
+      at: [front(b + z) + 0.014, 0, b + z],
+      size: 0.028,
       color: c.metal,
-      blend: 0.003,
+      blend: 0.004,
       mirror: false
     }))
   ];
 }
-function bustEdits(p, l) {
+function bustEdits(p, l, cell = 0) {
   const c = p.colors;
-  const cx = l.cranium.at[0] + p.jaw.muzzle * 0.3;
-  const s = p.bust.shoulders;
-  const b = l.base;
-  const nz = b + 0.6;
-  const body = p.bust.style === "pauldrons" ? c.skin : c.cloth;
+  const f = frameOf(p, l);
+  const style = p.bust.style;
+  const bare = style === "pauldrons" || style === "vest";
   const e = [
-    { shape: "ellipsoid", at: chestOf(cx, s, b).at, size: chestOf(cx, s, b).r, color: body },
-    {
-      shape: "capsule",
-      at: [cx - 0.16, 0.1, nz + 0.16],
-      to: [cx - 0.1, s * 0.78, b + 0.44],
-      size: 0.15,
-      color: body,
-      blend: 0.15
-    },
-    { shape: "sphere", at: [cx - 0.04, s * 0.84, b + 0.3], size: 0.2, color: body, blend: 0.1 },
-    {
-      shape: "capsule",
-      at: [cx - 0.2, 0.08, nz + 0.3],
-      to: [cx - 0.1, s * 0.62, b + 0.5],
-      size: 0.1 + p.neck.radius * 0.2,
-      color: body,
-      blend: 0.12
-    },
+    ...bodyEdits(p, f, bare ? c.skin : c.cloth),
     {
-      shape: "capsule",
-      at: [cx - 0.08, 0, nz - 0.05],
-      to: [cx - 0.1, 0, nz + 0.12],
-      size: p.neck.radius * 1.05,
+      shape: "ellipsoid",
+      at: [f.cx - 0.09, 0, f.nz + 0.06],
+      size: [f.n * 1.02, f.n * 1.02, 0.12],
       color: c.skin,
-      blend: 0.03
+      blend: 0.04
     }
   ];
-  e.push({
-    shape: "roundBox",
-    at: [0, s + 1.02, b + 0.5],
-    size: [4, 2, 4],
-    op: "subtract",
-    color: body
-  });
-  if (p.bust.style === "pauldrons")
-    e.push(...torso(p, cx, b), ...armour(p, cx, s, b, nz));
-  else if (p.bust.style === "hood")
-    e.push(...hood(p, cx, nz));
+  if (style === "pauldrons")
+    e.push(...armour(p, f, cell));
+  else if (style === "hood")
+    e.push(...hood(p, f.cx, f.nz));
+  else if (style === "vest")
+    e.push(...vest(p, f));
   else
-    e.push(...tunic(p, cx, s, b, nz));
-  e.push({ shape: "roundBox", at: [0, 0, b - 1], size: [4, 4, 2], op: "subtract" });
+    e.push(...tunic(p, f));
+  e.push(...plinthEdits(p, f, cell * 1.5));
+  e.push({ shape: "roundBox", at: [0, 0, f.floor - 1], size: [4, 4, 2], op: "subtract" });
   return e;
 }
 
@@ -990,6 +1298,100 @@ function wartEdits(p, l, rng) {
   });
 }
 
+// src/kinds/head-mouth.ts
+function mouthEdits(p, l, teeth = true) {
+  const c = p.colors;
+  const lipT = p.mouth.lips;
+  const mw = p.mouth.width;
+  const g = p.mouth.grin;
+  const out = [
+    {
+      shape: "ellipsoid",
+      at: [l.mouthX - 0.01, 0, l.mouthZ + lipT * 0.7],
+      size: [0.032, mw, lipT],
+      color: c.lips,
+      blend: 0.03
+    },
+    {
+      shape: "ellipsoid",
+      at: [l.mouthX - 0.015 + p.jaw.underbite * 0.7, 0, l.mouthZ - lipT * 0.8],
+      size: [0.034 + p.jaw.underbite * 0.3, mw * 0.85, lipT * (1.1 + p.jaw.underbite * 4)],
+      color: c.lips,
+      blend: 0.03
+    }
+  ];
+  if (g < 0.4 || !teeth) {
+    out.push({
+      shape: "capsule",
+      at: [l.mouthX + 0.05, 0, l.mouthZ],
+      to: [l.mouthX - 0.03 - 0.02 * g, mw * 0.98, l.mouthZ + 0.012 + g * 0.05 - p.brow.scowl * 0.4],
+      size: 0.006 + g * 0.022,
+      op: "subtract",
+      blend: 0.012,
+      color: c.mouth
+    });
+    return out;
+  }
+  const h = 0.035 + g * 0.05;
+  const z0 = l.mouthZ + h * 0.45;
+  const back = mw * 0.55;
+  out.push({
+    group: [
+      { shape: "ellipsoid", at: [l.mouthX - back, 0, z0], size: [back + 0.06, mw, h] },
+      {
+        shape: "ellipsoid",
+        at: [l.mouthX - back + 0.02, 0, z0 + h * 0.7],
+        size: [back + 0.12, mw * 1.1, h * 0.9],
+        op: "subtract"
+      }
+    ],
+    op: "subtract",
+    blend: 0.012,
+    color: c.mouth
+  });
+  if (teeth)
+    out.push({
+      shape: "ellipsoid",
+      at: [l.mouthX - back * 0.9, 0, l.mouthZ - h * 0.4],
+      size: [back * 0.9, mw * 0.62, h * 0.45],
+      color: [0.42, 0.12, 0.12],
+      blend: 0.01
+    });
+  out.push({
+    shape: "ellipsoid",
+    at: [l.mouthX - 0.06, mw * 0.95, z0 + h * 0.6],
+    size: [0.05, 0.045, 0.04 + g * 0.01],
+    rotate: [-30, 0, 0],
+    blend: 0.035
+  });
+  const n = teeth ? 3 : 0;
+  for (let i = 0;i < n; i++) {
+    const a = (0.25 + i) * 0.36;
+    const y = Math.sin(a) * mw * 0.82;
+    const x = l.mouthX - 0.03 - (1 - Math.cos(a)) * back * 1.3;
+    const lo = z0 - h * Math.sqrt(Math.max(0, 1 - (y / mw) ** 2));
+    const hi = z0 + h * 0.7 - h * 0.9 * Math.sqrt(Math.max(0, 1 - (y / (mw * 1.1)) ** 2));
+    const len = 0.03 + g * 0.008 - i * 0.004;
+    const r = 0.014 + g * 0.004 - i * 0.0015;
+    out.push({
+      shape: "cone",
+      at: [x, y, hi + 0.008],
+      size: [r, 0.003, len],
+      rotate: alongZ([0.15, 0, -1]),
+      color: c.teeth,
+      blend: 0.004
+    }, {
+      shape: "cone",
+      at: [x - 0.006, y * 0.97, lo - 0.008],
+      size: [r * 0.85, 0.003, len * 0.6],
+      rotate: alongZ([0.1, 0, 1]),
+      color: c.teeth,
+      blend: 0.004
+    });
+  }
+  return out;
+}
+
 // src/kinds/head-face.ts
 function primaryEdits(l) {
   const [cx, , cz] = l.cranium.at;
@@ -1004,26 +1406,36 @@ function primaryEdits(l) {
     }
   ];
 }
-function skullEdits(p, l) {
+function skullEdits(p, l, cell = 0) {
+  const fine = cell < 0.03;
+  const tipR = Math.max(p.nose.tip, cell * 0.6);
   const c = p.colors;
   const cx = l.cranium.at[0];
   const [ex, ey, ez] = l.eye;
   const r = l.eyeR;
-  const lipT = p.mouth.lips;
   const mw = p.mouth.width;
   const [ax, ay, az] = l.angle;
   const [hx, hz] = l.hinge;
   const chin = l.chin;
   const tipX = l.faceX + 0.06 + p.nose.length * 0.25 + p.nose.bridge + p.jaw.muzzle * 0.5;
   const tipZ = l.noseZ + 0.035 - p.nose.hook;
+  const bIn = [ex + r * 0.75, 0.03, l.browZ - p.brow.scowl];
+  const bOut = [ex + r * 0.05, ey + r * 1.3, l.browZ + p.brow.scowl * 0.5];
   const e = [
     ...primaryEdits(l),
     {
       shape: "ellipsoid",
       at: [ex - 0.03, (ey + 0.06) * p.cheeks.width, ez - r - 0.065 * p.cheeks.size],
-      size: [0.09 * p.cheeks.size, 0.08 * p.cheeks.size, 0.065 * p.cheeks.size],
+      size: [0.075 * p.cheeks.size, 0.07 * p.cheeks.size, 0.055 * p.cheeks.size],
       rotate: [0, 0, 25],
-      blend: 0.09
+      blend: 0.08
+    },
+    {
+      shape: "capsule",
+      at: [ex - r * 0.2, (ey + 0.05) * p.cheeks.width, ez - r - 0.03],
+      to: [cx + 0.06, l.cranium.r[1] * 0.92, ez - 0.07],
+      size: 0.028 * p.cheeks.size,
+      blend: 0.05
     },
     {
       shape: "ellipsoid",
@@ -1054,9 +1466,10 @@ function skullEdits(p, l) {
     },
     { shape: "sphere", at: [ax + 0.02, ay * 0.95, az], size: 0.065, blend: 0.07 },
     {
-      shape: "ellipsoid",
+      shape: "roundBox",
       at: chin,
-      size: [0.065 * p.jaw.chin, 0.09 * p.jaw.chin, 0.07 * p.jaw.chin],
+      size: [0.13 * p.jaw.chin, 0.18 * p.jaw.chin, 0.14 * p.jaw.chin],
+      round: 0.06 * p.jaw.chin,
       blend: 0.06
     },
     {
@@ -1068,10 +1481,27 @@ function skullEdits(p, l) {
     },
     {
       shape: "capsule",
-      at: [ex + r * 0.75, 0.025, l.browZ - p.brow.scowl],
-      to: [ex + r * 0.1, ey + r * 1.25, l.browZ + p.brow.scowl * 0.5],
-      size: p.brow.ridge,
-      blend: 0.06
+      at: [cx - 0.03, l.cranium.r[1] * 0.68, ez - 0.28],
+      to: [cx + p.neck.radius * 0.6, 0.05, l.base + 0.74],
+      size: p.neck.radius * 0.26,
+      blend: 0.05
+    },
+    {
+      shape: "ellipsoid",
+      at: [(bIn[0] + bOut[0]) / 2, (bIn[1] + bOut[1]) / 2, (bIn[2] + bOut[2]) / 2],
+      size: [
+        Math.hypot(bOut[0] - bIn[0], bOut[1] - bIn[1], bOut[2] - bIn[2]) / 2 + p.brow.ridge * 0.6,
+        p.brow.ridge * 1.25,
+        p.brow.ridge * 0.85
+      ],
+      rotate: alongX([bOut[0] - bIn[0], bOut[1] - bIn[1], bOut[2] - bIn[2]]),
+      blend: 0.05
+    },
+    {
+      shape: "sphere",
+      at: [bIn[0] - 0.01, 0, bIn[2] - p.brow.ridge * 0.15],
+      size: p.brow.ridge * 1.05,
+      blend: 0.05
     },
     { shape: "sphere", at: l.eye, size: r * 1.12, op: "subtract", blend: r * 0.5, color: c.shade }
   ];
@@ -1094,56 +1524,50 @@ function skullEdits(p, l) {
     };
   };
   e.push(lid(p.eyes.lid, true), lid(p.eyes.lowerLid, false));
+  const long = p.nose.bridge > 0.06 ? 0.65 : 1;
+  const wing = Math.min(1.4, Math.max(0.55, p.nose.width / 0.065)) * long;
+  const rootR = Math.max(0.02 + p.nose.width * 0.6, cell * 0.65);
+  const wingX = Math.min(tipX - p.nose.tip * 1.2, l.faceX + 0.1 + p.jaw.muzzle * 0.5);
   const noseRoot = [ex + r * 0.4, 0, ez - r * 0.4];
   const noseDir = [tipX - noseRoot[0], 0, tipZ + 0.01 - noseRoot[2]];
   const midNose = [
     (ex + r * 0.6 + tipX) / 2,
     0,
-    (ez - 0.02 + tipZ) / 2 + p.nose.hook * 0.6 + 0.01
+    (ez - 0.02 + tipZ) / 2 + p.nose.hook * 0.3 + 0.01
   ];
   e.push({
     shape: "cone",
     at: noseRoot,
-    size: [0.02 + p.nose.width * 0.6, p.nose.tip * 0.8, Math.hypot(...noseDir)],
+    size: [rootR, tipR * 0.85, Math.hypot(...noseDir)],
     rotate: alongZ(noseDir),
-    blend: 0.04
-  }, { shape: "sphere", at: midNose, size: 0.02 + p.nose.width * 0.2, blend: 0.04 }, { shape: "sphere", at: [tipX, 0, tipZ], size: p.nose.tip, blend: 0.03 }, {
+    blend: 0.045
+  }, {
+    shape: "sphere",
+    at: midNose,
+    size: (rootR + tipR) / 2 * 0.85 + Math.max(0, p.nose.hook) * 0.12,
+    blend: 0.05
+  }, { shape: "sphere", at: [tipX, 0, tipZ], size: tipR, blend: 0.035 }, ...p.nose.hook > 0.04 ? [
+    {
+      shape: "cone",
+      at: [tipX, 0, tipZ],
+      size: [tipR * 0.9, 0.01, p.nose.tip + p.nose.hook * 1.2],
+      rotate: alongZ([0.6, 0, -1]),
+      blend: 0.03
+    }
+  ] : [], {
     shape: "ellipsoid",
-    at: [tipX - p.nose.tip * 1.2, p.nose.width, l.noseZ + 0.02],
-    size: [0.045, 0.035, 0.032],
+    at: [wingX, p.nose.width, l.noseZ + 0.02],
+    size: [0.045 * wing, 0.035 * wing, 0.032 * wing],
     blend: 0.025
   }, {
     shape: "ellipsoid",
-    at: [tipX - p.nose.tip * 0.6, p.nose.width * 0.55, l.noseZ + 0.005],
-    size: [0.022, 0.014, 0.012],
+    at: [Math.min(tipX - p.nose.tip * 0.6, wingX + 0.035), p.nose.width * 0.55, l.noseZ + 0.005],
+    size: [0.022 * wing, 0.014 * wing, 0.012 * wing],
     op: "subtract",
     blend: 0.008,
     color: c.mouth
   });
-  const g = p.mouth.grin;
-  e.push({
-    shape: "ellipsoid",
-    at: [l.mouthX - 0.01, 0, l.mouthZ + lipT * 0.7],
-    size: [0.032, mw, lipT],
-    color: c.lips,
-    blend: 0.03
-  }, {
-    shape: "ellipsoid",
-    at: [l.mouthX - 0.015 + p.jaw.underbite * 0.7, 0, l.mouthZ - lipT * 0.8],
-    size: [0.034, mw * 0.85, lipT * 1.1],
-    color: c.lips,
-    blend: 0.03
-  }, {
-    shape: "capsule",
-    at: [l.mouthX + 0.05, 0, l.mouthZ],
-    to: [l.mouthX - 0.03 - 0.02 * g, mw * 0.98, l.mouthZ + 0.012 + g * 0.05],
-    size: 0.006 + g * 0.022,
-    op: "subtract",
-    blend: 0.012,
-    color: c.mouth
-  });
-  if (g > 0.15)
-    e.push(...teethRows(p, l));
+  e.push(...mouthEdits(p, l, fine));
   const fold = unit([-0.02, mw - p.nose.width, l.mouthZ - l.noseZ]);
   e.push({
     shape: "ellipsoid",
@@ -1154,31 +1578,22 @@ function skullEdits(p, l) {
     blend: 0.03,
     color: c.shade
   });
-  return e;
-}
-function teethRows(p, l) {
-  const out = [];
-  const mw = p.mouth.width * 0.8;
-  for (let i = 0;i < 4; i++) {
-    const a = (i + 0.5) / 4 * 0.9;
-    const y = Math.sin(a) * mw;
-    const x = l.mouthX - 0.025 - (1 - Math.cos(a)) * mw * 0.9;
-    const z = l.mouthZ + 0.004 + p.mouth.grin * 0.03 * (i / 4);
-    for (const [dz, h] of [
-      [0.016, 0.02],
-      [-0.016, 0.018]
-    ])
-      out.push({
-        shape: "roundBox",
-        at: [x, y, z + dz * (1 + p.mouth.grin)],
-        size: [0.02, 0.028, h * (1 + p.mouth.grin * 0.6)],
-        round: 0.006,
-        rotate: [0, 0, a * 180 / Math.PI],
-        color: p.colors.teeth,
-        blend: 0.003
-      });
+  const [, , cz] = l.cranium.at;
+  const [crx, , crz] = l.cranium.r;
+  for (let i = 0;i < (p.wrinkles ?? 0); i++) {
+    const z = l.browZ + 0.07 + i * 0.05;
+    const x = cx + crx * Math.sqrt(Math.max(0, 1 - ((z - cz) / crz) ** 2)) + 0.005;
+    e.push({
+      shape: "ellipsoid",
+      at: [x, 0.06, z - 0.008],
+      size: [0.05, 0.08 - i * 0.012, 0.005],
+      rotate: [-14, -12, 0],
+      op: "paint",
+      blend: 0.01,
+      color: c.shade
+    });
   }
-  return out;
+  return e;
 }
 
 // src/kinds/head-hair.ts
@@ -1189,31 +1604,40 @@ function hairEdits(p, l) {
   const [rx, ry, rz] = l.cranium.r;
   const top = l.crown;
   switch (p.hair) {
-    case "topknot":
+    case "topknot": {
+      const root = [cx - 0.14, 0, top - 0.03];
+      const rise = [cx - 0.2, 0, top + 0.13];
+      const fall = [cx - 0.38, 0, top + 0.02];
+      const tip = [cx - rx - 0.08, 0, cz - 0.12];
+      const seg = (a, b, r0, r1) => ({
+        shape: "cone",
+        at: a,
+        size: [r0, r1, Math.hypot(b[0] - a[0], b[1] - a[1], b[2] - a[2])],
+        rotate: alongZ([b[0] - a[0], b[1] - a[1], b[2] - a[2]]),
+        blend: 0.03
+      });
+      const ring = (at, deg) => ({
+        shape: "torus",
+        at,
+        size: [0.07, 0.018],
+        rotate: [0, deg, 0],
+        color: p.colors.metal,
+        blend: 0.004
+      });
       return [
-        { shape: "ellipsoid", at: [cx - 0.12, 0, top - 0.02], size: [0.11, 0.08, 0.07], color: h },
         {
-          shape: "sphere",
-          at: [cx - 0.16, 0, top + 0.07],
-          size: 0.075,
-          color: h,
-          blend: 0.03
-        },
-        {
-          shape: "capsule",
-          at: [cx - 0.2, 0, top + 0.08],
-          to: [cx - 0.42, 0, top - 0.25],
-          size: 0.04,
+          group: [
+            seg(root, rise, 0.085, 0.075),
+            seg(rise, fall, 0.08, 0.07),
+            seg(fall, tip, 0.07, 0.015)
+          ],
           color: h,
-          blend: 0.04
+          blend: 0.02
         },
-        {
-          shape: "torus",
-          at: [cx - 0.17, 0, top + 0.02],
-          size: [0.06, 0.018],
-          color: p.colors.metal
-        }
+        ring([root[0] - 0.02, 0, root[2] + 0.06], -15),
+        ring([root[0] - 0.04, 0, root[2] + 0.11], -25)
       ];
+    }
     case "mohawk":
       return Array.from({ length: 6 }, (_, i) => {
         const a = (-20 + i * 26) * RAD4;
@@ -1282,20 +1706,48 @@ function hairEdits(p, l) {
         lock(120, 30, 30, 0.05, 0)
       ];
     }
-    case "tufts":
-      return Array.from({ length: 5 }, (_, i) => {
-        const a = (i / 4 - 0.5) * 1.6;
-        const base = [cx - 0.1 + Math.cos(a) * 0.05, Math.sin(a) * 0.12, top - 0.04];
-        return {
-          shape: "cone",
-          at: base,
-          size: [0.025, 0.004, 0.12 + i % 2 * 0.05],
-          rotate: alongZ([-0.6, Math.sin(a) * 0.8, 1]),
+    case "tufts": {
+      const out = [];
+      const spots = [
+        [10, 78, 0.26],
+        [-25, 70, 0.22],
+        [40, 62, 0.22],
+        [150, 55, 0.2],
+        [115, 30, 0.2],
+        [100, 16, 0.18],
+        [-120, 40, 0.18]
+      ];
+      for (const [az, el, len] of spots) {
+        const a = az * RAD4;
+        const e = el * RAD4;
+        const n = [Math.cos(e) * Math.cos(a), Math.cos(e) * Math.sin(a), Math.sin(e)];
+        const root = [cx - 0.04 + rx * 0.97 * n[0], ry * 0.97 * n[1], cz + rz * 0.97 * n[2]];
+        const d1 = [n[0] - 0.6, n[1] * 1.3, n[2] * 0.6 + 0.25];
+        const l1 = Math.hypot(...d1);
+        const mid = [
+          root[0] + d1[0] / l1 * len * 0.55,
+          root[1] + d1[1] / l1 * len * 0.55,
+          root[2] + d1[2] / l1 * len * 0.55
+        ];
+        const d2 = [d1[0] - 0.5, d1[1] * 1.6, -0.9];
+        out.push({
+          group: [
+            { shape: "cone", at: root, size: [0.026, 0.014, len * 0.58], rotate: alongZ(d1) },
+            {
+              shape: "cone",
+              at: mid,
+              size: [0.015, 0.004, len * 0.6],
+              rotate: alongZ(d2),
+              blend: 0.008
+            }
+          ],
           color: h,
-          blend: 0.01,
-          mirror: false
-        };
-      });
+          blend: 0.012,
+          mirror: az !== 10 && az !== -25 && az !== -120
+        });
+      }
+      return out;
+    }
     case "braids":
       return [
         { ...capOf(l, h) },
@@ -1461,10 +1913,46 @@ function creaseNormals(m, minDot = 0.2) {
   return { ...m, normals };
 }
 
+// src/kinds/head-tone.ts
+function toned(field, colorAt, o) {
+  const k = o.strength ?? 1;
+  const d = o.reach;
+  const e = d * 0.25;
+  return (q) => {
+    const c = colorAt(q);
+    const [x, y, z] = q;
+    const gx = field([x + e, y, z]) - field([x - e, y, z]);
+    const gy = field([x, y + e, z]) - field([x, y - e, z]);
+    const gz = field([x, y, z + e]) - field([x, y, z - e]);
+    const gl = Math.hypot(gx, gy, gz) || 1;
+    const n = [gx / gl, gy / gl, gz / gl];
+    let occ = 0;
+    for (let i = 1;i <= 3; i++) {
+      const t = d * i / 3;
+      occ += Math.max(0, t - field([x + n[0] * t, y + n[1] * t, z + n[2] * t])) / t / i;
+    }
+    const cav = Math.min(1, occ * 2.5) * k;
+    const up = n[2] * k;
+    const lift = up > 0 ? 1 + up * 0.22 : 1 + up * 0.3;
+    const warm = up > 0 ? [1 + up * 0.12, 1 + up * 0.05, 1 - up * 0.15] : [1 + up * 0.1, 1, 1 - up * 0.12];
+    const dark = 1 - cav * 0.55;
+    const lum = (c[0] + c[1] + c[2]) / 3;
+    const sat = 1 + cav * 0.35;
+    return [
+      clamp((lum + (c[0] - lum) * sat) * dark * lift * warm[0]),
+      clamp((lum + (c[1] - lum) * sat) * dark * lift * warm[1]),
+      clamp((lum + (c[2] - lum) * sat) * dark * lift * warm[2])
+    ];
+  };
+}
+var clamp = (v) => Math.min(Math.max(v, 0), 1);
+
 // src/kinds/head-mesh.ts
+var REACH = 0.05;
+var PLINTH2 = [0.16, 0.15, 0.15];
 function jawRegion(p, l) {
   const chin = l.chin;
-  const reach = Math.max(p.mouth.width * 1.25, (p.tusks?.spread ?? 0) + p.mouth.width * 0.5);
+  const reach = Math.max(p.mouth.width * 1.08, (p.tusks?.spread ?? 0) + p.mouth.width * 0.5);
   const centre = [l.mouthX - 0.15, 0, l.mouthZ];
   const radii = [Math.max(0.27, l.mouthX - chin[0] + 0.2), reach, l.mouthZ - chin[2] + 0.1];
   const e = sd2.ellipsoid(centre, radii);
@@ -1496,7 +1984,7 @@ function headAndJaw(p, l, set, res) {
   const region = jawRegion(p, l);
   const cut = region.field;
   const lap = res * 0.75;
-  const proud = res * 0.15;
+  const proud = res * 0.03;
   const ears = set.ears.length > 0 ? [{ group: set.ears, blend: 0.02 }] : [];
   const tusks = set.tusks.length > 0 ? [{ group: set.tusks, blend: 0.01 }] : [];
   const h = sculptField2([...set.skull, ...ears, { ...regionGroup(l, region, 0), op: "subtract" }], opts);
@@ -1504,6 +1992,9 @@ function headAndJaw(p, l, set, res) {
   const jField = (q) => jRaw.field(q) - proud;
   const mouth = p.colors.mouth;
   const skull = sculptField2(set.skull, opts).field;
+  const extra = (e) => e.length > 0 ? ((f) => (q) => Math.min(skull(q), f(q)))(sculptField2(e, opts).field) : skull;
+  const headTone = extra(set.ears);
+  const jawTone = extra(set.tusks);
   const deep = -Math.max(res * 4, 0.03);
   const paint = (colorAt) => (q) => Math.abs(cut(q)) < res * 1.5 && skull(q) < deep ? mouth : colorAt(q);
   const [ec, er] = [region.centre, region.radii];
@@ -1516,14 +2007,14 @@ function headAndJaw(p, l, set, res) {
     field: h.field,
     bounds: h.bounds,
     resolution: res,
-    color: paint(h.colorAt),
+    color: toned(headTone, paint(h.colorAt), { reach: REACH }),
     symmetry: "y"
   });
   const jaw = sdf2({
     field: jField,
     bounds: unionBounds(jb, tb),
     resolution: res,
-    color: paint(jRaw.colorAt),
+    color: toned(jawTone, paint(jRaw.colorAt), { reach: REACH }),
     symmetry: "y"
   });
   if (res > 0.03)
@@ -1534,13 +2025,29 @@ function headAndJaw(p, l, set, res) {
     jaw: creaseNormals(sharpenRim(jaw, jawSkull, (q) => cut(q) - lap, jField, res))
   };
 }
+function onCut(cut, q, n, res) {
+  if (Math.abs(cut(q)) > res * 0.8)
+    return false;
+  const e = res * 0.5;
+  const g = [
+    cut([q[0] + e, q[1], q[2]]) - cut([q[0] - e, q[1], q[2]]),
+    cut([q[0], q[1] + e, q[2]]) - cut([q[0], q[1] - e, q[2]]),
+    cut([q[0], q[1], q[2] + e]) - cut([q[0], q[1], q[2] - e])
+  ];
+  const l = Math.hypot(g[0], g[1], g[2]) || 1;
+  return (g[0] * n[0] + g[1] * n[1] + g[2] * n[2]) / l > 0.85;
+}
 function bustMesh(p, set, res) {
   const s = sculptField2(set.bust, { color: p.colors.skin, mirror: "y" });
+  const tone = toned(s.field, s.colorAt, { reach: REACH * 1.4 });
+  const cut = set.bustCut;
+  const base = p.colors.plinth ?? PLINTH2;
+  const face = [base[0] * 1.3, base[1] * 1.3, base[2] * 1.3];
   return sdf2({
     field: s.field,
     bounds: s.bounds,
     resolution: res,
-    color: (q) => s.colorAt(q),
+    color: cut ? (q, n) => onCut(cut, q, n, res) ? face : tone(q) : tone,
     symmetry: "y"
   });
 }
@@ -1594,7 +2101,9 @@ var ZERO_OK = new Set([
   "jaw.drop",
   "jaw.muzzle",
   "brow.overhang",
-  "brow.hair"
+  "brow.hair",
+  "bust.mass",
+  "wrinkles"
 ]);
 function checkHead2(p) {
   if (!(p.height >= 0.05 && p.height <= 3))
@@ -1658,33 +2167,33 @@ var human = {
 };
 var orc = {
   height: 0.3,
-  cranium: { width: 0.7, depth: 0.8, height: 0.34 },
-  brow: { ridge: 0.065, overhang: 0.075, scowl: 0.035 },
-  cheeks: { size: 1.35, width: 1.15 },
-  jaw: { muzzle: 0.1, width: 0.37, chin: 1.6, underbite: 0.07, drop: 0.1 },
-  nose: { length: 0.15, width: 0.09, tip: 0.04, hook: -0.01, bridge: -0.045 },
-  ears: { shape: "pointed", length: 0.3, width: 0.17, sweep: 25, lift: 8 },
-  eyes: { radius: 0.05, spacing: 0.155, line: 0.56, lid: 16, lowerLid: 26 },
-  mouth: { width: 0.17, lips: 0.03, grin: 0 },
-  tusks: { length: 0.27, radius: 0.05, spread: 0.14, flare: 0.35 },
-  neck: { radius: 0.32 },
-  bust: { shoulders: 1.05, style: "pauldrons" },
+  cranium: { width: 0.7, depth: 0.74, height: 0.31 },
+  brow: { ridge: 0.075, overhang: 0.06, scowl: 0.04 },
+  cheeks: { size: 1.3, width: 1.15 },
+  jaw: { muzzle: 0.1, width: 0.4, chin: 1.3, underbite: 0.1, drop: 0.1 },
+  nose: { length: 0.15, width: 0.1, tip: 0.042, hook: -0.01, bridge: -0.05 },
+  ears: { shape: "pointed", length: 0.38, width: 0.19, sweep: 30, lift: 10 },
+  eyes: { radius: 0.054, spacing: 0.155, line: 0.56, lid: 10, lowerLid: 22 },
+  mouth: { width: 0.17, lips: 0.034, grin: 0 },
+  tusks: { length: 0.22, radius: 0.055, spread: 0.15, flare: 0.35 },
+  neck: { radius: 0.38 },
+  bust: { shoulders: 1, style: "pauldrons", mass: 1 },
   hair: "topknot",
   beard: "none",
   warts: 6,
   colors: {
-    skin: hex2("#5f8b3a"),
-    shade: hex2("#3c5c24"),
+    skin: hex2("#5c8034"),
+    shade: hex2("#33501e"),
     lips: hex2("#4f6f30"),
     sclera: hex2("#8a5a1a"),
     iris: hex2("#ffb030"),
     pupil: hex2("#140a06"),
     teeth: hex2("#e2d6b0"),
     mouth: hex2("#2a0e0c"),
-    hair: hex2("#1c1714"),
+    hair: hex2("#231a14"),
     cloth: hex2("#6b2a20"),
     leather: hex2("#5a3a22"),
-    metal: hex2("#6e6a62"),
+    metal: hex2("#55524d"),
     fur: hex2("#5e4a34"),
     paint: hex2("#8a1c12")
   }
@@ -1692,19 +2201,20 @@ var orc = {
 var goblin = {
   height: 0.19,
   cranium: { width: 0.66, depth: 0.84, height: 0.5 },
-  brow: { ridge: 0.03, overhang: 0.015, scowl: 0.025 },
-  cheeks: { size: 1.15, width: 1.1 },
-  jaw: { muzzle: 0.06, width: 0.2, chin: 0.85, underbite: 0, drop: 0 },
-  nose: { length: 0.2, width: 0.07, tip: 0.05, hook: 0.07, bridge: 0.12 },
-  ears: { shape: "pointed", length: 0.62, width: 0.3, sweep: 22, lift: 18 },
-  eyes: { radius: 0.072, spacing: 0.15, line: 0.5, lid: 16, lowerLid: 26 },
-  mouth: { width: 0.2, lips: 0.016, grin: 0.75 },
+  brow: { ridge: 0.032, overhang: 0.02, scowl: 0.03 },
+  cheeks: { size: 1.05, width: 1.05 },
+  jaw: { muzzle: 0.05, width: 0.19, chin: 0.72, underbite: 0, drop: 0 },
+  nose: { length: 0.2, width: 0.06, tip: 0.046, hook: 0.065, bridge: 0.13 },
+  ears: { shape: "pointed", length: 0.66, width: 0.3, sweep: 24, lift: 6 },
+  eyes: { radius: 0.08, spacing: 0.155, line: 0.5, lid: 30, lowerLid: 20 },
+  mouth: { width: 0.21, lips: 0.014, grin: 0.8 },
   tusks: null,
-  neck: { radius: 0.2 },
-  bust: { shoulders: 0.75, style: "hood" },
+  neck: { radius: 0.14 },
+  bust: { shoulders: 0.52, style: "vest", mass: 0 },
   hair: "tufts",
   beard: "none",
   warts: 4,
+  wrinkles: 3,
   colors: {
     skin: hex2("#9cb84a"),
     shade: hex2("#6a8a2c"),
@@ -1714,10 +2224,12 @@ var goblin = {
     pupil: hex2("#120c04"),
     teeth: hex2("#e8dcae"),
     mouth: hex2("#3a1010"),
-    hair: hex2("#3a3024"),
-    cloth: hex2("#6a4a7a"),
-    leather: hex2("#5a3a22"),
-    metal: hex2("#a88a4a")
+    hair: hex2("#c8c0b0"),
+    cloth: hex2("#b8a47c"),
+    cape: hex2("#4e5e3a"),
+    leather: hex2("#6b4428"),
+    metal: hex2("#a88a4a"),
+    scarf: hex2("#9a3a24")
   }
 };
 var dwarf = {
@@ -1783,6 +2295,7 @@ function seatEyes(p, l) {
   const r = l.eyeR;
   return { ...l, eye: [x - r * 0.7 - p.brow.overhang * 0.3, ey, ez] };
 }
+var BUST_CELL = 1.6;
 var HEAD_RES2 = [0.02, 0.045, 0.14];
 function headEdits2(p, rng, lod = 0) {
   const l = seatEyes(p, headLayout(p));
@@ -1792,7 +2305,7 @@ function headEdits2(p, rng, lod = 0) {
   return {
     layout: l,
     skull: [
-      ...skullEdits(p, l),
+      ...skullEdits(p, l, res),
       ...hair,
       ...browEdits(p, l),
       ...beardEdits(p, l),
@@ -1801,7 +2314,8 @@ function headEdits2(p, rng, lod = 0) {
     ],
     ears: earEdits(p, l, res * 0.7),
     tusks: tuskEdits(p, l, res * 0.45),
-    bust: bustEdits(p, l)
+    bust: bustEdits(p, l, res * BUST_CELL),
+    bustCut: cutField(frameOf(p, l))
   };
 }
 function head2(ctx, o = {}) {
@@ -1811,7 +2325,7 @@ function head2(ctx, o = {}) {
   const H = p.height;
   const res = HEAD_RES2[ctx.lod];
   const { head: hm, jaw: jm } = headAndJaw(p, l, set, res);
-  const bm = bustMesh(p, set, res * 1.6);
+  const bm = bustMesh(p, set, res * BUST_CELL);
   const eye = eyeMesh(p, l.eyeR, l.eyeR / ctx.pick([7, 3.5, 2.2]));
   const [ox, oy, oz] = o.at ?? [0, 0, 0];
   const toWorld = (m, at = [0, 0, 0]) => place2(m, { scale: H, at: [ox + at[0] * H, oy + at[1] * H, oz + (at[2] - l.base) * H] });
@@ -3567,5 +4081,5 @@ function propeller2(ctx, o) {
 }
 export { mass2, opening2, facade2, setbacks2, checkHead2, HEADS2, headParams2, HEAD_RES2, headEdits2, head2, hullLines2, hullMesh2, hull2, creature2, roofHeightAt2, ridgeHeight2, roofMesh2, roof2, roofInfo2, oak2, pine2, palm2, birch2, willow2, SPECIES2, treeParams2, tree2, treeReal2, trees2, axle2, whyteAxles2, trackRun2, propeller2 };
 
-//# debugId=5C8F10A02B6E9AB264756E2164756E21
-//# sourceMappingURL=chunk-1ypfs7ga.js.map
+//# debugId=AF041752F55E532164756E2164756E21
+//# sourceMappingURL=chunk-8j4c28jt.js.map