azeroth-shell 0.1.2 → 0.3.0

package/src/cli/tuiPartyStage.mjs

@@ -0,0 +1,206 @@
+// The party stage: a dungeon pull or a squad fight drawn the way the duel is, every body small on one floor.
+// The party stands down the left (you in your gear, the companions in theirs, the pets a size under), the pack
+// down the right, and each column stands where its unit really is: its yards projected onto the line from
+// where the party opened to where the pack stood, so the tank runs in, the healer hangs back and a mob that
+// chases a caster crosses over. Under every sprite a narrow plate (name, HP, power) and a state row (a cast
+// bar filling under the spell's name, crowd control, dead); hits rise over the head; missiles cross the lane.
+// The boxes shrink with the crowd: the widest size whose rows and columns fit, down to the smallest, after
+// which the furthest foes and the pets are hidden and counted on the floor.
+import { dim, gray, fit } from './text.mjs';
+import { SIZES, canvas, put, putLines, putRight, floorLine, narrowPlate, narrowState, auraRows, putMissiles, putPopsAbove, POP_MS, LUNGE_MS } from './tuiStage.mjs';
+import { creatureArt, artWidth } from './modelArt.mjs';
+import { paperdollArt } from './paperdoll.mjs';
+import { playerArt, wornNow, wornArt } from './tuiViews.mjs';
+import { iconsOn } from './iconArt.mjs';
+import { allyIndexOfSide } from '../engine/core/events.ts';
+import { combatDistanceYd, DEFAULT_OPEN_YD, MELEE_CONTACT_YD } from '../engine/combat/combatGeometry.ts';
+
+const GAP = 1;        // columns between two columns of the same side
+const LANE = 6;       // columns kept open between a party column and a foe column, for the glyphs that cross
+const PLATE_MIN = 9;  // a plate's narrowest: a 5-cell bar and "100%"
+const PLATE_FULL = 14; // and its widest when the stage has width to spare: a 10-cell bar, a 12-letter name
+const SWAP_YD = 2;    // how much clearer of a neighbour a unit must be, in yards, before the two trade places
+const SIZE_ORDER = ['xs', 's', 'm', 'l'];
+// Who stands nearest the foes among units on the same spot (the melee pile opens on one): the healer last.
+const ROLE_RANK = { healer: 0, damage: 2, tank: 3 };
+
+/** The companion an ally seat holds: ally_N is squad[N] (the humans first), else the one of that name. */
+function companionOf(app, v) {
+  const squad = app.g.state.squad ?? [];
+  const i = allyIndexOfSide(v.side);
+  const byIndex = i >= 0 && i < squad.length ? squad[i] : null;
+  return byIndex?.name === v.name ? byIndex : squad.find((c) => c.name === v.name) ?? byIndex;
+}
+
+/** A unit's sprite in a box: you or a companion in your form or gear, a creature by its display id. */
+function spriteOf(app, u, cols, rows) {
+  if (u.isPlayer) return playerArt(app, cols, rows, u.v)?.lines ?? null;
+  if (u.v.creatureEntry != null) return creatureArt(app.ds.creature(u.v.creatureEntry)?.displayId, cols, rows);
+  const comp = u.friend ? companionOf(app, u.v) : null;
+  if (!comp) return null;
+  return wornArt(wornNow(app.ds, comp, u.v), cols, rows) ?? paperdollArt(comp, cols, rows);
+}
+
+/** The box a unit gets when the big ones get `size`: pets a size under, a boss a size over. */
+function sizeOf(u, size) {
+  const i = SIZE_ORDER.indexOf(size);
+  if (u.small) return SIZE_ORDER[Math.max(0, i - 1)];
+  if (u.rank === 3) return SIZE_ORDER[Math.min(SIZE_ORDER.length - 1, i + 1)];
+  return size;
+}
+
+/**
+ * The party stage W x H: H lines each W wide, or null when the rows or the columns leave the sprites no
+ * room (the frames list draws instead). `inline` is the autopilot's run panel (the ability bar's keys dim).
+ */
+export function partyStage(app, ctl, W, H, { inline }) {
+  const s = ctl.session, now = ctl.clock(), mem = ctl.frames;
+  const pv = s.playerView(), pet = s.petView(), focus = s.enemyView();
+  const icons = iconsOn();
+  const petSides = new Set((s.companionPets?.() ?? []).map((p) => p.side));
+  const rankOf = (v) => { const c = v.creatureEntry != null ? app.ds.creature(v.creatureEntry) : null; return c?.rank ?? c?.scaling?.rank ?? 0; };
+  const order = (v, fallback) => ROLE_RANK[v.groupRole] ?? (v.mode === 'ranged' ? 1 : fallback);
+  const units = [
+    { v: pv, key: 'player', isPlayer: true, friend: true, role: pv.groupRole, order: order(pv, 2.5) },
+    ...(pet ? [{ v: pet, key: pet.side ?? pet.name, friend: true, small: true, order: 2 }] : []),
+    ...s.alliesView().map((v) => ({ v, key: v.side, friend: true, small: petSides.has(v.side) || !!v.summoned, role: v.groupRole, order: order(v, 2) })),
+    ...s.enemiesView().map((v) => ({ v, key: v.side, foe: true, focused: v === focus, rank: rankOf(v), order: v === focus ? 0 : 1 })),
+  ];
+  // Rows the scene keeps whatever the sprites get: the plate (3), the state row, the floor and the ability bar
+  // (dropped under auto-play when rows are short); the aura strip only when the sprites still get a box after it.
+  const barLines = ctl.abilityRows(W, W >= 140 ? 6 : 4, { live: !inline });
+  let barRows = barLines.length;
+  const auraH = icons ? 3 : 1;
+  let fixed = 3 + 1 + 1 + barRows;
+  if (H - fixed < SIZES.xs[1] && ctl.auto) { barRows = 0; fixed = 5; }
+  const showAuras = H - fixed - auraH >= SIZES.s[1];
+  if (showAuras) fixed += auraH;
+  const artRows = H - fixed;
+  if (artRows < SIZES.xs[1]) return null;
+  // The widest size whose rows fit and whose columns fit the width: every column its sprite's width or a plate
+  // at least PLATE_MIN wide, a gap between neighbours, one lane between the sides, a margin at each edge. When
+  // even the smallest does not fit, the foes you do not face go first (from the far end), then the pets, then
+  // the party's tail, and the floor counts them.
+  const margin = Math.max(GAP, Math.floor(W / 40));
+  const columnOf = (u, size) => {
+    const box = SIZES[sizeOf(u, size)];
+    const art = spriteOf(app, u, box[0], Math.min(box[1], artRows));
+    const cw = Math.max(PLATE_MIN, art ? artWidth(art) : 0);
+    return { ...u, art, aw: artWidth(art), cw, plateW: cw };
+  };
+  const widthOf = (list) => list.reduce((n, col) => n + col.cw, 0) + (list.length - 1) * GAP + (LANE - GAP) + 2 * margin;
+  let cols = null, hidden = 0;
+  for (const size of ['m', 's', 'xs'].filter((k) => SIZES[k][1] <= artRows)) {
+    const all = units.map((u) => columnOf(u, size));
+    if (widthOf(all) <= W) { cols = all; break; }
+    if (size !== 'xs') continue;
+    const drop = (pick) => { const i = all.findLastIndex(pick); if (i < 0) return false; all.splice(i, 1); hidden++; return true; };
+    while (widthOf(all) > W && (drop((u) => u.foe && !u.focused) || drop((u) => u.small) || drop((u) => u.friend && !u.isPlayer)));
+    if (widthOf(all) <= W) cols = all;
+  }
+  if (!cols) return null;
+  // Width to spare goes to the plates, up to PLATE_FULL each, so names and bars get longer as the crowd thins.
+  const spare = Math.floor((W - widthOf(cols)) / cols.length);
+  if (spare > 0) for (const col of cols) { col.cw = Math.max(col.cw, Math.min(col.cw + spare, PLATE_FULL)); col.plateW = col.cw; }
+  // Where each unit stands in its half: by its distance in yards to the nearest living unit of the other side,
+  // from the far edge at the widest gap this fight has seen to the lane at melee contact (the duel's rule, one
+  // unit at a time). The place it opened at is its own; the closing since then goes to whoever walked it, so
+  // a mob that runs onto the healer crosses to the lane while the healer stays put, and a mage walking into
+  // range slides in while its mob stands. Melee units park all round a mob, so this is read off distances, not
+  // bearings: a rogue behind its target still stands on the party's side.
+  // A corpse, or a body with nobody living left to measure against (the last foe falls, the win holds), stays
+  // where it last stood: without this the whole party walks back to where it opened under the loot.
+  const posOf = (u) => s.unitPosYd?.(u.key);
+  mem.openPos ??= new Map(); mem.openD ??= new Map(); mem.lastC ??= new Map();
+  const nearest = (u) => {
+    let best = null;
+    for (const o of units) {
+      if (!!o.friend === !!u.friend || o.v.hp <= 0) continue;
+      const d = combatDistanceYd(posOf(u), posOf(o));
+      if (d != null && (!best || d < best.d)) best = { o, d };
+    }
+    return best;
+  };
+  const near = new Map(units.map((u) => [u.key, nearest(u)]));
+  mem.openYd = Math.max(mem.openYd ?? DEFAULT_OPEN_YD, ...[...near.values()].map((n) => n?.d ?? 0));
+  const frac = (d) => Math.max(0, Math.min(1, (d - MELEE_CONTACT_YD) / Math.max(1, mem.openYd - MELEE_CONTACT_YD)));
+  const walked = (u) => combatDistanceYd(mem.openPos.get(u.key), posOf(u)) ?? 0;
+  const closingOf = (u) => {
+    const n = near.get(u.key), p = posOf(u);
+    if (p && !mem.openPos.has(u.key)) mem.openPos.set(u.key, { ...p });
+    if (!n) return mem.openD.has(u.key) ? 1 - frac(mem.openD.get(u.key)) : 1; // no positions: everyone at the lane
+    if (!mem.openD.has(u.key)) mem.openD.set(u.key, n.d);
+    const w = walked(u), wo = walked(n.o);
+    const share = w + wo > 0 ? w / (w + wo) : u.friend ? 1 : 0;
+    const c0 = 1 - frac(mem.openD.get(u.key));
+    return Math.max(0, Math.min(1, c0 + (1 - frac(n.d) - c0) * share));
+  };
+  for (const col of cols) {
+    const held = mem.lastC.get(col.key);
+    if (held != null && (col.v.hp <= 0 || !near.get(col.key))) { col.c = held; continue; }
+    col.c = closingOf(col);
+    mem.lastC.set(col.key, col.c);
+  }
+  // The party's half and the pack's, the free width shared by head count, the lane between. In each half the
+  // columns stand by their closing, the nearest to the lane innermost; on the same spot the healer, the
+  // ranged, the melee, then the tank, and the foe you face before the rest. Then nobody overlaps: a column
+  // is pushed away from the one before it, and what runs past the half's far edge is pushed back in turn.
+  const side = (friend) => cols.filter((col) => !!col.friend === friend);
+  const widthOfSide = (list) => list.reduce((n, col) => n + col.cw, 0) + Math.max(0, list.length - 1) * GAP;
+  const friends = side(true), foes = side(false);
+  const free = Math.max(0, W - 2 * margin - LANE - widthOfSide(friends) - widthOfSide(foes));
+  const partyR = margin + widthOfSide(friends) + Math.floor((free * friends.length) / Math.max(1, cols.length));
+  const foeL = Math.min(W - margin - widthOfSide(foes), partyR + LANE);
+  const q = (col) => Math.round(col.c * 50);
+  friends.sort((a, b) => q(a) - q(b) || a.order - b.order);
+  foes.sort((a, b) => q(b) - q(a) || a.order - b.order);
+  // The lineup holds: two neighbours trade places only when one is more than SWAP_YD clearer of the other, so a
+  // melee pile that jitters by a yard does not flicker. A newcomer takes its sorted slot; the rest keep last
+  // frame's order among theirs, then adjacent pairs out of order by more than the leeway swap until none are.
+  mem.lineup ??= new Map();
+  const leeway = SWAP_YD / Math.max(1, mem.openYd - MELEE_CONTACT_YD);
+  const hold = (list, key) => {
+    const known = list.filter((col) => mem.lineup.has(col.key)).sort((a, b) => mem.lineup.get(a.key) - mem.lineup.get(b.key));
+    let k = 0;
+    for (let i = 0; i < list.length; i++) if (mem.lineup.has(list[i].key)) list[i] = known[k++];
+    for (let swapped = true; swapped;) {
+      swapped = false;
+      for (let i = 0; i + 1 < list.length; i++) {
+        if (key(list[i]) - key(list[i + 1]) <= leeway) continue;
+        [list[i], list[i + 1]] = [list[i + 1], list[i]]; swapped = true;
+      }
+    }
+    list.forEach((col, i) => mem.lineup.set(col.key, i));
+  };
+  hold(friends, (col) => col.c);
+  hold(foes, (col) => -col.c);
+  const place = (list, L, R) => {
+    for (const col of list) col.x = col.friend ? L + col.c * (R - col.cw - L) : R - col.cw - col.c * (R - col.cw - L);
+    for (let i = 1; i < list.length; i++) list[i].x = Math.max(list[i].x, list[i - 1].x + list[i - 1].cw + GAP);
+    for (let i = list.length - 1; i >= 0; i--) list[i].x = Math.min(list[i].x, i === list.length - 1 ? R - list[i].cw : list[i + 1].x - GAP - list[i].cw);
+    for (const col of list) col.x = Math.max(0, Math.round(col.x));
+  };
+  place(friends, margin, partyR);
+  place(foes, foeL, W - margin);
+  const zone = artRows, stateRow = zone + 3, auraTop = zone + 4, floorRow = auraTop + (showAuras ? auraH : 0), barTop = floorRow + 1;
+  const c = canvas(W, H);
+  for (const col of cols) {
+    const v = col.v, dead = v.hp <= 0;
+    // The sprite stands on its plate, centred over it; a swing lunges it two columns toward the other side.
+    if (col.art) {
+      const lunge = now - (mem.lunge?.get(col.key) ?? -Infinity) < LUNGE_MS ? (col.friend ? 2 : -2) : 0;
+      col.ax = col.x + Math.max(0, Math.floor((col.cw - col.aw) / 2)) + lunge; col.top = zone - col.art.length;
+      putLines(c, col.ax, col.top, col.art);
+    }
+    putLines(c, col.x, zone, narrowPlate(app, v, { ...col, dead, w: col.cw }));
+    const state = narrowState(v, now, col.cw, mem.casts?.get(col.key));
+    if (state) put(c, col.x, stateRow, state);
+    if (showAuras && !col.small && !dead) putLines(c, col.x, auraTop, auraRows(app, mem, v, col.key, col.cw, icons));
+    putPopsAbove(c, col, (mem.pops.get(col.key) ?? []).filter((p) => now - p.t < POP_MS), now, zone);
+  }
+  putMissiles(c, s, cols, now, Math.max(0, zone - 1 - Math.floor(Math.min(artRows, 10) / 2)), (id) => app.ds.spell(id)?.name);
+  c[floorRow] = floorLine(W, gray);
+  if (hidden) putRight(c, W - 1, floorRow, dim(` +${hidden} more in the fight `));
+  if (barRows) putLines(c, 0, barTop, barLines);
+  return c.map((l) => fit(l, W));
+}

