Skip to content

fix(spells): iterate integrants directly instead of trusting displayOrder #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justinritchie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(spells): iterate integrants directly instead of trusting displayOrder #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 27 additions & 24 deletions src/tools/character.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,11 @@ export async function listSpells(
ctx: { defaultCharacterId?: string },
) {
const id = resolveCharacterId(input, ctx.defaultCharacterId);
const [grid, integrants] = await Promise.all([
client.getSpellsDisplayOrder(id),
client.getIntegrants(id),
]);
// Iterate `integrants` directly — `store.spells.displayOrder` is a UI-ordering
// hint that is INCOMPLETE on Beacon sheets (notably for Warlocks): it omits
// cantrips and Mystic Arcanum (level 6+) spells and sometimes whole levels.
// The integrant map is the authoritative store of every spell on the sheet.
const integrants = await client.getIntegrants(id);

const rows: {
level: number;
Expand All @@ -213,26 +214,28 @@ export async function listSpells(
ritual?: boolean;
}[] = [];

grid.forEach((uids, level) => {
if (input.level !== undefined && input.level !== level) return;
for (const uid of uids) {
const sp = integrants[uid];
if (!sp || sp.type !== "Spell") continue;
const prepared = !!sp._prepared || !!sp.alwaysPrepared;
if (input.preparedOnly && !prepared) continue;
rows.push({
level,
name: sp.name ?? "(unnamed)",
uid,
school: sp.school,
prepared,
alwaysPrepared: !!sp.alwaysPrepared,
castingTime: sp.castingTime,
range: sp.range,
ritual: !!sp.ritual,
});
}
});
for (const [uid, sp] of Object.entries(integrants)) {
if (!sp || sp.type !== "Spell") continue;
const lvl = typeof sp.level === "number" ? sp.level : Number(sp.level);
if (!Number.isFinite(lvl)) continue;
if (input.level !== undefined && input.level !== lvl) continue;
const prepared = !!sp._prepared || !!sp.alwaysPrepared;
if (input.preparedOnly && !prepared) continue;
rows.push({
level: lvl,
name: sp.name ?? "(unnamed)",
uid,
school: sp.school,
prepared,
alwaysPrepared: !!sp.alwaysPrepared,
castingTime: sp.castingTime,
range: sp.range,
ritual: !!sp.ritual,
});
}

// Stable order: by level ASC, then alphabetical by name within each level.
rows.sort((a, b) => a.level - b.level || a.name.localeCompare(b.name));

const groupedText = [...new Set(rows.map((r) => r.level))]
.sort((a, b) => a - b)
Expand Down