feedback1 integrate: WK bond popup and card chips include 变形同构体 wearers
# Conflicts: # docs/SIM.md # public/js/ui/bondStrip.js # public/js/ui/detailPanel.js # server/sim/snapshot.js
This commit is contained in:
sganggs committed
commit
ff0f8d0211
15 files changed
+526
-45
No files matched your search
@@ -0,0 +1,204 @@
|
||||
// 变形同构体 on the client (player report after 0.1.0: "变形同构体配上对应装备能吃到盟约加成，但那个盟约的人口数量没有把
|
||||
// 转职之后的干员算进去"). The server counts the wearer (bondsMeta.pieceBonds; test/match/morph-bonds.test.js), so the
|
||||
// strip's "在场 n" was right — but the bond popup's member list (gameLogic bondMembers: "成员 x/y") and the wearer's own
|
||||
// card (detailPanel BondChips) only read the chess records' bonds, so the converted operator was missing from both.
|
||||
// Official rule: band 变形者集群 "与特定装备一同装备时装备者将视为特定盟约成员"; the item's talent (character_table
|
||||
// trap_1073_acarm073) lists the 14 pairings "“维式重锤”系列装备→【维多利亚】盟约 …".
|
||||
|
||||
import { test, describe } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { bondMembers, grantedBonds, pieceBondIds } from '../../public/js/ui/gameLogic.js';
|
||||
import { ownerBoard } from '../../public/js/ui/watchBonds.js';
|
||||
import { pieceBonds } from '../../server/match/bondsMeta.js';
|
||||
import { GameData } from '../../server/match/gamedata.js';
|
||||
import { getData } from '../../server/data.js';
|
||||
import { GEO } from '../../shared/constants.js';
|
||||
|
||||
const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../..');
|
||||
const load = (f) => JSON.parse(readFileSync(path.join(ROOT, 'data', f), 'utf8'));
|
||||
const chess = load('chess.json');
|
||||
const items = load('items.json');
|
||||
const bonds = load('bonds.json');
|
||||
const getChess = (id) => chess[id] || null;
|
||||
const getItem = (id) => items[id] || null;
|
||||
|
||||
const ISO = 'chess_item_6_09_e_a'; // 变形同构体
|
||||
const ISO_B = 'chess_item_6_09_e_b';
|
||||
const HAMMER = 'chess_item_1_01_e_a'; // 维式重锤 → 维多利亚
|
||||
const SHIELD = 'chess_item_1_02_e_a'; // 坚守盾牌 → 坚守
|
||||
const WEARER = 'chess_char_1_01_a'; // 隐现 (拉特兰 / 迅捷), not 维多利亚
|
||||
const VIC = Object.values(chess).filter((c) => c.visible && !c.isGolden && c.bonds.includes('victoriaShip')).map((c) => c.chessId).sort();
|
||||
|
||||
let uid = 0;
|
||||
const itemPiece = (id) => ({ uid: ++uid, id });
|
||||
const piece = (id, its = [], extra = {}) => ({ uid: ++uid, kind: 'chess', id, golden: !!chess[id]?.isGolden, tier: chess[id]?.tier ?? 1, items: its.map(itemPiece), ...extra });
|
||||
function privWith({ board = [], hand = [] } = {}) {
|
||||
const h = new Array(GEO.HAND_SIZE).fill(null);
|
||||
hand.forEach((p, i) => { h[i] = p; });
|
||||
return { board, hand: h, temp: new Array(GEO.TEMP_SIZE).fill(null) };
|
||||
}
|
||||
|
||||
describe('变形同构体 — the client rule', () => {
|
||||
test('grantedBonds: the other item\'s giveBondId while a 变形同构体 is worn; nothing otherwise', () => {
|
||||
assert.deepEqual(grantedBonds([itemPiece(ISO), itemPiece(HAMMER)], getItem), ['victoriaShip']);
|
||||
assert.deepEqual(grantedBonds([HAMMER, ISO_B], getItem), ['victoriaShip'], 'item ids, the golden 变形同构体, any order');
|
||||
assert.deepEqual(grantedBonds([itemPiece(HAMMER)], getItem), [], 'the bond item alone grants nothing');
|
||||
assert.deepEqual(grantedBonds([itemPiece(ISO)], getItem), []);
|
||||
assert.deepEqual(grantedBonds([ISO, ISO_B], getItem), [], 'two 变形同构体: no partner bond');
|
||||
assert.deepEqual(grantedBonds(null, getItem), []);
|
||||
assert.deepEqual(pieceBondIds(chess[WEARER], [ISO, SHIELD], getItem), ['lateranoShip', 'swiftShip', 'steadShip']);
|
||||
assert.deepEqual(pieceBondIds(chess[WEARER], [], getItem), ['lateranoShip', 'swiftShip']);
|
||||
});
|
||||
|
||||
test('the client rule equals the server\'s (bondsMeta.pieceBonds) for every bond item, normal and golden', () => {
|
||||
const gd = new GameData(getData({ log: { warn() {}, error() {}, info() {} } }), 'mode_multi_hard');
|
||||
const grants = Object.values(items).filter((r) => r.giveBondId);
|
||||
assert.equal(grants.length, 36, '18 bond items × normal / golden');
|
||||
for (const r of grants) {
|
||||
for (const iso of [ISO, ISO_B]) {
|
||||
const p = { id: WEARER, items: [{ id: r.id }, { id: iso }] };
|
||||
assert.deepEqual(pieceBondIds(chess[WEARER], p.items, getItem), pieceBonds(gd, p), `${r.id} + ${iso}`);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe('变形同构体 — the bond popup\'s member list', () => {
|
||||
test('the wearer on the board is an on-board member of the granted bond (成员 x/y agrees with 在场)', () => {
|
||||
const b = bonds.victoriaShip;
|
||||
const priv = privWith({ board: [{ ...piece(VIC[0]), row: 9, col: 3 }, { ...piece(VIC[1]), row: 9, col: 4 }, { ...piece(WEARER, [ISO, HAMMER]), row: 9, col: 5 }] });
|
||||
const rows = bondMembers(b, priv, [], getChess, getItem);
|
||||
const on = rows.filter((r) => r.onBoard).map((r) => r.id).sort();
|
||||
assert.deepEqual(on, [VIC[0], VIC[1], WEARER].sort(), 'three in play, like the server\'s count');
|
||||
const w = rows.find((r) => r.id === WEARER);
|
||||
assert.equal(w.granted, true, 'marked as converted');
|
||||
assert.equal(w.owned, true);
|
||||
assert.equal(w.name, chess[WEARER].name);
|
||||
assert.equal(rows.length, b.visibleMembers.length + 1, 'the converted operator joins the list');
|
||||
assert.equal(rows.filter((r) => r.granted).length, 1);
|
||||
assert.deepEqual(w.items, [ISO, HAMMER], 'the row carries the wearer\'s item ids (its card shows the pair)');
|
||||
assert.ok(rows.filter((r) => !r.granted).every((r) => !('items' in r)), 'plain members carry none');
|
||||
// not a member of an unrelated bond, and not with the bond item alone
|
||||
assert.equal(bondMembers(bonds.steadShip, priv, [], getChess, getItem).some((r) => r.id === WEARER), false);
|
||||
const plain = privWith({ board: [{ ...piece(WEARER, [HAMMER]), row: 9, col: 5 }] });
|
||||
assert.equal(bondMembers(b, plain, [], getChess, getItem).some((r) => r.id === WEARER), false);
|
||||
});
|
||||
|
||||
test('a wearer on the bench is owned, not in play; copies of one operator are one member (distinct members)', () => {
|
||||
const b = bonds.victoriaShip;
|
||||
const bench = privWith({ hand: [piece(WEARER, [ISO, HAMMER])] });
|
||||
const w = bondMembers(b, bench, [], getChess, getItem).find((r) => r.id === WEARER);
|
||||
assert.ok(w && w.granted && w.owned && !w.onBoard, 'bench: owned only (BOARD bonds count the board)');
|
||||
const two = privWith({
|
||||
board: [{ ...piece(WEARER, [ISO, HAMMER]), row: 9, col: 5 }, { ...piece(chess[WEARER].goldenId, [ISO_B, HAMMER]), row: 9, col: 6 }],
|
||||
hand: [piece(WEARER, [ISO, HAMMER])],
|
||||
});
|
||||
const rows = bondMembers(b, two, [], getChess, getItem).filter((r) => r.id === WEARER);
|
||||
assert.equal(rows.length, 1, 'one entry per operator (normal and elite share it)');
|
||||
assert.equal(rows[0].onBoard, true);
|
||||
});
|
||||
|
||||
test('a teammate\'s operators on the field (ownerBoard) carry their items, so their popup lists the wearer too', () => {
|
||||
const field = { units: [
|
||||
{ kind: 'op', ownerId: 'p2', defId: WEARER, items: [ISO, HAMMER] },
|
||||
{ kind: 'op', ownerId: 'p2', defId: VIC[0] },
|
||||
{ kind: 'op', ownerId: 'p1', defId: VIC[1], items: [ISO, SHIELD] },
|
||||
] };
|
||||
const board = ownerBoard(field, 'p2');
|
||||
const on = bondMembers(bonds.victoriaShip, board, [], getChess, getItem).filter((r) => r.onBoard).map((r) => r.id).sort();
|
||||
assert.deepEqual(on, [VIC[0], WEARER].sort());
|
||||
});
|
||||
});
|
||||
|
||||
// ---- the components (htm vnodes walked like test/ui/watch-bonds.test.js) -------------------------------------------
|
||||
// the browser data store reads the real data files from disk
|
||||
globalThis.fetch = async (url) => {
|
||||
const name = String(url).split('/').pop();
|
||||
try {
|
||||
const body = readFileSync(path.join(ROOT, 'data', name), 'utf8');
|
||||
return { ok: true, status: 200, json: async () => JSON.parse(body) };
|
||||
} catch {
|
||||
return { ok: false, status: 404, json: async () => ({}) };
|
||||
}
|
||||
};
|
||||
const { data } = await import('../../public/js/data.js');
|
||||
await data.loadAll('bonds', 'chess', 'items', 'assets', 'garrisons');
|
||||
const { BondPopup } = await import('../../public/js/ui/bondStrip.js');
|
||||
const { BondChips, ChessDetail, resolveDetail } = await import('../../public/js/ui/detailPanel.js');
|
||||
|
||||
function* walk(v) {
|
||||
if (Array.isArray(v)) { for (const x of v) yield* walk(x); return; }
|
||||
if (!v || typeof v !== 'object') return;
|
||||
yield v;
|
||||
yield* walk(v.props?.children);
|
||||
}
|
||||
const hasClass = (v, c) => typeof v?.props?.class === 'string' && v.props.class.split(/\s+/).includes(c);
|
||||
const textOf = (v) => {
|
||||
if (v == null || typeof v === 'boolean') return '';
|
||||
if (typeof v === 'string' || typeof v === 'number') return String(v);
|
||||
if (Array.isArray(v)) return v.map(textOf).join('');
|
||||
return textOf(v.props?.children);
|
||||
};
|
||||
|
||||
describe('变形同构体 — what the popup and the card show', () => {
|
||||
test('the popup: 在场 3 and 成员 3/11 — the wearer lit, tagged 同构, titled 变形同构体', () => {
|
||||
const priv = privWith({ board: [{ ...piece(VIC[0]), row: 9, col: 3 }, { ...piece(VIC[1]), row: 9, col: 4 }, { ...piece(WEARER, [ISO, HAMMER]), row: 9, col: 5 }] });
|
||||
const entry = { bondId: 'victoriaShip', count: 3, active: true, tier: 1, layers: 0, thresholds: [3, 6], countsHand: false };
|
||||
const v = BondPopup({ bondId: 'victoriaShip', entry, priv, onClose() {} });
|
||||
const head = [...walk(v)].filter((x) => x.type === 'h4').map(textOf).find((t) => t.startsWith('成员'));
|
||||
assert.equal(head.replace(/\s+/g, ''), `成员3/${bonds.victoriaShip.visibleMembers.length + 1}`);
|
||||
assert.match(textOf([...walk(v)].find((x) => hasClass(x, 'bpop__facts'))), /在场\s*3/);
|
||||
const iso = [...walk(v)].filter((x) => hasClass(x, 'bpop__member') && hasClass(x, 'is-granted'));
|
||||
assert.equal(iso.length, 1);
|
||||
assert.ok(hasClass(iso[0], 'is-on'));
|
||||
assert.match(iso[0].props.title, /变形同构体/);
|
||||
assert.ok([...walk(iso[0])].some((x) => hasClass(x, 'bpop__iso') && textOf(x) === '同构'));
|
||||
});
|
||||
|
||||
test('the card\'s bond chips: the granted bond with its count, dashed and tagged; resolveDetail hands a teammate unit\'s items on', () => {
|
||||
const ids = pieceBondIds(chess[WEARER], [ISO, HAMMER], getItem);
|
||||
const mine = [{ bondId: 'victoriaShip', count: 3, active: true, tier: 1, layers: 0, thresholds: [3, 6] }];
|
||||
const v = BondChips({ bondIds: ids, bonds: mine, granted: ['victoriaShip'], onBond() {} });
|
||||
const chips = [...walk(v)].filter((x) => hasClass(x, 'dbond'));
|
||||
assert.deepEqual(chips.map((x) => x.props['data-bond']), ['lateranoShip', 'swiftShip', 'victoriaShip']);
|
||||
const vic = chips[2];
|
||||
assert.ok(hasClass(vic, 'is-granted') && hasClass(vic, 'is-active'));
|
||||
assert.match(vic.props.title, /维多利亚（变形同构体）：在场 3\/6/);
|
||||
assert.ok(!hasClass(chips[0], 'is-granted'));
|
||||
const d = resolveDetail({ kind: 'unit', unit: { id: 7, side: 'ally', ownerId: 'p2', defId: WEARER, items: [ISO, HAMMER] } }, new Map());
|
||||
assert.deepEqual(d.unitItems, [ISO, HAMMER]);
|
||||
assert.equal(resolveDetail({ kind: 'unit', unit: { id: 8, side: 'ally', ownerId: 'p2', defId: WEARER } }, new Map()).unitItems, null);
|
||||
});
|
||||
|
||||
test('a 同构 row opens the wearer\'s card with its items: the pair (read-only 装备) and the granted chip', () => {
|
||||
const priv = privWith({ board: [{ ...piece(VIC[0]), row: 9, col: 3 }, { ...piece(WEARER, [ISO, HAMMER]), row: 9, col: 5 }] });
|
||||
const entry = { bondId: 'victoriaShip', count: 2, active: false, tier: 0, layers: 0, thresholds: [3, 6], countsHand: false };
|
||||
const calls = [];
|
||||
const v = BondPopup({ bondId: 'victoriaShip', entry, priv, onClose() {}, onMember: (...a) => calls.push(a) });
|
||||
const rows = [...walk(v)].filter((x) => hasClass(x, 'bpop__member'));
|
||||
rows.find((x) => hasClass(x, 'is-granted')).props.onClick();
|
||||
rows.find((x) => !hasClass(x, 'is-granted') && hasClass(x, 'is-on')).props.onClick();
|
||||
assert.deepEqual(calls, [[WEARER, [ISO, HAMMER]], [VIC[0], null]]);
|
||||
// the screen turns the click into { kind: 'chess', id, owner, items } (screens/game.js) → resolveDetail
|
||||
const d = resolveDetail({ kind: 'chess', id: WEARER, owner: 'p1', items: [ISO, HAMMER] }, new Map());
|
||||
assert.deepEqual(d.unitItems, [ISO, HAMMER]);
|
||||
assert.equal('unitItems' in resolveDetail({ kind: 'chess', id: WEARER, owner: 'p1', items: null }, new Map()), false, 'a plain member card: no items');
|
||||
const mine = [{ bondId: 'victoriaShip', count: 2, active: false, tier: 0, layers: 0, thresholds: [3, 6] }];
|
||||
const blocks = ChessDetail({ chess: d.chess, piece: null, editable: false, bonds: mine, loadout: null, unitItems: d.unitItems });
|
||||
const chips = [...walk(blocks)].find((x) => x.type === BondChips);
|
||||
assert.ok(chips.props.bondIds.includes('victoriaShip') && chips.props.granted.includes('victoriaShip'), 'the granted chip');
|
||||
const vic = [...walk(BondChips(chips.props))].find((x) => hasClass(x, 'dbond') && x.props['data-bond'] === 'victoriaShip');
|
||||
assert.ok(vic && hasClass(vic, 'is-granted'));
|
||||
const equip = blocks.find((b) => b?.key === 'equip');
|
||||
assert.ok(equip, 'a read-only 装备 section without an own piece');
|
||||
assert.deepEqual([...walk(equip)].filter((x) => x.props?.itemId).map((x) => x.props.itemId), [ISO, HAMMER]);
|
||||
assert.ok(![...walk(equip)].some((x) => hasClass(x, 'dempty')), 'no "drag to equip" hint on a read-only list');
|
||||
// a plain record card (shop, a plain member) keeps no 装备 section and no granted chip
|
||||
const bare = ChessDetail({ chess: d.chess, piece: null, editable: false, bonds: mine, loadout: null });
|
||||
assert.equal(bare.some((b) => b?.key === 'equip'), false);
|
||||
assert.deepEqual([...walk(bare)].find((x) => x.type === BondChips).props.granted, []);
|
||||
});
|
||||
});
|
||||
@@ -357,7 +357,8 @@ test('§20.15 wiring: the game screen feeds the strip, the popup and the detail
|
||||
assert.match(src, /onOpen=\$\{\(id\) => openBond\(id, strip\.ownerId, 'strip'\)\}/, 'the strip opens its owner\'s bond');
|
||||
assert.match(src, /const detailOwner = detailBondOwner\(detailTarget, \{ pub, myId, stripOwnerId: strip\.ownerId \}\)/);
|
||||
assert.match(src, /onBond=\$\{\(id\) => openBond\(id, detailOwner, 'detail'\)\}/, 'a card\'s chip opens the same owner\'s bond as its chips show');
|
||||
assert.match(src, /onMember=\$\{\(id\) => setDetail\(\{ kind: 'chess', id, owner: bondPop\.ownerId \}\)\}/, 'a member card keeps the popup\'s player');
|
||||
assert.match(src, /onMember=\$\{\(id, items\) => setDetail\(\{ kind: 'chess', id, owner: bondPop\.ownerId, items: items \|\| null \}\)\}/,
|
||||
'a member card keeps the popup\'s player (and a 变形同构体 row\'s items)');
|
||||
assert.match(src, /openId=\$\{bondPop && bondPop\.ownerId === strip\.ownerId \? bondPop\.bondId : null\}/, 'the strip marks only its own owner\'s popup');
|
||||
assert.match(src, /setBondOpen\(\(b\) => \(b && b\.from === 'strip' \? null : b\)\)/, 'a strip popup closes when the strip changes hands');
|
||||
assert.ok(!/stripBonds\.find\(\(b\) => b\.bondId === bondOpen\)/.test(src), 'no popup entry read from the strip regardless of its owner');
|
||||
|
||||
Reference in new issue
Block a user