also assign effects to unlinked Tokens and fix calculation
Sonarqube Scanner / Build and analyze (push) Successful in 48s

This commit is contained in:
ChatGPT
2026-06-05 00:13:33 +02:00
parent dd1b08ee21
commit eb43af49b2
5 changed files with 111 additions and 29 deletions
+60 -16
View File
@@ -7,31 +7,75 @@ export function registerDnd5eDamageTrigger() {
if (!game.user.isGM) return;
if (!actor) return;
const tokenDocument = options.token ?? options.tokenDocument ?? getBestTokenDocumentForActor(actor);
const damageTypes = extractDamageTypes(options);
const hookOptions = normalizeDamageHookOptions(options);
const tokenDocument = resolveDamageTokenDocument(actor, hookOptions);
const damageTypes = extractDamageTypes(hookOptions);
const numericAmount = Number(amount) || 0;
await handleTrigger(TRIGGER_TYPES.DAMAGE_RECEIVED, {
actor,
targetActor: actor,
actor: tokenDocument?.actor ?? actor,
targetActor: tokenDocument?.actor ?? actor,
tokenDocument,
targetTokenDocument: tokenDocument,
targetToken: tokenDocument?.object ?? null,
amount: Number(amount) || 0,
damageAmount: Number(amount) || 0,
amount: numericAmount,
damageAmount: numericAmount,
damageTypes,
options
options: hookOptions
});
});
}
function normalizeDamageHookOptions(options) {
return options && typeof options === "object" ? options : {};
}
function resolveDamageTokenDocument(actor, options) {
return options.tokenDocument ??
options.token?.document ??
options.token ??
options.targetTokenDocument ??
options.targetToken?.document ??
actor.token ??
getBestTokenDocumentForActor(actor);
}
function extractDamageTypes(options) {
const candidates = [
options.damageTypes,
options.types,
options.damage?.types,
options.workflow?.damageItem?.damageDetail?.map?.(part => part.type)
];
const values = candidates.flat().filter(Boolean);
return [...new Set(values)];
const knownTypes = getKnownDamageTypes();
const collected = new Set();
collectDamageTypes(options, knownTypes, collected);
return Array.from(collected);
}
function collectDamageTypes(value, knownTypes, collected, seen = new WeakSet(), depth = 0) {
if (value == null || depth > 5) return;
if (typeof value === "string") {
if (knownTypes.has(value)) collected.add(value);
return;
}
if (typeof value !== "object") return;
if (seen.has(value)) return;
seen.add(value);
if (Array.isArray(value) || value instanceof Set) {
for (const entry of value) collectDamageTypes(entry, knownTypes, collected, seen, depth + 1);
return;
}
if (value instanceof Map) {
for (const entry of value.values()) collectDamageTypes(entry, knownTypes, collected, seen, depth + 1);
return;
}
for (const key of ["type", "damageType", "damageTypeId", "types", "damageTypes", "damage", "damages", "damageDetail", "parts"]) {
collectDamageTypes(value[key], knownTypes, collected, seen, depth + 1);
}
}
function getKnownDamageTypes() {
const damageTypes = CONFIG.DND5E?.damageTypes ?? {};
if (damageTypes instanceof Map) return new Set(damageTypes.keys());
return new Set(Object.keys(damageTypes));
}