linkchat-extension-spire 0.1.0 → 0.1.7

package/README.md

@@ -1,8 +1,8 @@
-# Spire for LinkChat — 0.1.0
+# Spire for LinkChat — 0.1.7
 
 按需安装的频道合作卡牌爬塔 TUI。需要支持扩展 API 1 的 LinkChatCLI **0.7.0-beta.2 及以上**（旧宿主只支持键盘，见下），以及管理员安装并启用 `linkchat-spire` 后端包；后端规则版本 `spire-tui-2`、内容版本 `0.1.0-alpha.2.dev17`，存档版本不一致时明确拒绝加载，不会静默升级进行中的局。
 
-离线包安装：`linkchat extension install spire --from /绝对路径/linkchat-extension-spire-0.1.0.tgz`；省略 `--from` 时从官方 registry 安装 `linkchat-extension-spire@beta`。安装后重新打开 LinkChat，输入 `/spire`。2–4 人同频道创建或加入房间，各自准备后开始。断线或退出会暂停整局；所有人重新准备后继续。
+离线包安装：`linkchat extension install spire --from /绝对路径/linkchat-extension-spire-0.1.7.tgz`；省略 `--from` 时从官方 registry 安装 `linkchat-extension-spire@latest`。安装后重新打开 LinkChat，输入 `/spire`。2–4 人同频道创建或加入房间，各自准备后开始。断线或退出会暂停整局；所有人重新准备后继续。
 
 ## 操作
 
@@ -20,11 +20,11 @@
 
 **其他**：Tab 依次查看牌组、抽牌堆、弃牌堆、消耗堆、遗物、药水、状态、日志；Esc 返回或暂停退出；药水面板 D 丢弃药水；多选可用数字键定位、空格勾选、确认行提交，规则允许空选时会给出明确的取消项。请求结果不明时按 R 重试同一操作，不会重复出牌。
 
-**鼠标**（需要客户端宿主 0.7.0-beta.3 及以上）：鼠标移到某行即高亮该行（等同选中），**单击即生效**；点顶部面板名切换面板；滚轮滚动列表（地图页滚动地图），弹窗有长说明时滚轮翻页。游戏界面会接管鼠标，想在终端里选中或复制文本请按住 Shift 拖拽。旧宿主上鼠标点击不会生效。
+**鼠标**（需要客户端宿主 0.7.0 及以上）：鼠标移到某行即高亮该行（等同选中），**单击即生效**；点顶部面板名切换面板；滚轮滚动列表（地图页滚动地图），弹窗有长说明时滚轮翻页。游戏界面会接管鼠标，想在终端里选中或复制文本请按住 Shift 拖拽。旧宿主上鼠标点击不会生效。
 
 ## 内容
 
-五位角色：铁甲战士（80 生命）、静默猎手（70）、故障机器人（75）、摄政王（75）、亡灵契约师（66）。三幕路线：首幕在蔓生之地与地下码头之间抽取，随后进入巢穴与荣光，每幕 13–15 层，各有自己的事件池与古神。
+五位角色：铁甲战士（80 生命）、静默猎手（70）、故障机器人（75）、储君（75）、亡灵契约师（66）。三幕路线：首幕在蔓生之地与地下码头之间抽取，随后进入巢穴与荣光，每幕 13–15 层，各有自己的事件池与古神。
 
 规则参考 v0.111.0 并与之一致：596 张牌（攻击 198、技能 246、能力 113，另有状态 17、诅咒 18、任务 4）、298 件遗物、64 种药水、80 组遭遇、108 种敌人、57 个事件。中文文本自行编写；分支地图与内容抽取为精选内容适配，不兼容原作种子、存档及联机。无原游戏程序、美术、音频或反编译源码。
 

package/index.js

@@ -81,6 +81,272 @@ export const internalIntentKeys = {
   sleeping: '引擎以 asleep 力量表示沉睡，本字段是数据标记',
 };
 const signed = value => `${value > 0 ? '+' : ''}${value}`;
