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

Update module/data/action/baseAction.mjs

Browse source 
Co-authored-by: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
This commit is contained in:
WBHarry 2026-01-16 07:38:01 +01:00 • committed by GitHub
parent 14ae1b6e72
commit c5e4dd52cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -273,20 +273,19 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
* @returns {DhActiveEffect[]} * @returns {DhActiveEffect[]}
*/ */
static async getEffects(actor, effectParent) { static async getEffects(actor, effectParent) {
if (actor) 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;
}
return !effect.isSuppressed; 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;
}
return []; return !effect.isSuppressed;
});
} }
/** /**