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

[Fix] 1535 - Toggle Bonuses (#1538)

Browse source 
* Fixed all SRD instances of Powerful and Massive

* Fixed suppressed effects being added to roll formula options

* Fixed weapon effects being presented when it's no the weapon itself

* .

* .

* Fixed secondary weapons effects

* Raised system version

* Update module/data/action/baseAction.mjs

Co-authored-by: Carlos Fernandez <CarlosFdez@users.noreply.github.com>

* Update module/documents/chatMessage.mjs

Co-authored-by: Carlos Fernandez <CarlosFdez@users.noreply.github.com>

---------

Co-authored-by: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
This commit is contained in:
WBHarry 2026-01-16 09:35:02 +01:00 • committed by GitHub
parent fad09a1b3a
commit 822c522f61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 38 additions and 171 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', {
ability: abilityLabel
}),
effects: Array.from(await this.document.allApplicableEffects()),
effects: await await game.system.api.data.actions.actionsTypes.base.getEffects(this.document),
roll: {
trait: button.dataset.attribute,
type: 'trait'

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

@ -505,7 +505,10 @@ export default function DHApplicationMixin(Base) {
const doc = await getDocFromElement(target),
action = doc?.system?.attack ?? doc;
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,
doc
);
config.hasRoll = false;
return action && action.workflow.get('damage').execute(config, null, true);
}

28
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);
if (!config) return;
await this.addEffects(config);
config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(this.actor, this.item);
if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return;
@ -266,14 +266,26 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
return config;
}
/** */
async addEffects(config) {
let effects = [];
if (this.actor) {
effects = Array.from(await this.actor.allApplicableEffects());
}
/**
* Get the all potentially applicable effects on the actor
* @param {DHActor} actor The actor performing the action
* @param {DHItem|DhActor} effectParent The parent of the effect
* @returns {DhActiveEffect[]}
*/
static async getEffects(actor, effectParent) {
if (!actor) return [];
return Array.from(await actor.allApplicableEffects()).filter(effect => {
/* Effects on weapons only ever apply for the weapon itself */
if (effect.parent.type === 'weapon') {
/* Unless they're secondary - then they apply only to other primary weapons */
if (effect.parent.system.secondary) {
if (effectParent.type !== 'weapon' || effectParent.system.secondary) return false;
} else if (effectParent?.id !== effect.parent.id) return false;
}
config.effects = effects;
return !effect.isSuppressed;
});
}
/**

4
module/documents/chatMessage.mjs
View file

@ -158,7 +158,9 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
const config = foundry.utils.deepClone(this.system);
config.event = event;
if (this.system.action) {
await this.system.action.addEffects(config);
const actor = await foundry.utils.fromUuid(config.source.actor);
const item = actor?.items.get(config.source.item) ?? null;
config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(actor, item);
await this.system.action.workflow.get('damage')?.execute(config, this._id, true);
}