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

Fixed so that ORIGIN effect values are handled differently depending on if they target the item or the origin

Browse source
This commit is contained in:
WBHarry 2026-04-24 19:53:44 +02:00
parent da11510e02
commit 610d263e19
2 changed files with 68 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

19
module/documents/activeEffect.mjs
View file

@ -172,24 +172,33 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
static getChangeValue(model, change, effect) {
let key = change.value.toString();
const isOriginTarget = key.toLowerCase().includes('origin.@');
let parseModel = model;
let actorModel = model;
let itemModel = effect.parent;
if (isOriginTarget && effect.origin) {
key = change.key.replaceAll(/origin\.@/gi, '@');
try {
const originEffect = foundry.utils.fromUuidSync(effect.origin);
const doc =
originEffect.parent?.parent instanceof game.system.api.documents.DhpActor
? originEffect.parent
: originEffect.parent.parent;
if (doc) parseModel = doc;
if (doc) {
if (doc instanceof game.system.api.documents.DHItem) {
itemModel = doc;
key = key.replaceAll(/origin\.@/gi, '');
} else {
actorModel = doc;
key = key.replaceAll(/origin\.@/gi, '@');
}
}
} catch (_) {}
}
const stackingParsedValue = effect.system.stacking
? Roll.replaceFormulaData(key, { stacks: effect.system.stacking.value })
: key;
const evalValue = itemAbleRollParse(stackingParsedValue, parseModel, effect.parent);
return evalValue ?? key;
const evalValue = itemAbleRollParse(stackingParsedValue, actorModel, itemModel);
return evalValue ? evalValue : key;
}
/**