package/src/cli/tuiPet.mjs

@@ -1,9 +1,8 @@
 // Your pet (hunter, warlock): the page with command, react, food and abilities; the stable; the pet trainer.
 // Ports phonecraft playChrome.ts's feed modal, render/petBar.ts, panels/stablePanel.ts and the pet trainer rows.
-import { bold, dim, cyan, yellow, green, red, itemText } from './text.mjs';
+import { bold, dim, cyan, yellow, green, red, itemText, coinText } from './text.mjs';
 import { itemLines, spellLines } from './tuiViews.mjs';
-import { moneyText } from '../domain/economy/money.ts';
-import { LOYALTY_NAMES, petHasHappiness, petKnownSpells, petAutocastOn } from '../domain/pet/pet.ts';
+import { LOYALTY_NAMES, HAPPINESS_MAX, petHasHappiness, petKnownSpells, petAutocastOn } from '../domain/pet/pet.ts';
 import { MAX_PET_STABLES, STABLE_SLOT_PRICES } from '../domain/pet/petStable.ts';
 import { zonePetTrainers } from '../world/world.ts';
 import { MAX_SOUL_SHARD_CAP } from '../autopilot/config.ts';
@@ -15,7 +14,7 @@ export const hasPetClass = (app) => app.ch.cls === HUNTER || app.ch.cls === WARL
 function petStatus(app, pet) {
   const cdef = app.ds.creature(pet.creature);
   const bits = [`${pet.health <= 0 ? red('dead') : `${pet.health} health`}`];
-  if (cdef && petHasHappiness(cdef)) bits.push(`happiness ${pet.happiness}%`, LOYALTY_NAMES[pet.loyalty ?? 1] ?? '');
+  if (cdef && petHasHappiness(cdef)) bits.push(`happiness ${Math.round((pet.happiness / HAPPINESS_MAX) * 100)}%`, LOYALTY_NAMES[pet.loyalty ?? 1] ?? '');
   if (pet.trainingPoints != null) bits.push(`${pet.trainingPoints} training points`);
   return bits.filter(Boolean).join(', ');
 }