+// --- act map (§D) -----------------------------------------------------------
+const MAP_CELL = 10;
+const FLIGHT_COLOUR = '\x1b[95m';   // a move only a WingedBoots charge allows
+function mapData(view) {
+  const nodes = (view?.nodes ?? []).filter(node => node && typeof node.id === 'string');
+  const byId = new Map(nodes.map(node => [node.id, node]));
+  const rows = new Map();
+  for (const node of nodes) {
+    if (!rows.has(node.row)) rows.set(node.row, []);
+    rows.get(node.row).push(node);
+  }
+  for (const list of rows.values()) list.sort((left, right) => left.col - right.col);
+  return { nodes, byId, rows, keys: [...rows.keys()].sort((left, right) => right - left),
+           current: byId.get(view.current), reachable: new Set(view.reachable ?? []), visited: new Set(view.path ?? []) };
+}
+// Places cells at display columns, so the frame stays aligned whatever the
+// terminal's character widths are.
+function place(cells, width) {
+  let out = '', at = 0;
+  const placed = [];
+  for (const cell of [...cells].sort((left, right) => left.at - right.at)) {
+    if (cell.at < at) continue;
+    out += ' '.repeat(cell.at - at) + cell.text;
+    placed.push({ ...cell, from: cell.at, width: displayWidth(cell.text) });
+    at = cell.at + displayWidth(cell.text);
+  }
+  return { text: cut(out, width), placed };
+}
+function mapRouteIndex(id, options) {
+  return (options ?? []).findIndex(row => row.action?.type === 'vote' && row.action.node === id);
+}
+// One glyph per set of directions, so a corner always joins the lines that meet.
+const JOIN = {
+  u: '│', d: '│', l: '─', r: '─', ud: '│', ul: '┘', ur: '└', dl: '┐', dr: '┌', lr: '─',
+  udl: '┤', udr: '├', ulr: '┴', dlr: '┬', udlr: '┼',
+};
+const joinGlyph = directions => {
+  const set = new Set(directions);
+  const key = `${set.has('u') ? 'u' : ''}${set.has('d') ? 'd' : ''}${set.has('l') ? 'l' : ''}${set.has('r') ? 'r' : ''}`;
+  return JOIN[key] ?? '─';
+};
+function mapLabel(view, data, node, full, options) {
+  if (full) return node.id === view.current ? '●' : data.visited.has(node.id) ? '✓' : data.reachable.has(node.id) ? '◆' : '·';
+  const route = mapRouteIndex(node.id, options);
+  const mark = node.id === view.current ? '● ' : data.visited.has(node.id) ? '✓ ' : '';
+  return `${mark}${route >= 0 ? route + 1 : ''}[${node.type}]`;
+}
+// Where can I go is the first question a map answers, so the state is a colour:
+// the position bright cyan, a room you can enter bright green, the rest grey.
+function mapPaint(view, data, node, label) {
+  const colour = node.id === view.current ? '\x1b[1;96m' : data.reachable.has(node.id) ? '\x1b[92m' : '\x1b[90m';
+  return `${colour}${label}\x1b[0m`;
+}
+// A vote is a coloured digit after the room, so a party sees the tally on the map.
+function mapVotes(node, players) {
+  const seats = (players ?? []).filter(player => player.vote === node.id).length;
+  return seats ? { text: `\x1b[33m${seats}\x1b[0m`, width: 1 } : { text: '', width: 0 };
+}
+// One lane column per room that links forward. Two rooms whose spans overlap
+// cannot share a column; rooms whose spans are separated by a blank line can, so
+// a gap is only as wide as its busiest stretch.
+function mapLanes(data, layers, index, extra) {
+  const plans = [];
+  for (const parent of data.rows.get(layers[index]) ?? []) {
+    const kids = (data.rows.get(layers[index + 1]) ?? []).filter(child => (parent.children ?? []).includes(child.id));
+    const flights = (extra?.get(parent.id) ?? []).filter(id => !kids.some(child => child.id === id));
+    if (!kids.length && !flights.length) continue;
+    const targets = [...kids.map(kid => kid.col), ...flights.map(id => data.byId.get(id).col)].sort((left, right) => left - right);
+    plans.push({ id: parent.id, line: parent.col, kids: targets,
+                 flight: new Set(flights),
+                 owns: new Set([...kids.map(kid => kid.id), ...flights]),
+                 top: Math.min(parent.col, ...targets), bottom: Math.max(parent.col, ...targets), lane: 0 });
+  }
+  // A room at line L draws a rail along line L. A visitor whose kid lands on L
+  // must therefore sit to its right, or the visitor's rail would cross the
+  // resident's lane -- and a crossing there reads as a move that does not exist.
+  const resident = new Map(plans.map(plan => [plan.line, plan.id]));
+  const before = new Map(plans.map(plan => [plan.id, new Set()]));
+  for (const plan of plans) {
+    for (const line of plan.kids) {
+      const host = resident.get(line);
+      if (host !== undefined && host !== plan.id) before.get(plan.id).add(host);
+    }
+  }
+  const order = [];
+  const pending = new Set(plans.map(plan => plan.id));
+  while (pending.size) {
+    const next = [...pending].filter(id => before.get(id).size === 0).sort()[0];
+    if (next === undefined) break;                       // a cycle: no order removes it
+    order.push(next);
+    pending.delete(next);
+    for (const id of pending) before.get(id).delete(next);
+  }
+  for (const id of pending) order.push(id);
+  const rank = new Map(order.map((id, at) => [id, at]));
+  const placed = [];
+  for (const plan of [...plans].sort((left, right) => rank.get(left.id) - rank.get(right.id))) {
+    let column = Math.max(-1, ...[...before.get(plan.id)].map(id => placed.find(entry => entry.id === id)?.lane ?? -1)) + 1;
+    while (placed.some(entry => entry.lane === column && !(entry.bottom + 1 < plan.top || plan.bottom + 1 < entry.top))) column += 1;
+    plan.lane = column;
+    placed.push(plan);
+  }
+  return { plans, lanes: placed.length ? Math.max(...placed.map(entry => entry.lane)) + 1 : 0 };
+}
+function drawMap(view, width, session) {
+  const data = mapData(view);
+  const layers = [...data.rows.keys()].sort((left, right) => left - right);
+  const options = session?.options ?? [];
+  const full = session?.full ?? false;
+  const labels = new Map(data.nodes.map(node => [node.id, mapLabel(view, data, node, full, options)]));
+  const votes = new Map(data.nodes.map(node => [node.id, mapVotes(node, session?.players)]));
+  const side = new Map(data.nodes.map(node => [node.id, displayWidth(labels.get(node.id)) + votes.get(node.id).width]));
+  const widest = full ? Math.max(2, ...side.values()) : Math.max(6, ...side.values());
+  // §D: while a WingedBoots has charges the server accepts any room in the next
+  // layer, so those moves are drawn too — a plan must not miss a legal route.
+  const extra = new Map();
+  if (data.current) {
+    const here = data.current.row;
+    const flights = (view.reachable ?? []).filter(id => !(data.current.children ?? []).includes(id)
+      && data.byId.get(id)?.row === here + 1);
+    if (flights.length) extra.set(data.current.id, flights);
+  }
+  const gaps = [];
+  for (let index = 0; index + 1 < layers.length; index++) gaps.push(mapLanes(data, layers, index, extra));
+  const xs = [0];
+  // One column is kept for the rail itself: a room whose label is the widest
+  // still needs a dash between it and its lane, or the link starts in mid-air.
+  for (let index = 0; index + 1 < layers.length; index++) xs.push(xs[index] + widest + gaps[index].lanes + 2);
+  const roomWidth = index => Math.max(0, ...(data.rows.get(layers[index]) ?? []).map(node => side.get(node.id)));
+  const anchor = data.byId.get(session?.anchor) ?? data.current;
+  const home = Math.max(0, layers.indexOf(anchor ? anchor.row : layers[0]));
+  // Only the layers on screen take width: the hidden ones must not push the map right.
+  const fits = (start, span) => start + span - 1 < layers.length
+    && xs[start + span - 1] - xs[start] + roomWidth(start + span - 1) <= width;
+  const spanFrom = start => { let span = 1; while (fits(start, span + 1)) span += 1; return span; };
+  const widestSpan = Math.max(...layers.map((_, start) => spanFrom(start)));
+  const scroll = session?.scroll;
+  const scrolled = scroll !== undefined && scroll !== null;
+  let from = Math.max(0, Math.min(Math.max(0, layers.length - widestSpan),
+    scrolled ? scroll : Math.max(0, home - Math.floor(widestSpan / 2))));
+  let span = spanFrom(from);
+  // Following the position, it must stay in view: shift the window back when the
+  // widest span did not fit where it was centred. A deliberate scroll may leave it.
+  if (!scrolled) {
+    while (from > 0 && from + span <= home) { from -= 1; span = spanFrom(from); }
+    if (from > home) { from = home; span = spanFrom(from); }
+  }
+  const shown = index => index >= from && index < from + span;
+  const origin = xs[from];
+  const at = index => xs[index] - origin;
+  const slot = new Map(data.nodes.map(node => [node.id, node.col]));
+  const height = Math.max(0, ...slot.values()) + 1;
+  // A sparse canvas: a name, a lane and a rail may share a column, never a cell.
+  const node = new Map();
+  const rail = new Map();
+  const cellOf = (line, col) => {
+    const key = `${line}:${col}`;
+    let part = rail.get(key);
+    if (!part) { part = { line, col, v: null, vd: new Set(), h: new Map(), kid: new Map(), flight: false }; rail.set(key, part); }
+    return part;
+  };
+  const add = (line, col, owner, directions, kid, flight) => {
+    if (col < 0 || col >= width) return;                 // the window cuts the drawing
+    const part = cellOf(line, col);
+    for (const direction of directions) {
+      if (direction === 'u' || direction === 'd') { if (part.v === null) part.v = owner; part.vd.add(direction); }
+      else part.h.set(owner, (part.h.get(owner) ?? new Set()).add(direction));
+    }
+    if (kid !== undefined) part.kid.set(owner, kid);
+    if (flight) part.flight = true;
+  };
+  for (let index = 0; index < layers.length; index++) {
+    if (!shown(index)) continue;
+    for (const room of data.rows.get(layers[index]) ?? []) {
+      const label = `${mapPaint(view, data, room, labels.get(room.id))}${votes.get(room.id).text}`;
+      node.set(`${slot.get(room.id)}:${at(index)}`, { room, label, plain: labels.get(room.id) });
+    }
+  }
+  const targets = new Map();                     // parent -> the rooms it links to
+  const kidLines = new Map();                    // parent -> the lines those rooms sit on
+  for (let index = 0; index + 1 < layers.length; index++) {
+    if (!shown(index) || !shown(index + 1)) continue;
+    for (const plan of gaps[index].plans) {
+      targets.set(plan.id, plan.owns);
+      kidLines.set(plan.id, new Set(plan.kids));
+      const lane = at(index) + widest + 1 + plan.lane;
+      const begin = at(index) + side.get(plan.id);
+      for (let x = begin; x < lane; x++) add(plan.line, x, plan.id, 'lr');
+      for (let line = plan.top; line <= plan.bottom; line++) {
+        const directions = [];
+        if (line > plan.top) directions.push('u');
+        if (line < plan.bottom) directions.push('d');
+        if (line === plan.line) directions.push('l');
+        if (plan.kids.includes(line)) directions.push('r');
+        if (directions.length) add(line, lane, plan.id, directions);
+      }
+      for (const line of plan.kids) {
+        const kid = (data.rows.get(layers[index + 1]) ?? []).find(room => room.col === line);
+        const flight = kid && plan.flight.has(kid.id);
+        for (let x = lane + 1; x < at(index + 1); x++) add(line, x, plan.id, 'lr', kid?.id, flight);
+      }
+    }
+  }
+  const lines = [];
+  for (let line = 0; line < height; line++) {
+    const row = [];
+    for (const [key, part] of rail) {
+      if (part.line !== line) continue;
+      const directions = new Set();
+      if (part.v !== null) {
+        // A lane joins its own taps. A foreign rail crossing it is cut -- unless
+        // both lead to the same room, where the join is simply true.
+        for (const direction of part.vd) directions.add(direction);
+        // A rail crossing a lane joins it: whatever the player follows, the run
+        // stays on the room's own line, and every line on that line leads to the
+        // one room this line reaches.
+        for (const set of part.h.values()) for (const direction of set) directions.add(direction);
+      } else {
+        for (const set of part.h.values()) for (const direction of set) directions.add(direction);
+      }
+      if (!directions.size) continue;
+      const glyph = joinGlyph(directions);
+      row.push({ at: part.col, text: part.flight ? `${FLIGHT_COLOUR}${glyph}\x1b[0m` : glyph });
+    }
+    for (const [key, room] of node) {
+      const [on, col] = key.split(':').map(Number);
+      if (on === line) row.push({ at: col, text: room.label, node: room.room, plain: room.plain });
+    }
+    const placed = place(row.sort((left, right) => left.at - right.at), width);
+    const here = placed.placed.filter(entry => entry.node);
+    const tone = here.some(entry => entry.node.id === view.current) ? 'selected'
+      : here.some(entry => data.reachable.has(entry.node.id)) ? 'text' : 'muted';
+    lines.push({ text: placed.text, tone,
+      cells: here.map(entry => ({ id: entry.node.id, row: 0, col: entry.from, width: displayWidth(entry.plain ?? entry.text), height: 1 })) });
+  }
+  return { lines, from, span, total: layers.length, height,
+           flight: (extra.get(data.current?.id) ?? []).length > 0 };
+}
+
+// The package ships without dependencies, so the tab strip is measured here.
+// Its labels are tabNames (CJK), pile counts in fullwidth parens, brackets.
+const wideChar = character => { const code = character.codePointAt(0); return code >= 0x1100 && (code <= 0x115f || (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) || (code >= 0xac00 && code <= 0xd7a3) || (code >= 0xf900 && code <= 0xfaff) || (code >= 0xfe30 && code <= 0xfe6f) || (code >= 0xff00 && code <= 0xff60) || (code >= 0xffe0 && code <= 0xffe6)); };
+// A coloured digit is zero columns wide: measuring and cutting step over the
+// escape sequences instead of counting their characters.
+const ESCAPE_END = /[a-zA-Z]/;
+const displayWidth = text => {
+  let width = 0, escape = false;
+  for (const character of String(text)) {
+    if (escape) { if (ESCAPE_END.test(character)) escape = false; continue; }
+    if (character === '\x1b') { escape = true; continue; }
+    width += wideChar(character) ? 2 : 1;
+  }
+  return width;
+};
+const pad = (text, width) => text + ' '.repeat(Math.max(0, width - displayWidth(text)));
+function cut(text, width) {
+  let out = '', used = 0, escape = false, trimmed = false;
+  for (const character of text) {
+    if (escape) { out += character; if (ESCAPE_END.test(character)) escape = false; continue; }
+    if (character === '\x1b') { out += character; escape = true; continue; }
+    const size = wideChar(character) ? 2 : 1;
+    if (used + size > width) { trimmed = true; break; }
+    out += character; used += size;
+  }
+  return trimmed && out.includes('\x1b') ? `${out}\x1b[0m` : out;
+}
 export function createScreen(ctx) {
   let state, roomId, leaseId, connection, online = false, synced = false, rooms = [], loading = true, busy = false, closed = false;
   let tab = 0, selected = 'create', index = 0, modal, note = '', pending, columns = 80, height = 24, serverProtocol = 1, unsupported;
@@ -90,7 +356,8 @@ export function createScreen(ctx) {
   let enemyPage = 0;              // the enemy block page the battlefield is showing
   let listPage = 0;               // the 1-9/0 page of the item list
   let pageSize = 10;              // how many items a page holds at the current size
-  let mapScroll;                  // the map row the view starts at (undefined follows the position)
+  let mapScroll;                  // the map row the view starts at (undefined follows the anchor)
+  let mapAnchor;                  // the room the viewport is parked on (a click or 回到当前位置)
   let mapFocus;                   // the node being looked at on the map, never a submitted route
   let mapFull = false;            // §D 查看全图: every row of the act, markers only
   let chain;                      // §G: the claim that follows this player's own treasure pick
@@ -99,7 +366,6 @@ export function createScreen(ctx) {
   let rewardPick = new Map();     // §F the candidate chosen in each card reward
   let skipQueue = [];             // §F the server skip rows still to run, in reward order
   let skipKnown = new Set();      // §F the rows that existed when the skip was confirmed
-  let shopTab = 'card';           // §E the shop category the goods list shows
   const picked = new Set(); let choiceReturn;
   const changed = () => { if (!closed && !ctx.signal.aborted) ctx.redraw(); };
   const errorText = e => e instanceof Error ? e.message : '游戏请求失败。';
@@ -152,11 +418,10 @@ export function createScreen(ctx) {
         const open = rewardOpen === group.key;
         rows.push({ id: group.key, label: `${open ? '▾' : '▸'} ${group.title}  ${status}`, group: group.key, open });
         if (!open) continue;
-        for (const row of group.candidates) rows.push({ ...row, label: `　${rewardPick.get(group.key) === row.id ? '[x]' : '[ ]'} ${row.label.replace(/^奖励 \d+：/, '')}`, candidate: true, group: group.key });
-        rows.push({ id: `claim:${group.key}`, label: '　[领取所选卡牌]', group: group.key });
-        if (group.skips.length) rows.push({ id: `skip:${group.key}`, label: '　[跳过这份卡牌奖励]', action: group.skips[0].action, group: group.key, skipped: true });
+        // Picking the card is the claim: no separate 领取 row, and the way past a
+        // card reward is 跳过剩余奖励并离开 at the end of the list.
+        for (const row of group.candidates) rows.push({ ...row, label: `　${row.label.replace(/^奖励 \d+：/, '')}`, candidate: true, group: group.key });
         for (const row of group.others) rows.push({ ...row, label: `　${row.label}`, group: group.key });
-        rows.push({ id: `back:${group.key}`, label: '　[返回奖励清单]' });
       }
       rows.push(rows.length ? { id: 'skipAll', label: '跳过剩余奖励并离开' }
         : { id: 'rewardDone', label: state.players.length > 1 ? '奖励已结算 · 等待队友' : '奖励已结算 · 等待继续' });
@@ -349,10 +614,6 @@ export function createScreen(ctx) {
     const at = items().findIndex(row => row.id === id);
     if (at >= 0) moveTo(at);
   }
-  // The package ships without dependencies, so the tab strip is measured here.
-  // Its labels are tabNames (CJK), pile counts in fullwidth parens, brackets.
-  const wideChar = character => { const code = character.codePointAt(0); return code >= 0x1100 && (code <= 0x115f || (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) || (code >= 0xac00 && code <= 0xd7a3) || (code >= 0xf900 && code <= 0xfaff) || (code >= 0xfe30 && code <= 0xfe6f) || (code >= 0xff00 && code <= 0xff60) || (code >= 0xffe0 && code <= 0xffe6)); };
-  const displayWidth = text => [...text].reduce((total, character) => total + (wideChar(character) ? 2 : 1), 0);
   function tabSpans(labels) { let from = 0; return labels.map((label, index) => { const span = { tab: index, from, to: from + displayWidth(label) }; from = span.to + 3; return span; }); }
   // --- battlefield ------------------------------------------------------------
   const BAR_CELLS = 10;
@@ -376,16 +637,6 @@ export function createScreen(ctx) {
     }
     return [buffs, debuffs];
   }
-  const pad = (text, width) => text + ' '.repeat(Math.max(0, width - displayWidth(text)));
-  function cut(text, width) {
-    let out = '', used = 0;
-    for (const character of text) {
-      const size = wideChar(character) ? 2 : 1;
-      if (used + size > width) break;
-      out += character; used += size;
-    }
-    return out;
-  }
   function powerEntries(creature) {
     const monologues = creature.monologueInstances ?? [];
     return Object.entries(creature.powers ?? {}).filter(([, value]) => value !== 0).flatMap(([key, value]) =>
@@ -460,84 +711,8 @@ export function createScreen(ctx) {
     return [`${player.id === ctx.user.id ? '› ' : ''}${player.name}${player.characterName ? ` · ${player.characterName}` : ''}${player.done ? ' · 已结束' : ''}`,
             ...statLines(player, resources ? [resources] : [], width)];
   }
-  // --- act map (§D) -----------------------------------------------------------
-  const MAP_CELL = 12;
-  function mapData(view) {
-    const nodes = (view?.nodes ?? []).filter(node => node && typeof node.id === 'string');
-    const byId = new Map(nodes.map(node => [node.id, node]));
-    const rows = new Map();
-    for (const node of nodes) {
-      if (!rows.has(node.row)) rows.set(node.row, []);
-      rows.get(node.row).push(node);
-    }
-    for (const list of rows.values()) list.sort((left, right) => left.col - right.col);
-    return { byId, rows, keys: [...rows.keys()].sort((left, right) => right - left),
-             current: byId.get(view.current), reachable: new Set(view.reachable ?? []), visited: new Set(view.path ?? []) };
-  }
-  // Places cells at display columns, so the frame stays aligned whatever the
-  // terminal's character widths are.
-  function place(cells, width) {
-    let out = '', at = 0;
-    const placed = [];
-    for (const cell of [...cells].sort((left, right) => left.at - right.at)) {
-      if (cell.at < at) continue;
-      out += ' '.repeat(cell.at - at) + cell.text;
-      placed.push({ ...cell, from: cell.at, width: displayWidth(cell.text) });
-      at = cell.at + displayWidth(cell.text);
-    }
-    return { text: cut(out, width), placed };
-  }
-  function mapRouteIndex(id) {
-    return (state.options ?? []).findIndex(row => row.action?.type === 'vote' && row.action.node === id);
-  }
-  function mapLines(view, width, budget) {
-    const data = mapData(view);
-    const cell = Math.max(7, Math.min(MAP_CELL, Math.floor((width - 2) / 7)));
-    const span = Math.max(1, Math.min(7, Math.floor((width - 2) / cell)));
-    const follow = data.byId.get(mapFocus) ?? data.current;
-    const center = follow ? follow.col : Math.floor((span - 1) / 2);
-    const from = Math.max(0, Math.min(7 - span, center - Math.floor(span / 2)));
-    const at = col => 1 + (col - from) * cell;
-    const shown = col => col >= from && col < from + span;
-    const body = mapFull ? data.keys.length : Math.max(1, Math.floor((budget - 2) / 2));
-    const followAt = data.keys.indexOf(follow ? follow.row : data.keys[0]);
-    const top = Math.max(0, Math.min(data.keys.length - body, mapScroll ?? (followAt < 0 ? 0 : followAt - 2)));
-    const lines = [];
-    for (let index = top; index < Math.min(data.keys.length, top + body); index++) {
-      const key = data.keys[index];
-      const above = mapFull ? [] : data.rows.get(data.keys[index - 1]) ?? [];
-      const cells = [];
-      for (const node of data.rows.get(key) ?? []) {
-        if (!shown(node.col)) continue;
-        const route = mapRouteIndex(node.id);
-        const label = mapFull ? (node.id === view.current ? '●' : data.visited.has(node.id) ? '✓' : data.reachable.has(node.id) ? '◆' : '·')
-          : `${route >= 0 ? route + 1 : ''}[${node.type}]`;
-        const inset = mapFull ? 0 : Math.max(0, Math.floor((cell - displayWidth(label)) / 2));
-        const text = ' '.repeat(inset) + label;
-        cells.push({ text, at: at(node.col), node,
-                     tone: node.id === view.current ? 'selected' : data.reachable.has(node.id) ? 'text' : 'muted' });
-      }
-      const links = [];
-      if (above.length) for (const parent of data.rows.get(key) ?? []) {
-        for (const child of above) {
-          if (!(parent.children ?? []).includes(child.id) || !shown(child.col) || !shown(parent.col)) continue;
-          links.push(child.col === parent.col
-            ? { text: '│', at: at(child.col) + Math.floor((mapFull ? 1 : cell) / 2) }
-            : { text: child.col < parent.col ? '╲' : '╱', at: Math.floor((at(child.col) + at(parent.col) + (mapFull ? 1 : cell)) / 2) });
-        }
-      }
-      if (links.length) lines.push({ text: place(links, width).text, tone: 'muted', cells: [] });
-      // The frame carries one tone per row, so the row reads as the state of its
-      // nodes: the position wins, then a reachable neighbour, then grey.
-      const tone = cells.some(item => item.node.id === view.current) ? 'selected'
-        : cells.some(item => data.reachable.has(item.node.id)) ? 'text' : 'muted';
-      const drawn = place(cells, width);
-      lines.push({ text: drawn.text, tone, cells: drawn.placed });
-    }
-    return { lines, top, body, total: data.keys.length };
-  }
-  function mapHeader(width, view) {
-    const left = `路线选择 · ${view.act?.name ?? ''}`.trim();
+function mapHeader(width, view) {
+    const left = `路线选择 · ${state?.act?.name ?? view.act?.name ?? ''}`.trim();
     const buttons = ['[回到当前位置 C]', '[查看全图 F]'];
     const right = buttons.join(' ');
     const head = cut(left, Math.max(8, width - displayWidth(right) - 1));
@@ -564,11 +739,19 @@ export function createScreen(ctx) {
   function shopRows() {
     const rows = state.options ?? [];
     const leave = rows.filter(row => row.action?.type === 'continue');
-    const goods = shopTab === 'removal' ? rows.filter(row => row.action?.type === 'removeCard')
-      : rows.filter(row => row.action?.type === 'buy' && (row.shop?.kind ?? 'card') === shopTab);
-    // Anything the shop branch cannot place — a nested reward, a forced choice —
-    // keeps the generic list instead of disappearing.
-    return goods.length || leave.length ? [...goods, ...leave] : rows;
+    const sections = [];
+    for (const [kind, name] of shopCategories()) {
+      const goods = rows.filter(row => (row.action?.type === 'buy' && (row.shop?.kind ?? 'card') === kind)
+        || (kind === 'removal' && row.action?.type === 'removeCard'));
+      if (!goods.length) continue;
+      sections.push({ id: `section:${kind}`, label: `--${name}--`, separator: true });
+      sections.push(...goods);
+    }
+    if (!sections.length) return rows;
+    const listed = new Set(sections.map(row => row.id));
+    // Anything the shop cannot place — a nested reward, a forced choice — keeps
+    // the generic list instead of disappearing.
+    return [...sections, ...rows.filter(row => !listed.has(row.id) && !leave.includes(row)), ...leave];
   }
   // The pane is the same block every time: what it is, what it does, what it
   // costs, and the one button that pays for it.
@@ -681,6 +864,21 @@ export function createScreen(ctx) {
     if (enemy) choose(`${enemy.name} · Esc 返回`, [intentLines(enemy.intent, enemy, state).join(' · ') || '（本回合无行动）', `${hpText(enemy)} HP · 格挡 ${enemy.block} · ${powersText(enemy.powers)}`].map((label, index) => ({ id: `detail${index}`, label })), () => { anchor(); changed(); });
     else if (player) choose(`${player.name} · Esc 返回`, [`${hpText(player)} HP · 格挡 ${player.block} · ${powersText(player.powers)}`].map((label, index) => ({ id: `detail${index}`, label })), () => { anchor(); changed(); });
   }
+  // §C: a legal target is marked by colour — enemies red, allies blue — and the
+  // one being aimed at is the brighter shade.
+  const TINTS = { enemy: 31, enemyHot: 91, ally: 34, allyHot: 94 };
+  const targetTint = (entry, arena) => `\x1b[${entry.id === targeting?.id ? TINTS[`${arena}Hot`] : TINTS[arena]}m`;
+  // Colour is invisible on a host that strips it, so the aimed block also says so
+  // in plain text, on its first line that has something to show.
+  const aimed = entry => entry.id === targeting?.id ? '▶' : '';
+  const tint = (lines, colour, mark) => {
+    let marked = false;
+    return lines.map(line => {
+      const lead = !marked && mark && line.trim() ? mark : '';
+      if (lead) marked = true;
+      return `${colour}${lead}${line}\x1b[0m`;
+    });
+  };
   function framed(lines, width, style) {
     const [left, right] = style === 'current' ? ['║', '║'] : ['│', '│'];
     const [topLeft, topRight, bottomLeft, bottomRight, bar] = style === 'current' ? ['╔', '╗', '╚', '╝', '═'] : ['┌', '┐', '└', '┘', '─'];
@@ -763,7 +961,13 @@ export function createScreen(ctx) {
       else void submit(action); return;
     }
     if (tab === 0 && row.group && row.id === row.group) { if (row.open) rewardPick.delete(row.group); rewardOpen = row.open ? undefined : row.group; changed(); return; }
-    if (tab === 0 && row.candidate) { rewardPick.set(row.group, row.id); changed(); return; }   // §F: a candidate is chosen, never claimed
+    if (tab === 0 && row.candidate && row.action) {
+      // Picking a card reward's card is the deliberate claim.
+      const action = { ...row.action, phaseId: state.phaseId };
+      rewardLog.set(row.group, '已领取');
+      void submit(action);
+      return;
+    }
     if (tab === 0 && row.group && row.id.startsWith('claim:')) {
       // §F: the deliberate claim: a card reward claims the chosen candidate, any
       // other reward claims by its own row.
@@ -829,7 +1033,6 @@ export function createScreen(ctx) {
         void submit(action);
       }
       else if (row.group) {
-        if (row.id.startsWith('back:')) { rewardOpen = undefined; changed(); return; }
         if (row.skipped) rewardLog.set(row.group, '已跳过'); else if (row.action) rewardLog.set(row.group, '已领取');
         if (row.action) void submit({ ...row.action, phaseId: state.phaseId });
         else changed();
@@ -871,6 +1074,9 @@ export function createScreen(ctx) {
       else void submit(row.action);
     }
   }
+  // The drawing reads the view state and the party; this supplies both.
+  const mapLines = (view, width) => drawMap(view, width,
+    { full: mapFull, scroll: mapScroll, anchor: mapAnchor, players: state?.players, options: state?.options });
   const screen = {
     render(width, rows) {
       columns = width; height = rows; hits = [];
@@ -914,7 +1120,7 @@ export function createScreen(ctx) {
               ...party.map(player => ({ id: String(player?.id), lines: ['', ...allyBlock(player, allyWidth - 2)], legal: legalAlly(String(player?.id)) })),
               ...shown.map(enemy => ({ id: enemy.id, lines: enemyBlock(enemy, foeWidth - 2), legal: legalEnemy(enemy) })),
             ];
-            const body = blocks.map((entry, index) => entry.legal ? framed(entry.lines, widths[index], targeting.id === entry.id ? 'current' : 'legal') : entry.lines);
+            const body = blocks.map(entry => entry.legal ? tint(entry.lines, targetTint(entry, targeting.arena), aimed(entry)) : entry.lines);
             const tall = Math.max(...body.map(lines => lines.length));
             const startRow = frame.length;
             for (let line = 0; line < tall; line++) add(body.map((lines, index) => pad(cut(lines[line] ?? '', widths[index] - 2), widths[index])).join('  '), 'text');
@@ -942,8 +1148,8 @@ export function createScreen(ctx) {
             ];
             for (const entry of section) {
               const top = frame.length;
-              const shownLines = entry.legal ? framed(entry.lines, Math.max(20, width - 2), targeting.id === entry.id ? 'current' : 'legal') : entry.lines;
-              for (const line of shownLines) add(line, entry.legal ? 'selected' : 'text');
+              const shownLines = entry.legal ? tint(entry.lines, targetTint(entry, targeting.arena), aimed(entry)) : entry.lines;
+              for (const line of shownLines) add(line, 'text');
               hits.push({ kind: 'entity', id: entry.id, row: top, col: 0, width, height: shownLines.length });
             }
             if (pages > 1) add(`敌人 ${enemyPage + 1}/${pages} 页 · 共 ${alive.length} 名 · PgUp/PgDn 翻页`, 'muted');
@@ -952,7 +1158,9 @@ export function createScreen(ctx) {
           const capacity = own?.energyCapacity ?? usable;
           const orbs = '●'.repeat(Math.max(0, usable)) + '○'.repeat(Math.max(0, capacity - usable));
           const button = (own?.hp ?? 0) <= 0 ? '[已倒下]' : own?.done ? '[已结束回合]' : (!canAct() || state.paused) ? '[等待队友]' : '[E 结束回合]';
-          const energy = `能量 ${orbs ? `${orbs} ` : ''}${usable}/${capacity}`;
+          // §2: the Regent's stars are a resource of the same row as the energy.
+          const stars = own?.character === 'regent' || (own?.stars ?? 0) > 0 ? `星星 ${own?.stars ?? 0}` : '';
+          const energy = `能量 ${orbs ? `${orbs} ` : ''}${usable}/${capacity}${stars ? `   ${stars}` : ''}`;
           const buttonAt = Math.max(8, width - displayWidth(button) - 1);
           if (!modal) mark({ kind: 'endTurn', id: 'endTurn', col: buttonAt, width: displayWidth(button) });
           add(pad(energy, buttonAt) + button, 'title');
@@ -965,16 +1173,6 @@ export function createScreen(ctx) {
             const flag = !here ? '离线' : state.paused || state.phase === 'lobby' ? (player.ready ? '已准备' : '') : player.done ? '已完成' : '';
             add(cut(`${player.id === ctx.user.id ? '› ' : '  '}${player.name}${player.characterName ? ` · ${player.characterName}` : ''} ${hpText(player)} HP · 金币 ${player.gold ?? 0}${flag ? ` · ${flag}` : ''}${player.vote ? ` · 已投票 ${player.vote}` : ''}`, width), player.id === ctx.user.id ? 'selected' : 'text');
           }
-          if (state.phase === 'shop') {
-            // §E: categories, then the goods list, then the detail pane.
-            const tabs = shopCategories();
-            if (!tabs.some(([kind]) => kind === shopTab)) shopTab = tabs[0]?.[0] ?? 'card';
-            const labels = tabs.map(([kind, name]) => kind === shopTab ? `[${name}]` : name);
-            const head = frame.length;
-            add(labels.join('   '), 'muted');
-            hits.push({ kind: 'shoptab', id: 'shoptab', row: head, col: 0, width, height: 1,
-                        spans: tabSpans(labels).map((span, index) => ({ ...span, category: tabs[index][0] })) });
-          }
           if (['event', 'ending', 'victory'].includes(state.phase) && state.eventProgress?.description) add(state.eventProgress.description, 'muted');
           if (state.phase === 'map' && Array.isArray(state.mapView?.nodes) && state.mapView.nodes.length) {
             // §D: the real act map, drawn from the backend's nodes and edges only.
@@ -982,17 +1180,17 @@ export function createScreen(ctx) {
             const headRow = frame.length;
             add(head.text, 'muted');
             for (const button of head.buttons) hits.push({ kind: button.id, id: button.id, row: headRow, col: button.at, width: button.width, height: 1 });
-            const drawn = mapLines(state.mapView, width, Math.max(3, rows - frame.length - 11));
+            const drawn = mapLines(state.mapView, width);
             for (const line of drawn.lines) {
               const top = frame.length;
               add(line.text, line.tone);
-              for (const cell of line.cells) hits.push({ kind: 'node', id: cell.node.id, row: top, col: cell.from, width: cell.width, height: 1 });
+              for (const cell of line.cells) hits.push({ kind: 'node', id: cell.id, row: top, col: cell.col, width: cell.width, height: 1 });
             }
-            if (drawn.total > drawn.body || mapFull) add(`本幕 ${drawn.total} 行 · 显示第 ${drawn.top + 1}–${Math.min(drawn.total, drawn.top + drawn.body)} 行 · 滚轮查看`, 'muted');
+            if (drawn.total > drawn.span) add(`本幕 ${drawn.total} 层 · 显示第 ${drawn.from + 1}–${Math.min(drawn.total, drawn.from + drawn.span)} 层 · 滚轮查看`, 'muted');
             // A cramped frame spends its rows on the map itself: the legend and
-            // the hint are the first things to go, never the nodes.
+            // the hint are the first things to go, never the rooms.
             add(mapDetailText(state.mapView, mapData(state.mapView)), 'muted');
-            if (rows >= 26 || drawn.body >= 4) add('图例：数字 可前往 · ● 当前位置 · ✓ 已走过 · 其他 暂不可达 · 点击节点仅查看', 'muted');
+            if (rows >= 24) add(`图例：数字 可前往 · ● 当前位置 · ✓ 已走过 · 黄色数字 已投票人数 · 点击可前往的房间即投票${drawn.flight ? ' · 洋红连线 额外可达（下一层任意房间）' : ''}`, 'muted');
           }
         }
         const labels = tabs.map((key, i) => {
@@ -1014,6 +1212,7 @@ export function createScreen(ctx) {
       } else add('频道成员可加入 · R 刷新房间列表', 'muted');
       if (loading) add('正在加载…', 'muted');
       const logLines = state?.phase === 'combat' && !modal && activeTab() !== 'log' ? Math.min(2, Math.max(0, rows - frame.length - 8)) : 0;
+      if (state) add('');                                          // breathing room above the list
       anchor(); const list = items(), available = Math.max(1, rows - frame.length - 3 - (logLines ? logLines + 1 : 0));
       pageSize = available;
       const maxPage = Math.max(0, Math.ceil(list.length / available) - 1);
@@ -1026,6 +1225,17 @@ export function createScreen(ctx) {
         ? shopPane(width >= 100 ? Math.max(24, Math.floor(width * 0.42)) : width, list[index], width < 100) : undefined;
       const paneAt = pane && width >= 100 ? Math.max(20, width - pane.width) : undefined;
       for (let i = start; i < Math.min(list.length, start + available); i++) {
+        if (list[i].separator) {
+          // A heading keeps its place in the row count, so the detail pane's own
+          // lines still line up with the rows beside them.
+          mark({ kind: 'item', id: list[i].id });
+          const heading = `  ${list[i].label}`;
+          if (!paneAt) { add(heading, 'muted'); continue; }
+          const slot = i - start;
+          add(pad(cut(heading, paneAt - 2), paneAt) + (pane.lines[slot] ?? ''), 'muted');
+          for (const button of pane.buttons[slot] ?? []) hits.push({ ...button, row: frame.length - 1, col: paneAt + button.at, height: 1 });
+          continue;
+        }
         const badge = i - start + 1 === 10 ? '0' : String(i - start + 1);
         const rowText = `${i === index ? '›' : ' '} [${badge}] ${list[i].label}`;
         if (!paneAt) { mark({ kind: 'item', id: list[i].id }); add(rowText, i === index ? 'selected' : 'text'); continue; }
@@ -1076,14 +1286,8 @@ export function createScreen(ctx) {
         if (name === 'return' || name === 'enter') { submitTarget(targeting.id); return; }
         if (value === 'e') { cancelTargeting(); return; }
       }
-      if (!modal && state?.phase === 'shop' && (value === '[' || value === ']')) {
-        const tabs = shopCategories();
-        const at = Math.max(0, tabs.findIndex(([kind]) => kind === shopTab));
-        shopTab = tabs[(at + (value === ']' ? 1 : tabs.length - 1)) % Math.max(1, tabs.length)]?.[0] ?? shopTab;
-        index = 0; selected = undefined; changed(); return;
-      }
       if (!modal && state?.phase === 'map' && Array.isArray(state.mapView?.nodes)) {
-        if (value === 'c') { mapScroll = undefined; mapFocus = undefined; changed(); return; }
+        if (value === 'c') { mapScroll = undefined; mapFocus = undefined; mapAnchor = undefined; mapFull = false; changed(); return; }
         if (value === 'f') { mapFull = !mapFull; changed(); return; }
       }
       if (value === ' ' && !modal && !targeting) {
@@ -1167,16 +1371,12 @@ export function createScreen(ctx) {
       if (event.button === 'left') {
         const hit = hitAt(event.x, event.y);
         if (hit?.kind === 'node') {
-          // §D: a click highlights the node (and its route when it is reachable);
-          // going there is the confirm row or Enter.
-          mapFocus = hit.id;
-          const route = items().findIndex(row => row.action?.type === 'vote' && row.id === hit.id);
-          if (route >= 0) moveTo(route); else changed();
-          return;
-        }
-        if (hit?.kind === 'shoptab') {
-          const span = hit.spans?.find(range => event.x >= range.from && event.x < range.to);
-          if (span) { shopTab = span.category; index = 0; selected = undefined; changed(); }
+          // §D: clicking a room you can travel to is the vote itself; any other
+          // room is only looked at, and parks the view there.
+          mapFocus = hit.id; mapAnchor = hit.id; mapScroll = undefined;
+          const row = items().find(row => row.action?.type === 'vote' && row.id === hit.id);
+          if (row) { void submit({ ...row.action, phaseId: state.phaseId }); return; }
+          changed();
           return;
         }
         if (hit?.kind === 'shopBuy') {
@@ -1188,7 +1388,7 @@ export function createScreen(ctx) {
           return;
         }
         if (hit?.kind === 'managePotions') { switchTab(tabs.indexOf('potions')); return; }
-        if (hit?.kind === 'mapCenter') { mapScroll = undefined; mapFocus = undefined; mapFull = false; changed(); return; }
+        if (hit?.kind === 'mapCenter') { mapScroll = undefined; mapFocus = undefined; mapAnchor = undefined; mapFull = false; changed(); return; }
         if (hit?.kind === 'mapFull') { mapFull = !mapFull; mapScroll = undefined; changed(); return; }
         if (hit?.kind === 'endTurn') { endTurn(); return; }
         if (hit?.kind === 'entity') {
@@ -1203,8 +1403,8 @@ export function createScreen(ctx) {
         if (modal?.detail) { pageDetail(step * 3); return; }
         // §D: on the map the wheel looks around the act instead of moving the cursor.
         if (state?.phase === 'map' && Array.isArray(state.mapView?.nodes)) {
-          const drawn = mapLines(state.mapView, columns, Math.max(3, height - 12));
-          mapScroll = Math.max(0, Math.min(drawn.total - drawn.body, (mapScroll ?? drawn.top) + step));
+          const drawn = mapLines(state.mapView, columns);
+          mapScroll = Math.max(0, Math.min(Math.max(0, drawn.total - drawn.span), (mapScroll ?? drawn.from) + step));
           mapFull = false; changed(); return;
         }
         moveTo(index + step);
@@ -1227,3 +1427,7 @@ export async function run(context) {
   try { const page = context.openScreen(game.screen); void game.start(); await page; }
   finally { game.stop(); }
 }
+
+
+// Exported so a test can read a drawn act back the way a player does.
+export { drawMap };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkchat-extension-spire",
-  "version": "0.1.0",
+  "version": "0.1.7",
   "type": "module",
   "description": "Optional cooperative card-climbing TUI for LinkChat",
   "license": "UNLICENSED",