Fix issue #83: Add more things to the character sheet
All checks were successful
Test / test (push) Successful in 2s
All checks were successful
Test / test (push) Successful in 2s
This commit is contained in:
@@ -474,9 +474,50 @@ function serializeFoundryActor(actor) {
|
||||
if (data.img && !/^(https?:|data:|\/\/)/i.test(data.img)) {
|
||||
data.img = new URL(data.img, window.location.origin).toString();
|
||||
}
|
||||
// Tools and languages travel by their names: what the actor holds are proficiency
|
||||
// keys (and, since the third release of the system, language documents), which mean
|
||||
// nothing to a sheet outside Foundry.
|
||||
const names = { tools: foundryTraitNames(actor, "tools"), languages: foundryTraitNames(actor, "languages") };
|
||||
if (names.tools || names.languages) data.dragonroll = { ...names };
|
||||
return data;
|
||||
}
|
||||
|
||||
// A proficiency list of `system.traits`: its keys resolved to the labels CONFIG gives
|
||||
// them, plus whatever the GM typed as a proficiency of their own. `null` for an actor
|
||||
// that has no such list, an empty array for one that has none of that kind. Dragonroll
|
||||
// names its lists in full, while the world keeps its tools under `system.traits.tool`
|
||||
// and its languages under `system.traits.languages`.
|
||||
const TRAIT_FIELDS = { tools: "tool", languages: "languages" };
|
||||
|
||||
function foundryTraitNames(actor, kind) {
|
||||
if (game.system?.id !== "dnd5e") return null;
|
||||
const trait = actor.system?.traits?.[TRAIT_FIELDS[kind] ?? kind];
|
||||
if (!trait || typeof trait !== "object") return null;
|
||||
|
||||
const names = (Array.isArray(trait.value) ? trait.value : [])
|
||||
.map((key) => foundryProficiencyLabel(kind, key))
|
||||
.filter(Boolean);
|
||||
for (const custom of String(trait.custom ?? "").split(",")) {
|
||||
const name = custom.trim();
|
||||
if (name) names.push(name);
|
||||
}
|
||||
return [...new Set(names)];
|
||||
}
|
||||
|
||||
function foundryProficiencyLabel(kind, key) {
|
||||
if (typeof key !== "string" || !key) return "";
|
||||
|
||||
const entry = CONFIG.DND5E?.[kind === "languages" ? "languages" : "tools"]?.[key];
|
||||
const label = entry?.label ?? entry?.name;
|
||||
if (label) return String(label);
|
||||
// A language the world added itself stands as a document of its own rather than in
|
||||
// the system's config.
|
||||
const document = kind === "languages" ? game.items?.get?.(key) : null;
|
||||
if (document?.name) return String(document.name);
|
||||
// The key beats dropping a proficiency the character really has.
|
||||
return key;
|
||||
}
|
||||
|
||||
function isSupportedCharacterActor(actor) {
|
||||
const savedType = actor.getFlag?.(MODULE_ID, "actorType") || actor.flags?.[MODULE_ID]?.actorType;
|
||||
return ["character", "npc", "creature"].includes(savedType || actor.type);
|
||||
|
||||
Reference in New Issue
Block a user