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

Fixed suppressed effects being added to roll formula options

Browse source
This commit is contained in:
WBHarry 2026-01-15 14:33:46 +01:00
parent 19be91a68a
commit 622d11a1cc
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/applications/sheets/actors/character.mjs
View file

@ -712,7 +712,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
headerTitle: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', { headerTitle: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
ability: abilityLabel ability: abilityLabel
}), }),
effects: Array.from(await this.document.allApplicableEffects()), effects: await await game.system.api.data.actions.actionsTypes.base.getEffects(this.document),
roll: { roll: {
trait: button.dataset.attribute, trait: button.dataset.attribute,
type: 'trait' type: 'trait'

2
module/applications/sheets/api/application-mixin.mjs
View file

@ -505,7 +505,7 @@ export default function DHApplicationMixin(Base) {
const doc = await getDocFromElement(target), const doc = await getDocFromElement(target),
action = doc?.system?.attack ?? doc; action = doc?.system?.attack ?? doc;
const config = action.prepareConfig(event); const config = action.prepareConfig(event);
config.effects = Array.from(await this.document.allApplicableEffects()); config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(this.document);
config.hasRoll = false; config.hasRoll = false;
return action && action.workflow.get('damage').execute(config, null, true); return action && action.workflow.get('damage').execute(config, null, true);
} }

12
module/data/action/baseAction.mjs
View file

@ -198,7 +198,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
let config = this.prepareConfig(event); let config = this.prepareConfig(event);
if (!config) return; if (!config) return;
await this.addEffects(config); config.effects = await DHBaseAction.getEffects(this.actor);
if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return; if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return;
@ -267,13 +267,9 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
} }
/** */ /** */
async addEffects(config) { static async getEffects(actor) {
let effects = []; if (actor) return Array.from(await actor.allApplicableEffects()).filter(x => !x.isSuppressed);
if (this.actor) { return [];
effects = Array.from(await this.actor.allApplicableEffects());
}
config.effects = effects;
} }
/** /**