cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-03-07 14:36:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added to compendium

Browse source
This commit is contained in:
WBHarry 2026-02-26 21:05:38 +01:00
parent 1ba08e2f51
commit eea1b6e6b8
6 changed files with 184 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/data/activeEffect/effectConditional.mjs
View file

@ -21,12 +21,14 @@ export class EffectConditionals extends foundry.data.fields.ArrayField {
x => !x.disabled && x.statuses.has(conditional.key)
);
if (!hasStatus) return true;
break;
case CONFIG.DH.GENERAL.activeEffectConditionalType.attribute.id:
const actorValue = foundry.utils.getProperty(actor, conditional.key);
const conditionalValue = game.system.api.documents.DhActiveEffect.effectSafeEval(
itemAbleRollParse(conditional.value, actor)
);
if (!compareValues(actorValue, conditionalValue, conditional.comparator)) return true;
break;
}
}

6
module/documents/activeEffect.mjs
View file

@ -8,6 +8,9 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
/**@override */
get isSuppressed() {
const conditionalSuspended = game.system.api.data.activeEffects.EffectConditionals.isConditionalSuspended(this);
if (conditionalSuspended) return true;
// If this is a copied effect from an attachment, never suppress it
// (These effects have attachmentSource metadata)
if (this.flags?.daggerheart?.attachmentSource) {
@ -26,9 +29,6 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
return isVaultSupressed || domainTouchedSupressed;
}
const conditionalSuspended = game.system.api.data.activeEffects.EffectConditionals.isConditionalSuspended(this);
if (conditionalSuspended) return true;
return super.isSuppressed;
}