azeroth-shell 0.2.0 → 0.4.0

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));
@@ -359,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. */
@@ -406,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));
@@ -415,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)],
@@ -489,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]))) {
@@ -527,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(''));
@@ -569,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(''));
@@ -598,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;
     },
@@ -761,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);

package/src/cli/tuiSaves.mjs

@@ -22,10 +22,24 @@ export async function savePicker(app, { onPlay, onNew }) {
   // Each hero stands in their gear under their line: the saves are read once here for the character they hold.
   const chars = new Map();
   for (const m of saves) { try { chars.set(m.slot, (await repo.load(m.slot))?.state?.char ?? null); } catch { /* unreadable: no sprite */ } }
+  // A hero's first drawing unpacks their body's art and can take a moment, so paging past them draws only
+  // the text: the art waits until the cursor rests on them. One drawn once comes back at once.
+  const drawn = new Set();
+  let settle = null;
+  const restingOn = (m) => {
+    if (drawn.has(m.slot)) return true;
+    clearTimeout(settle);
+    settle = setTimeout(() => {
+      if (app.top() !== view || options[view.cursor]?.value.meta?.slot !== m.slot) return;
+      drawn.add(m.slot); app.render();
+    }, 250);
+    return false;
+  };
   const options = saves.map((m) => ({
     label: `${bold(m.name)}  ${dim(`L${m.level} ${className(m.cls)}`)}${busy(m) ? `  ${yellow('open in another terminal')}` : ''}`,
     detail: () => {
       const text = [bold(m.name), `Level ${m.level} ${className(m.cls)}`, dim(`last played ${when(m.updatedAt)}`), '', dim('Enter: play   m: back up, restore, export, delete')];
+      if (!restingOn(m)) return text;
       const ch = chars.get(m.slot), L = app.layout();
       const art = ch ? paperdollArt(ch, L.detailW - 2, L.mainH - text.length - 1) : null;
       return art ? [...text, '', ...art] : text;

package/src/cli/tuiSearch.mjs

@@ -5,7 +5,7 @@
 // zones it grows in; a zone, a quest, an object. Enter acts on the place: open it when you are already there
 // (the vendor, the fight, the portal, the node), travel there when you are not. The matching is the wiki's
 // (substring, then character subsequence), over the wiki's name index plus a gather-node index of our own.
-import { bold, dim, yellow, green, red, cyan, qualityPaint, secondsText, plural } from './text.mjs';
+import { bold, dim, yellow, green, red, cyan, qualityPaint, secondsText, plural, coinText } from './text.mjs';
 import { wikiIndex, wikiTokens, rowMatches } from './wikiIndex.ts';
 import { wikiSourceIndexSync } from './wikiSources.ts';
 import { wikiPage } from './tuiWiki.mjs';
@@ -13,7 +13,6 @@ import { itemLines, creatureLines, questLines, travelPreviewLines, travelTo, ven
 import { profTrainerDialog } from './tuiProfessions.mjs';
 import { entryDialog } from './tuiDungeon.mjs';
 import { startFight } from './tuiFight.mjs';
-import { moneyText } from '../domain/economy/money.ts';
 import { vendorPriceMultiplierFor } from '../engine/game/vendorOffers.ts';
 import { className } from '../domain/core/ids.ts';
 
@@ -162,7 +161,7 @@ function goTo(app, zoneId, here) {
   if (!dest) { app.flashMsg('No road leads there.'); return; }
   const pv = app.g.previewTravel(dest.id);
   if (!app.result(pv)) return;
-  app.confirm(`Travel to ${dest.name}? ${secondsText(pv.totalSeconds * 1000)}${pv.totalCopper ? `, ${moneyText(pv.totalCopper)} in fares` : ''}`, () => travelTo(app, dest));
+  app.confirm(`Travel to ${dest.name}? ${secondsText(pv.totalSeconds * 1000)}${pv.totalCopper ? `, ${coinText(pv.totalCopper)} in fares` : ''}`, () => travelTo(app, dest));
 }
 
 /** Enter on a place with several zones: travel to the one you pick, the current zone first. */
@@ -183,7 +182,7 @@ function travelHint(app, zones) {
   const dest = app.ds.zone(zones[0]);
   const pv = dest ? app.g.previewTravel(dest.id) : null;
   if (pv && !pv.ok) return red(pv.reason);
-  return dim(`Enter: travel to ${zoneName(app, zones[0])}${pv ? ` (${secondsText(pv.totalSeconds * 1000)}${pv.totalCopper ? `, ${moneyText(pv.totalCopper)}` : ''})` : ''}${zones.length > 1 ? ', or pick another zone' : ''}`);
+  return dim(`Enter: travel to ${zoneName(app, zones[0])}${pv ? ` (${secondsText(pv.totalSeconds * 1000)}${pv.totalCopper ? `, ${coinText(pv.totalCopper)}` : ''})` : ''}${zones.length > 1 ? ', or pick another zone' : ''}`);
 }
 
 // ---- rows per kind ------------------------------------------------------------------------------------------
@@ -328,7 +327,7 @@ function itemRows(app, entry, only) {
     if (s.kind === 'vendor') {
       const v = ds.vendor(s.ref);
       if (!v) continue;
-      const price = it.buyPrice ? dim(`  ${moneyText(Math.floor(it.buyPrice * vendorPriceMultiplierFor(ds, app.ch, v.entry)))}`) : '';
+      const price = it.buyPrice ? dim(`  ${coinText(Math.floor(it.buyPrice * vendorPriceMultiplierFor(ds, app.ch, v.entry)))}`) : '';
       rows.push(npcRow(app, s.ref, { indent: `${indent}${dim('sold by')} `, note: price }));
     } else if (s.kind === 'drop' || s.kind === 'skin' || s.kind === 'pickpocket') {
       if (!ds.creature(s.ref)) continue;

package/src/cli/tuiSettings.mjs

@@ -2,9 +2,8 @@
 // disenchanting, the junk rules (what gets sold or destroyed on its own) and which gathering nodes the autopilot
 // takes. Enter flips or cycles a row. "Every character" settings live in ~/.azsh/prefs.json through the
 // createGame hooks; "this character" settings live in the save.
-import { bold, dim, yellow, green, red, cyan, qualityPaint } from './text.mjs';
+import { bold, dim, yellow, green, red, cyan, qualityPaint, coinText } from './text.mjs';
 import { autoLootOn } from './tuiLoot.mjs';
-import { moneyText } from '../domain/economy/money.ts';
 import { JUNK_PROTECT_CATEGORIES } from '../domain/items/junkCategories.ts';
 import { autopilotSettingsDialog } from './tuiAutopilotSettings.mjs';
 import { paceLabel, nextPace } from './tuiWorld.mjs';
@@ -81,7 +80,7 @@ export function settingsDialog(app) {
       const eh = g.equipmentHelperConfig();
       rows.push(H(''), H(bold('Equipment helper')));
       rows.push({ text: `Helper                    ${onOff(eh.enabled)}`, detail: () => [bold('Equipment helper'), '', 'Scores what you pick up against what you wear and marks upgrades with ▲.'], act: (a2) => g.setEquipmentHelperConfig({ ...eh, enabled: !eh.enabled }) });
-      rows.push({ text: `Upgrades                  ${eh.mode === 'auto' ? green('put on as they drop') : cyan('suggest only')}`, detail: () => [bold('Upgrades'), '', 'Suggest: ▲ on the Gear and Bags tabs, u puts them on.', 'Put on: strict upgrades are worn the moment they land in your bags.'], act: () => g.setEquipmentHelperConfig({ ...eh, mode: eh.mode === 'auto' ? 'suggest' : 'auto' }) });
+      rows.push({ text: `Upgrades                  ${eh.mode === 'auto' ? green('put on as they drop') : cyan('suggest only')}`, detail: () => [bold('Upgrades'), '', 'Suggest: ▲ on the Character and Bags tabs, u puts them on.', 'Put on: strict upgrades are worn the moment they land in your bags.'], act: () => g.setEquipmentHelperConfig({ ...eh, mode: eh.mode === 'auto' ? 'suggest' : 'auto' }) });
 
       const deMine = g.characterAutoDisenchantConfig(), deAll = g.globalAutoDisenchantConfig();
       rows.push(H(''), H(bold('Disenchant on its own')));
@@ -110,7 +109,7 @@ export function settingsDialog(app) {
         const n = jf[key].length;
         rows.push({ text: `${label.padEnd(26)}${n ? `${n} item${n === 1 ? '' : 's'}` : dim('none')}`, detail: () => [bold(label), '', ...(n ? jf[key].map((e) => a.itemLabel(e)) : [dim('Empty. m on a bag item adds to it.')]), '', dim('Enter: edit')], act: (a2) => a2.push(junkListDialog(a2, key, label)) });
       }
-      rows.push({ text: green('Clear out junk now'), detail: () => [bold('Clear out junk now'), '', 'Sells (when a vendor is open or the rule allows) and destroys what the rules say, once.'], act: (a2) => { const r = g.runAutoJunk(); if (r.sold || r.destroyed) a2.say(green(`Junk: ${r.sold} sold${r.earned ? ` for ${moneyText(r.earned)}` : ''}, ${r.destroyed} destroyed.`)); else a2.flashMsg('Nothing in your bags is junk by these rules.'); } });
+      rows.push({ text: green('Clear out junk now'), detail: () => [bold('Clear out junk now'), '', 'Sells (when a vendor is open or the rule allows) and destroys what the rules say, once.'], act: (a2) => { const r = g.runAutoJunk(); if (r.sold || r.destroyed) a2.say(green(`Junk: ${r.sold} sold${r.earned ? ` for ${coinText(r.earned)}` : ''}, ${r.destroyed} destroyed.`)); else a2.flashMsg('Nothing in your bags is junk by these rules.'); } });
 
       const gf = g.gatherFilterConfig();
       rows.push(H(''), H(`${bold('Gathering')}   ${dim('which nodes the autopilot mines, picks and skins, by skill colour')}`));

package/src/cli/tuiStage.mjs

@@ -3,8 +3,7 @@
 // left and the foe down the right; the dungeon room and the pack are meant to be more actor lists through
 // the same canvas. Sizes come from the design page: a sprite's box says its rank, and the terminal's
 // width says which boxes it can afford.
-import { bold, dim, cyan, yellow, green, red, gray, inverse, fit, vis, cut, bar, brightBlue, orange, useColor, strip, itemText } from './text.mjs';
-import { moneyText } from '../domain/economy/money.ts';
+import { bold, dim, cyan, yellow, green, red, gray, inverse, fit, vis, cut, bar, brightBlue, orange, useColor, strip, itemText, coinText } from './text.mjs';
 import { className } from '../domain/core/ids.ts';
 import { iconArt, iconsOn } from './iconArt.mjs';
 import { sixelOn } from './sixel.mjs';
@@ -15,7 +14,7 @@ export const POWER_PAINT = { mana: brightBlue, rage: red, energy: yellow, focus:
 export const POP_MS = 1500;      // a hit or heal stays on screen this long (fight time)
 export const POP_RISE_MS = 400;  // a pop climbs one row every this long
 export const LUNGE_MS = 250;     // an auto-attack swing moves the sprite two columns toward its target this long
-export const SHORT_BUFF_MS = 60_000; // a frame shows only buffs about to run out; the long ones are on the Character tab
+export const SHORT_BUFF_MS = 60_000; // a frame shows only buffs about to run out; the long ones are under s on the Character tab
 export const ROLE_GLYPH = { tank: cyan('T'), healer: green('H'), damage: red('D') };
 
 /** Sprite boxes, columns x rows: a pack add or a pet, dungeon trash, a normal foe, you or an elite, a boss. */
@@ -135,19 +134,19 @@ export function narrowPlate(app, v, { isPlayer, focused, friend, dead, role, ran
 }
 
 /** The state row of a narrow plate, `w` wide: a cast bar that fills under the spell's name (a channel drains
- *  it), else crowd control, stealth, or "dead"; empty when idle. */
-export function narrowState(v, now, w) {
+ *  it), else crowd control, the cast just done (castSlot), stealth, or "dead"; empty when idle. */
+export function narrowState(v, now, w, recent) {
   if (v.hp <= 0) return gray('dead');
   if (v.casting) {
-    const total = Math.max(1, v.casting.endsAt - v.casting.startedAt);
-    const left = Math.max(0, v.casting.endsAt - now);
-    const prog = Math.max(0, Math.min(1, v.casting.channeled ? left / total : 1 - left / total));
+    const { prog, left } = castProgress(v.casting, now);
     const secs = w >= 14 ? ` ${(left / 1000).toFixed(1)}s` : '';
     const text = fit(cut(v.casting.name, w - secs.length), w - secs.length);
     const filled = Math.round(prog * vis(text));
     return `${inverse(yellow(text.slice(0, filled)))}${yellow(text.slice(filled))}${dim(secs)}`;
   }
   if (v.controlled) return red(cut(v.controlled.control, w));
+  const last = freshCast(recent, now);
+  if (last) return cyan(bold(cut(last.name, w)));
   if (v.stealthed) return dim('stealthed');
   return '';
 }
@@ -176,17 +175,74 @@ export function auraRows(app, mem, v, key, plateW, icons) {
   return rows;
 }
 
-/** The cast slot's text: a cast bar, else crowd control, else stealth; empty when idle. */
-export function castSlot(v, now) {
+export const CAST_NAME_MS = 2000;  // a cast just done keeps its name in the cast slot this long (fight time)
+export const CAST_TRAIL_MS = 8000; // and its icon in the trail beside it this long, greyed for the second half
+
+/** The cast bar's progress and seconds left, 0..1. */
+function castProgress(casting, now) {
+  const total = Math.max(1, casting.endsAt - casting.startedAt);
+  const left = Math.max(0, casting.endsAt - now);
+  return { prog: Math.max(0, Math.min(1, casting.channeled ? left / total : 1 - left / total)), left };
+}
+
+/** The last cast while its icon is still in the trail, with `fresh` set while it keeps its name lit. `recent`
+ *  is the unit's casts, newest first ({ t, spellId, name, instant }, noteCasts in tuiFight). */
+function lastCast(recent, now) {
+  const r = recent?.[0];
+  return r && now - r.t < CAST_TRAIL_MS ? { ...r, fresh: now - r.t < CAST_NAME_MS } : null;
+}
+const freshCast = (recent, now) => { const r = lastCast(recent, now); return r?.fresh ? r : null; };
+
+/** The cast slot's text: a cast bar, else crowd control, else the cast just done (an instant says so, the
+ *  casts before it trail after it), else stealth, else the last cast gone dim; empty when idle. */
+export function castSlot(v, now, recent) {
   if (v.casting) {
-    const total = v.casting.endsAt - v.casting.startedAt;
-    const left = Math.max(0, v.casting.endsAt - now);
-    const prog = v.casting.channeled ? left / total : 1 - left / total;
+    const { prog, left } = castProgress(v.casting, now);
     return `${fit(yellow(v.casting.name), 14)} ${bar(prog, 1, 10, yellow)} ${dim(`${(left / 1000).toFixed(1)}s`)}`;
   }
   if (v.controlled) return red(v.controlled.control);
-  if (v.stealthed) return dim('stealthed');
-  return '';
+  const last = lastCast(recent, now);
+  if (!last || (!last.fresh && v.stealthed)) return v.stealthed ? dim('stealthed') : '';
+  const before = recent.slice(1).filter((r) => now - r.t < CAST_TRAIL_MS).map((r) => r.name);
+  const trail = before.length ? dim(`  ‹ ${before.join(' ‹ ')}`) : '';
+  return last.fresh ? `${cyan(bold(last.name))}${last.instant ? dim(' instant') : ''}${trail}` : `${dim(last.name)}${trail}`;
+}
+
+/**
+ * The cast slot two rows tall and `w` wide, where icons draw: the spell's icon, its name beside it and under
+ * the name the cast bar (a cast in progress) or "instant" (one just gone off, for CAST_NAME_MS; after that the
+ * name stays dim). The icons of the casts before it trail off to the right, newest first, grey once they are
+ * half way out, like an aura strip of what you pressed. Crowd control and stealth take the lead as castSlot has them.
+ */
+export function castRows(app, v, recent, now, w) {
+  const spell = (id) => app.ds.spell(id);
+  let lead = null, top = '', under = '';
+  const last = lastCast(recent, now);
+  if (v.casting) {
+    const { prog, left } = castProgress(v.casting, now);
+    lead = { spellId: v.casting.spellId, since: v.casting.startedAt };
+    top = yellow(v.casting.name);
+    under = `${bar(prog, 1, 10, yellow)} ${dim(`${(left / 1000).toFixed(1)}s`)}`;
+  } else if (v.controlled) top = red(v.controlled.control);
+  else if (last && (last.fresh || !v.stealthed)) {
+    lead = { spellId: last.spellId, since: last.t, gray: now - last.t > CAST_TRAIL_MS / 2 };
+    top = !last.fresh ? dim(last.name) : now - last.t > CAST_NAME_MS / 2 ? cyan(last.name) : cyan(bold(last.name));
+    under = last.fresh && last.instant ? dim('instant') : '';
+  } else if (v.stealthed) top = dim('stealthed');
+  const nameW = Math.min(16, Math.max(8, w - 5));
+  const art = lead ? iconArt(spell(lead.spellId)?.icon, 4, lead.gray ? 'gray' : '') : null;
+  const rows = art ? [`${art[0]} ${fit(cut(top, nameW), nameW)}`, `${art[1]} ${fit(cut(under, nameW), nameW)}`] : [fit(cut(top, nameW + 5), nameW + 5), fit(cut(under, nameW + 5), nameW + 5)];
+  // The trail: what went off before the lead (a channel is in `recent` from its first tick, so it is the lead,
+  // not its own trail).
+  const room = Math.floor((w - vis(rows[0]) - 1) / 5);
+  const trail = (recent ?? []).filter((r) => now - r.t < CAST_TRAIL_MS && !(lead && r.spellId === lead.spellId && r.t >= lead.since)).slice(0, Math.max(0, room));
+  for (const r of trail) {
+    const old = now - r.t > CAST_TRAIL_MS / 2;
+    const ic = iconArt(spell(r.spellId)?.icon, 4, old ? 'gray' : '');
+    rows[0] += ` ${ic ? ic[0] : dim(fit(r.name, 4))}`;
+    rows[1] += ` ${ic ? ic[1] : dim(fit(r.name.slice(4), 4))}`;
+  }
+  return rows.every((l) => !strip(l).trim()) ? ['', ''] : rows;
 }
 
 /** Short buffs green then debuffs red, in the order they first showed up, so a refreshed one keeps its place. */
@@ -256,7 +312,7 @@ const coinIcon = (copper) => (copper < 100 ? 'inv_misc_coin_05' : copper < 10_00
 /** What the foe dropped, items then the coin: each with its icon name and its line in the quality colour. */
 export function lootToasts(app, hold) {
   const out = hold.loot.map((d) => { const it = app.ds.item(d.item); return { icon: it?.icon, text: `${itemText(it, String(d.item))}${d.count > 1 ? dim(` x${d.count}`) : ''}` }; });
-  if (hold.copper) out.push({ icon: coinIcon(hold.copper), coin: true, text: yellow(moneyText(hold.copper)) });
+  if (hold.copper) out.push({ icon: coinIcon(hold.copper), coin: true, text: coinText(hold.copper) });
   return out;
 }
 

package/src/cli/tuiTalents.mjs

@@ -1,19 +1,18 @@
 // Talent builds for the Talents tab (B): the premade playerbot specs for your class, loadouts you saved, a pasted
 // talent string (Wowhead-style digits or a classicdb link), and your own string to copy. Applying any of them
 // is a respec at the usual price when points are already spent.
-import { bold, dim, yellow, green, red, cyan } from './text.mjs';
-import { moneyText } from '../domain/economy/money.ts';
+import { bold, dim, yellow, green, red, cyan, coinText } from './text.mjs';
 import { talentLinkFromTalents } from '../domain/character/talentLink.ts';
 import { linkFromClassicdbHash } from '../domain/character/talentImport.ts';
 
 function applied(app, r) {
-  app.result(r, r.ok ? `Your talents are now ${r.name}${r.cost ? ` (respec ${moneyText(r.cost)})` : ''}.` : '');
+  app.result(r, r.ok ? `Your talents are now ${r.name}${r.cost ? ` (respec ${coinText(r.cost)})` : ''}.` : '');
 }
 
 /** Spent points cost a respec; say the price before doing it. */
 function withRespec(app, label, run) {
   const cost = app.g.respecCost();
-  if (cost > 0) app.confirm(`Switch to ${label}? The respec costs ${moneyText(cost)}.`, () => applied(app, run()));
+  if (cost > 0) app.confirm(`Switch to ${label}? The respec costs ${coinText(cost)}.`, () => applied(app, run()));
   else applied(app, run());
 }