cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-07 13:24:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Attempt to always retrieve the source item for same actor origin

Browse source
This commit is contained in:
Carlos Fernandez 2026-04-25 16:17:20 -04:00
parent a923edfa76
commit c3b1ad271c
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
module/documents/activeEffect.mjs
View file

@ -169,23 +169,31 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
super._applyChangeUnguided(actor, change, changes, options); super._applyChangeUnguided(actor, change, changes, options);
} }
/** Recursively finds the first parent document of the given object */
static #resolveParentDocument(model, documentClass) {
return model instanceof documentClass
? model
: model.parent
? this.#resolveParentDocument(model.parent, documentClass)
: null;
}
static getChangeValue(model, change, effect) { static getChangeValue(model, change, effect) {
let value = change.value.toString(); let value = change.value.toString();
const useOrigin = value.toLowerCase().includes('origin.@') && effect.origin;
let origin = null; let origin = null;
if (value.toLowerCase().includes('origin.@') && effect.origin) { if (effect.origin) {
value = value.replaceAll(/origin\.@/gi, '@'); if (useOrigin) value = value.replaceAll(/origin\.@/gi, '@');
try { const originEffect = foundry.utils.fromUuidSync(effect.origin);
const originEffect = foundry.utils.fromUuidSync(effect.origin); origin = this.#resolveParentDocument(originEffect, Item);
origin =
originEffect.parent?.parent instanceof game.system.api.documents.DhpActor
? originEffect.parent
: originEffect.parent.parent;
} catch (_) {}
} }
// Get the actor and item documents. Note that actor roll data is inclusive of system roll data // Get the actor and item documents. Note that actor roll data is inclusive of system roll data
const actor = model.parent instanceof Actor ? model.parent : model; const actor = this.#resolveParentDocument(model, Actor);
const item = origin ?? effect.parent; const item =
(useOrigin ? origin : null) ??
this.#resolveParentDocument(effect.parent, Item) ??
(origin?.actor === actor ? origin : null);
const stackingParsedValue = effect.system.stacking const stackingParsedValue = effect.system.stacking
? Roll.replaceFormulaData(value, { stacks: effect.system.stacking.value }) ? Roll.replaceFormulaData(value, { stacks: effect.system.stacking.value })
: value; : value;