@@ -81,7 +80,7 @@ function stableRows(app) {
     rows.push({ text: `  Slot ${i + 1}: ${p ? `${p.name} ${dim(app.ds.creature(p.creature)?.name ?? '')}` : dim('empty')}`, detail: () => [bold(`Stable slot ${i + 1}`), '', p ? `Enter: call ${p.name}${ch.pet ? `, stabling ${ch.pet.name} in its place` : ''}.` : 'Empty.'], act: () => { if (p) app.result(g.callStabledPet(i + 1), `${p.name} comes to you.`); } });
   }
   if (ch.pet || ch.storedPet) rows.push({ text: `Stable ${(ch.pet ?? ch.storedPet).name}`, act: () => { const r = g.stablePet(); app.result(r, r.ok ? `Stabled in slot ${r.slot}.` : ''); } });
-  if (slots < MAX_PET_STABLES) rows.push({ text: `Buy a stable slot ${yellow(moneyText(STABLE_SLOT_PRICES[slots] ?? 0))}`, act: () => { const r = g.buyStableSlot(); app.result(r, r.ok ? `A stable slot for ${moneyText(r.spent)}.` : ''); } });
+  if (slots < MAX_PET_STABLES) rows.push({ text: `Buy a stable slot ${coinText(STABLE_SLOT_PRICES[slots] ?? 0)}`, act: () => { const r = g.buyStableSlot(); app.result(r, r.ok ? `A stable slot for ${coinText(r.spent)}.` : ''); } });
   return rows;
 }
 
@@ -99,13 +98,22 @@ export function petTrainerDialog(app, trainer) {
     id: `pettrainer-${trainer.entry}`, title: trainer.name, hint: 'Enter: buy the rank',
     rows(a) {
       const known = new Set(a.ch.petSpells ?? []);
-      const rows = [H(`${bold(trainer.name)} ${dim('<Pet Trainer>')}   ${yellow(moneyText(a.ch.gold) || '0c')}`), H(dim('A rank bought here is yours for good; Beast Training teaches it to whichever pet is out.')), H('')];
+      const rows = [H(`${bold(trainer.name)} ${dim('<Pet Trainer>')}   ${coinText(a.ch.gold)}`), H(dim('A rank bought here is yours for good; Beast Training teaches it to whichever pet is out.')), H('')];
+      const pet = a.ch.pet, untrainCost = a.g.untrainPetCost();
+      if (pet && untrainCost != null) {
+        const taught = pet.taughtSpells?.length ?? 0;
+        rows.push({
+          text: `Untrain ${pet.name}  ${coinText(untrainCost)}${taught ? '' : dim('  nothing taught')}`,
+          detail: () => [bold('Untrain pet'), '', `${pet.name} forgets the ${taught} abilit${taught === 1 ? 'y' : 'ies'} you taught it and gets every training point back to spend again. Its innate abilities stay, and the ranks you bought stay in Beast Training.`, '', `Cost: ${coinText(untrainCost)}. It climbs with each untrain, up to 10 gold, and falls back to 10 silver a day later.`, '', dim('Enter: untrain')],
+          act: () => a.confirm(`Untrain ${pet.name} for ${coinText(untrainCost)}?`, () => { const r = a.g.untrainPet(trainer.entry); a.result(r, r.ok ? `${pet.name} forgets its training: ${a.ch.pet?.trainingPoints ?? 0} training points to spend.` : ''); }),
+        }, H(''));
+      }
       const list = trainer.spells.map((ts) => ({ ts, sp: a.ds.spell(ts.spell) })).filter((x) => x.sp).sort((x, y) => x.ts.reqLevel - y.ts.reqLevel || x.sp.name.localeCompare(y.sp.name));
       for (const { ts, sp } of list) {
         const have = known.has(sp.id), low = ts.reqLevel > a.ch.level;
         rows.push({
-          text: `${have ? green('✓ ') : '  '}${low || have ? dim(sp.name) : sp.name}${sp.rank ? dim(` (Rank ${sp.rank})`) : ''}  ${yellow(moneyText(ts.cost) || 'free')}${low ? red(`  level ${ts.reqLevel}`) : ''}`,
-          detail: () => spellLines(a, sp, ['', `Cost: ${yellow(moneyText(ts.cost) || 'free')}`]),
+          text: `${have ? green('✓ ') : '  '}${low || have ? dim(sp.name) : sp.name}${sp.rank ? dim(` (Rank ${sp.rank})`) : ''}  ${coinText(ts.cost, 'free')}${low ? red(`  level ${ts.reqLevel}`) : ''}`,
+          detail: () => spellLines(a, sp, ['', `Cost: ${coinText(ts.cost, 'free')}`]),
           act: () => { if (!have) a.result(a.g.buyPetSpell(trainer.entry, sp.id), `You learn ${sp.name} for your pets.`); },
         });
       }

package/src/cli/tuiProfessions.mjs

@@ -3,10 +3,10 @@
 // Send goods. Ported from phonecraft's professionsPanel.ts and the vendorPanel.ts send-goods overlay.
 // A craft buys short vendor reagents (vials, thread, flux) from your purse on the way: the buy-in phonecraft
 // shows as a coin chip on Create. Views only read; every change is a Game facade call.
-import { bold, dim, cyan, yellow, green, red, gray, orange, qualityPaint, fit, plural, secondsText, wrapLines, itemText } from './text.mjs';
+import { bold, dim, cyan, yellow, green, red, gray, orange, qualityPaint, fit, plural, secondsText, wrapLines, itemText, coinText } from './text.mjs';
 import { itemLines } from './tuiViews.mjs';
 import { missionDialog, companionDialog } from './tuiCompanions.mjs';
-import { moneyText, coinsText } from '../domain/economy/money.ts';
+import { coinsText } from '../domain/economy/money.ts';
 import { className } from '../domain/core/ids.ts';
 import { countItem, emptyInventory } from '../domain/items/inventory.ts';
 import { equippedEntry } from '../domain/items/itemInstance.ts';
@@ -102,7 +102,7 @@ function craftCheck(app, cr, r, env) {
   if (chk.reason !== 'Missing reagents') return { ok: false, reason: chk.reason, cost: 0, buys: [], max: 0 };
   const b = vendorBuyInReady(app.ds, app.ch, r.reagents, cr.inv);
   if (!b.ok) {
-    const reason = b.blocked.length ? `Missing ${b.blocked.map((i) => app.itemLabel(i)).join(', ')}` : `Need ${moneyText(b.cost)} for ${buyList(app, b.buys)}`;
+    const reason = b.blocked.length ? `Missing ${b.blocked.map((i) => app.itemLabel(i)).join(', ')}` : `Need ${coinText(b.cost)} for ${buyList(app, b.buys)}`;
     return { ok: false, short: true, reason, cost: b.cost, buys: b.buys, max: 0 };
   }
   const again = canCraft(cr.char, applyVendorBuys(app.ds, cr.inv, b.buys), r, env.focus, null, env.tools);
@@ -112,7 +112,7 @@ function craftEnv(app) { return { focus: zoneFocus(app), tools: sharedTools(app)
 
 /** One status chip for a recipe row: how many you can make, what the buy-in costs, or why not. */
 function craftChip(chk) {
-  if (chk.ok) return green(`${chk.max} ready`) + (chk.cost ? yellow(`  buys ${moneyText(chk.cost)}`) : '');
+  if (chk.ok) return green(`${chk.max} ready`) + (chk.cost ? yellow(`  buys ${coinText(chk.cost)}`) : '');
   return (chk.short ? dim : red)(chk.reason ?? 'cannot make');
 }
 
@@ -143,7 +143,7 @@ function craftMany(app, cr, r, want, all = false) {
   if (!made) { app.say(red(reason ?? 'Cannot make that.')); return; }
   const prod = app.ds.item(r.product.item);
   app.say(green(`${cr.id ? `${cr.name} creates` : 'You create'} ${itemText(prod, r.name)}${units > 1 ? ` x${units}` : ''}.`)
-    + (spent ? yellow(`  Vendor reagents ${moneyText(spent)}.`) : '')
+    + (spent ? yellow(`  Vendor reagents ${coinText(spent)}.`) : '')
     + (made < n && reason ? dim(`  Stopped after ${made}: ${reason}`) : ''));
   if (skill != null) app.say(cyan(`${whose(cr)} ${app.ds.profession(r.skill)?.name ?? r.skill} skill is now ${skill}.`));
   for (const l of other.reverse()) app.say(dim('· ' + coinsText(l)));
@@ -193,7 +193,7 @@ function reagentLines(app, reagents, tools, inv) {
     const vendor = !ok && it && unlimitedVendorFor(app.ds, rg.item, app.ch.race) != null;
     const lot = Math.max(1, it?.buyCount ?? 1);
     const cost = vendor ? Math.ceil((rg.count - have) / lot) * it.buyPrice : 0;
-    out.push(`  ${(ok ? green : vendor ? yellow : red)(`${have}/${rg.count}`)} ${app.itemLabel(rg.item)}${vendor ? dim(`  vendor ${moneyText(cost)}`) : ''}`);
+    out.push(`  ${(ok ? green : vendor ? yellow : red)(`${have}/${rg.count}`)} ${app.itemLabel(rg.item)}${vendor ? dim(`  vendor ${coinText(cost)}`) : ''}`);
   }
   for (const t of tools ?? []) {
     const ok = countItem(inv, t) > 0 || sharedTools(app).has(t);
@@ -214,7 +214,7 @@ function recipeDetail(app, cr, r, chk, who) {
   out.push(...wearerLines(app, r.product.item, who));
   out.push('');
   if (chk.ok) {
-    if (chk.cost) out.push(yellow(`Buys ${buyList(app, chk.buys)} for ${moneyText(chk.cost)} from your purse.`));
+    if (chk.cost) out.push(yellow(`Buys ${buyList(app, chk.buys)} for ${coinText(chk.cost)} from your purse.`));
     out.push(green(`Enter: make one   A: make ${chk.max}   N: a number`));
   } else out.push(red(chk.reason ?? 'Cannot make this.'));
   if (cr.id) out.push('', dim(`${cr.name} crafts from the whole party's bags and banks. What they make lands in their bags.`));
@@ -246,7 +246,7 @@ export function recipeBook(app, crafterId, skill) {
       const cr = current();
       const sk = cr.char.skills[skill];
       const env = craftEnv(a);
-      const rows = [H(`${bold(cr.name)}  ${prof?.name ?? skill} ${sk ? `${sk.current}/${sk.max}` : dim('untrained')}${sk && prof ? dim(`  ${currentRank(cr.char, prof)?.name ?? ''}`) : ''}   ${yellow(moneyText(a.ch.gold) || '0c')}`)];
+      const rows = [H(`${bold(cr.name)}  ${prof?.name ?? skill} ${sk ? `${sk.current}/${sk.max}` : dim('untrained')}${sk && prof ? dim(`  ${currentRank(cr.char, prof)?.name ?? ''}`) : ''}   ${coinText(a.ch.gold)}`)];
       const filters = [haveOnly && 'only what you can make', search && `matching "${search}"`].filter(Boolean);
       rows.push(H(dim(filters.length ? `Showing ${filters.join(', ')}.` : 'c: switch crafter   h: only what you can make   /: search')));
       if (GATHER_LINES.has(skill)) rows.push(...gatherRows(a, skill, cr));
@@ -268,6 +268,7 @@ export function recipeBook(app, crafterId, skill) {
         const name = DIFF_PAINT[diffOf(cr, skill, r)](r.name);
         rows.push({
           text: `${fit(name + (who.length ? green(' ▲') : ''), W)} ${craftChip(chk)}`, data: { recipe: r, chk, cr },
+          icon: prod?.icon, sub: dim((r.reagents ?? []).map((x) => `${a.ds.item(x.item)?.name ?? x.item}${x.count > 1 ? ` x${x.count}` : ''}`).join(', ')),
           detail: () => recipeDetail(a, cr, r, chk, who),
           act: () => (chk.ok ? craftMany(a, cr, r, 1) : a.say(red(chk.reason ?? `Cannot make ${prod?.name ?? r.name}.`))),
         });
@@ -358,7 +359,7 @@ function enchantCheck(app, cr, e, env) {
   if (e.reagents.every((rg) => countItem(cr.inv, rg.item) >= rg.count)) return { ok: true, cost: 0, buys: [] };
   const b = vendorBuyInReady(app.ds, app.ch, e.reagents, cr.inv);
   if (b.ok) return { ok: true, cost: b.cost, buys: b.buys };
-  return { ok: false, short: true, reason: b.blocked.length ? `Missing ${b.blocked.map((i) => app.itemLabel(i)).join(', ')}` : `Need ${moneyText(b.cost)}`, cost: b.cost, buys: b.buys };
+  return { ok: false, short: true, reason: b.blocked.length ? `Missing ${b.blocked.map((i) => app.itemLabel(i)).join(', ')}` : `Need ${coinText(b.cost)}`, cost: b.cost, buys: b.buys };
 }
 
 /** Whose worn piece can take this enchant: you and the party, one option per matching slot. */
@@ -405,7 +406,7 @@ function enchantBench(app, crafterId) {
       const cr = current(), ds = a.ds;
       const sk = cr.char.skills.enchanting;
       const env = craftEnv(a);
-      const rows = [H(`${bold(cr.name)}  Enchanting ${sk ? `${sk.current}/${sk.max}` : dim('untrained')}   ${dim(`rod: ${bestRodTier(cr.inv, ds, env.tools) ? rodNameForTier(bestRodTier(cr.inv, ds, env.tools), ds) : 'none'}`)}   ${yellow(moneyText(a.ch.gold) || '0c')}`), H(dim('c: switch enchanter'))];
+      const rows = [H(`${bold(cr.name)}  Enchanting ${sk ? `${sk.current}/${sk.max}` : dim('untrained')}   ${dim(`rod: ${bestRodTier(cr.inv, ds, env.tools) ? rodNameForTier(bestRodTier(cr.inv, ds, env.tools), ds) : 'none'}`)}   ${coinText(a.ch.gold)}`), H(dim('c: switch enchanter'))];
       const known = new Set(cr.char.knownEnchants ?? []);
       const formulas = ds.enchants().filter((e) => known.has(e.id)).sort((x, y) => y.orange - x.orange || x.name.localeCompare(y.name));
       const W = Math.max(20, Math.min(34, a.layout().listW - 31));
@@ -414,7 +415,7 @@ function enchantBench(app, crafterId) {
       for (const e of formulas) {
         const chk = enchantCheck(a, cr, e, env);
         rows.push({
-          text: `${fit(DIFF_PAINT[diffOf(cr, 'enchanting', e)](e.name.replace(/^Enchant\s+/, '')), W)} ${chk.ok ? green('ready') + (chk.cost ? yellow(`  buys ${moneyText(chk.cost)}`) : '') : (chk.short ? dim : red)(chk.reason)}`,
+          text: `${fit(DIFF_PAINT[diffOf(cr, 'enchanting', e)](e.name.replace(/^Enchant\s+/, '')), W)} ${chk.ok ? green('ready') + (chk.cost ? yellow(`  buys ${coinText(chk.cost)}`) : '') : (chk.short ? dim : red)(chk.reason)}`,
           detail: () => [bold(e.name), dim(`goes on: ${e.slots.join(', ')}   ${rodNameForTier(e.minRodTier, ds)}`), '', ...reagentLines(a, e.reagents, [], cr.inv), '',
             `${DIFF_PAINT[diffOf(cr, 'enchanting', e)](diffOf(cr, 'enchanting', e))}   ${upPct(cr, 'enchanting', e) ? `${upPct(cr, 'enchanting', e)}% skill-up` : dim('no skill-up')}`, '',
             chk.ok ? green('Enter: pick whose gear to enchant') : red(chk.reason)],
@@ -488,7 +489,7 @@ function partyBook(app) {
         groups.set(r.skill, g);
       }
       const ready = [...byRecipe.values()].filter((o) => o.some((x) => x.chk.ok)).length;
-      const rows = [H(`${plural(byRecipe.size, 'recipe')} known across ${plural(all.length, 'crafter')}, ${ready} ready   ${yellow(moneyText(a.ch.gold) || '0c')}`), H(dim(haveOnly ? 'Showing what someone can make now. h shows everything.' : 'Showing every known recipe. h shows only what someone can make.'))];
+      const rows = [H(`${plural(byRecipe.size, 'recipe')} known across ${plural(all.length, 'crafter')}, ${ready} ready   ${coinText(a.ch.gold)}`), H(dim(haveOnly ? 'Showing what someone can make now. h shows everything.' : 'Showing every known recipe. h shows only what someone can make.'))];
       if (!groups.size) rows.push(H(''), H(dim(byRecipe.size ? '  Nobody can make anything right now. h shows every recipe.' : '  Nobody in the party knows a recipe yet.')));
       const W = Math.max(20, Math.min(34, a.layout().listW - 34));
       for (const [skill, list] of [...groups].sort((x, y) => x[0].localeCompare(y[0]))) {
@@ -526,9 +527,9 @@ function specRows(app, trainer) {
     const name = sp?.name ?? it.kind.replace(/^(un)?learn_/, '');
     const cost = it.costCopper ?? 0;
     rows.push({
-      text: `${unlearn ? red(`Unlearn ${name}`) : green(`Become a specialist: ${name}`)}${cost ? `  ${yellow(moneyText(cost))}` : ''}`,
-      detail: () => [bold(name), '', unlearn ? 'Forget this specialisation and the recipes that go with it.' : 'A specialisation opens its own recipes. You can hold one at a time.', ...(cost ? ['', `Cost ${moneyText(cost)}`] : [])],
-      act: (a) => (unlearn ? a.confirm(`Unlearn ${name}${cost ? ` for ${moneyText(cost)}` : ''}? Its recipes are forgotten.`, () => applySpec(a, trainer, it, name, true)) : applySpec(a, trainer, it, name, false)),
+      text: `${unlearn ? red(`Unlearn ${name}`) : green(`Become a specialist: ${name}`)}${cost ? `  ${coinText(cost)}` : ''}`,
+      detail: () => [bold(name), '', unlearn ? 'Forget this specialisation and the recipes that go with it.' : 'A specialisation opens its own recipes. You can hold one at a time.', ...(cost ? ['', `Cost ${coinText(cost)}`] : [])],
+      act: (a) => (unlearn ? a.confirm(`Unlearn ${name}${cost ? ` for ${coinText(cost)}` : ''}? Its recipes are forgotten.`, () => applySpec(a, trainer, it, name, true)) : applySpec(a, trainer, it, name, false)),
     });
   }
   rows.push(H(''));
@@ -568,21 +569,21 @@ export function profTrainerDialog(app, trainer) {
           const before = a.ch.gold;
           if (learn(a, t).ok) { n++; spent += before - a.ch.gold; }
         }
-        a.say(n ? green(`You learn ${plural(n, 'recipe')}${spent ? ` for ${moneyText(spent)}` : ''}.`) : dim('Nothing you can learn yet.'));
+        a.say(n ? green(`You learn ${plural(n, 'recipe')}${spent ? ` for ${coinText(spent)}` : ''}.`) : dim('Nothing you can learn yet.'));
       } },
     },
     rows(a) {
       const ch = a.ch, sk = ch.skills[trainer.skill];
       const mod = vendorPriceMultiplierFor(ds, ch, trainer.entry);
-      const rows = [H(`${bold(trainer.name)} ${dim(`<${prof?.name ?? trainer.skill} Trainer>`)}   ${yellow(moneyText(ch.gold) || '0c')}`), H(dim(sk ? `Your ${prof?.name} skill: ${sk.current}/${sk.max}` : `You do not know ${prof?.name ?? trainer.skill} yet.`)), H('')];
+      const rows = [H(`${bold(trainer.name)} ${dim(`<${prof?.name ?? trainer.skill} Trainer>`)}   ${coinText(ch.gold)}`), H(dim(sk ? `Your ${prof?.name} skill: ${sk.current}/${sk.max}` : `You do not know ${prof?.name ?? trainer.skill} yet.`)), H('')];
       const nr = prof ? nextTrainerRank(ch, prof) : undefined;
       if (nr) {
         const cost = trainerSpellCost(nr.cost, mod);
         const need = nextRankReqSkill(nr, sk);
         const why = ch.level < nr.reqLevel ? `requires level ${nr.reqLevel}` : (sk?.current ?? 0) < need ? `requires ${prof.name} ${need}` : ch.gold < cost ? 'not enough money' : '';
         rows.push(H('Rank'), {
-          text: `${why ? dim(`${sk ? 'Train' : 'Learn'} ${nr.name} ${prof.name}`) : green(`${sk ? 'Train' : 'Learn'} ${nr.name} ${prof.name}`)}  ${yellow(moneyText(cost) || 'free')}${why ? red(`  ${why}`) : ''}`,
-          detail: () => [bold(`${nr.name} ${prof.name}`), `Raises your ${prof.name} cap to ${nr.cap}.`, '', `Requires level ${nr.reqLevel}${need ? `, ${prof.name} ${need}` : ''}`, `Cost ${moneyText(cost) || 'free'}`, '', prof.kind !== 'secondary' && !sk ? dim('You can hold two primary professions. Cooking, First Aid and Fishing do not count.') : ''],
+          text: `${why ? dim(`${sk ? 'Train' : 'Learn'} ${nr.name} ${prof.name}`) : green(`${sk ? 'Train' : 'Learn'} ${nr.name} ${prof.name}`)}  ${coinText(cost, 'free')}${why ? red(`  ${why}`) : ''}`,
+          detail: () => [bold(`${nr.name} ${prof.name}`), `Raises your ${prof.name} cap to ${nr.cap}.`, '', `Requires level ${nr.reqLevel}${need ? `, ${prof.name} ${need}` : ''}`, `Cost ${coinText(cost, 'free')}`, '', prof.kind !== 'secondary' && !sk ? dim('You can hold two primary professions. Cooking, First Aid and Fishing do not count.') : ''],
           act: () => a.result(a.g.learnProfession(trainer.entry), `You are now a${/^[AEIOU]/.test(nr.name) ? 'n' : ''} ${nr.name} ${prof.name}.`),
         }, H(''));
       } else if (sk) rows.push(H(dim(prof?.kind === 'secondary' && sk.max < 300 ? 'Expert and Artisan come from books, not trainers.' : 'You hold the highest rank they teach.')), H(''));
@@ -597,14 +598,14 @@ export function profTrainerDialog(app, trainer) {
         const cost = trainerSpellCost(t.def.cost ?? 0, mod);
         const prod = t.kind === 'recipe' ? ds.item(t.def.product.item) : null;
         rows.push({
-          text: `${fit(ch.gold >= cost ? t.def.name : dim(t.def.name), W)} ${yellow(moneyText(cost) || 'free')}`,
-          detail: () => [...(prod ? itemLines(a, prod).filter((l) => !/Sells for/.test(l)) : [bold(t.def.name), dim(`goes on: ${t.def.slots.join(', ')}`)]), '', ...reagentLines(a, t.def.reagents, t.def.requiredTools, a.g.state.inventory), '', dim(`Requires ${prof?.name} ${t.def.orange}   cost ${moneyText(cost) || 'free'}`)],
+          text: `${fit(ch.gold >= cost ? t.def.name : dim(t.def.name), W)} ${coinText(cost, 'free')}`,
+          detail: () => [...(prod ? itemLines(a, prod).filter((l) => !/Sells for/.test(l)) : [bold(t.def.name), dim(`goes on: ${t.def.slots.join(', ')}`)]), '', ...reagentLines(a, t.def.reagents, t.def.requiredTools, a.g.state.inventory), '', dim(`Requires ${prof?.name} ${t.def.orange}   cost ${coinText(cost, 'free')}`)],
           act: () => a.result(learn(a, t), `You learn ${t.def.name}.`),
         });
       }
       if (later.length) {
         rows.push(H(''), H('Coming up'));
-        for (const t of later) rows.push(H(dim(`  ${fit(t.def.name, W)} ${prof?.name} ${t.def.orange}${t.reqLevel > ch.level ? `, level ${t.reqLevel}` : ''}  ${moneyText(trainerSpellCost(t.def.cost ?? 0, mod))}`)));
+        for (const t of later) rows.push(H(dim(`  ${fit(t.def.name, W)} ${prof?.name} ${t.def.orange}${t.reqLevel > ch.level ? `, level ${t.reqLevel}` : ''}  ${coinText(trainerSpellCost(t.def.cost ?? 0, mod))}`)));
       }
       return rows;
     },
@@ -751,6 +752,7 @@ export function professionsView(app) {
           const away = cr.comp?.mission?.skill === prof.id;
           return {
             text: `${cr.id ? `${fit(cr.name, 10)} ` : ''}${fit(prof.name, 15)} ${fit(`${sk.current}/${sk.max}`, 8)}${ready ? green(`${ready} ready`) : GATHER_LINES.has(prof.id) ? dim(prof.kind) : ''}${away ? yellow('  away') : ''}`,
+            icon: prof.icon, sub: dim(currentRank(cr.char, prof)?.name ?? ''),
             data: { cr, skill: prof.id },
             detail: () => profRowLines(a, cr, prof, sk, ready),
             act: () => a.push(recipeBook(a, cr.id, prof.id)),
@@ -759,7 +761,7 @@ export function professionsView(app) {
       };
       const you = crafterOf(a, null);
       const mine = profRows(you);
-      const rows = [H(`Your professions   ${yellow(moneyText(a.ch.gold) || '0c')}`)];
+      const rows = [H(`Your professions   ${coinText(a.ch.gold)}`)];
       if (mine.length) rows.push(...mine);
       else rows.push(H(dim('  You have no professions yet. Profession trainers stand in towns and capitals (World tab).')));
       const comps = companionsOf(g);
@@ -785,13 +787,13 @@ export function professionsView(app) {
           const prof = ds.profession(t.skill);
           const sk = a.ch.skills[t.skill];
           const newOnes = sk ? ds.recipes().filter((r) => r.skill === t.skill && r.source === 'trainer' && !a.ch.knownRecipes.includes(r.id) && sk.current >= r.orange && a.ch.level >= (r.reqLevel ?? 0)).length : 0;
-          rows.push({ text: `${t.name} ${dim(`<${prof?.name ?? t.skill} Trainer>`)}${newOnes ? green(`  ${newOnes} to learn`) : ''}`, detail: () => [bold(t.name), `${prof?.name ?? t.skill} trainer`, '', dim('Enter: ranks and recipes')], act: () => a.push(profTrainerDialog(a, t)) });
+          rows.push({ text: `${t.name} ${dim(`<${prof?.name ?? t.skill} Trainer>`)}${newOnes ? green(`  ${newOnes} to learn`) : ''}`, icon: prof?.icon, sub: dim(sk ? `your skill ${sk.current}/${sk.max}` : 'not learned'), detail: () => [bold(t.name), `${prof?.name ?? t.skill} trainer`, '', dim('Enter: ranks and recipes')], act: () => a.push(profTrainerDialog(a, t)) });
         }
       }
       const books2 = [];
       g.state.inventory.stacks.forEach((s) => {
         const it = ds.item(s.item), teach = itemTeachIntent(it, ds);
-        if (teach?.kind === 'recipe' || teach?.kind === 'enchant') books2.push({ text: `${qualityPaint(it.quality)(it.name)}${s.count > 1 ? ` x${s.count}` : ''}`, detail: () => itemLines(a, it, ['', dim('Enter: pick who learns it (you or a companion with the craft)')]), act: () => teachFromItem(a, s) });
+        if (teach?.kind === 'recipe' || teach?.kind === 'enchant') books2.push({ text: `${qualityPaint(it.quality)(it.name)}${s.count > 1 ? ` x${s.count}` : ''}`, icon: it.icon, sub: dim(teach.kind), detail: () => itemLines(a, it, ['', dim('Enter: pick who learns it (you or a companion with the craft)')]), act: () => teachFromItem(a, s) });
       });
       if (books2.length) rows.push(H(''), H('Recipes in your bags'), ...books2);
       return rows;