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

fix bug of duplicate effects being created

Browse source
This commit is contained in:
psitacus 2025-07-09 02:27:14 -06:00
parent 16395c9f68
commit b7a52a88c8
2 changed files with 10 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
module/documents/activeEffect.mjs
View file

@ -6,8 +6,9 @@ export default class DhActiveEffect extends ActiveEffect {
return false; return false;
} }
// First check for attachment-only effects - these should be suppressed unless attached // First check for attachment-only effects - these should ALWAYS be suppressed on the original item
if (this.isAttachmentOnly && !this.isAttached) { // They only work through copied versions when attached
if (this.isAttachmentOnly) {
return true; return true;
} }
@ -42,17 +43,12 @@ export default class DhActiveEffect extends ActiveEffect {
const actor = this.parent.parent; const actor = this.parent.parent;
if (!actor || !actor.items) return false; if (!actor || !actor.items) return false;
try {
return actor.items.some(item => { return actor.items.some(item => {
return (item.type === 'armor' || item.type === 'weapon') && return (item.type === 'armor' || item.type === 'weapon') &&
item.system?.attached && item.system?.attached &&
Array.isArray(item.system.attached) && Array.isArray(item.system.attached) &&
item.system.attached.includes(this.parent.uuid); item.system.attached.includes(this.parent.uuid);
}); });
} catch (error) {
console.warn('Error checking if item is attached:', error);
return false;
}
} }
async _preCreate(data, options, user) { async _preCreate(data, options, user) {

22
module/helpers/attachmentHelper.mjs
View file

@ -191,26 +191,4 @@ export async function addAttachmentToItem({ parentItem, droppedItem, parentType
} }
} }
/**
* Remove an attachment from an item and clean up its effects
* @param {Object} options - Configuration options
* @param {Item} options.parentItem - The item (armor/weapon) that the item is attached to
* @param {string} options.attachedUuid - UUID of the attached item being removed
* @param {string} options.parentType - Type of parent item ("armor" or "weapon")
* @returns {Promise<void>}
*/
export async function removeAttachmentFromItem({ parentItem, attachedUuid, parentType }) {
const currentAttached = parentItem.system.attached;
// Remove the attachment from the parent item's attached array
await parentItem.update({
'system.attached': currentAttached.filter(uuid => uuid !== attachedUuid)
});
// Remove any effects that came from this attachment
await removeAttachmentEffectsFromActor({
parentItem,
attachedUuid,
parentType
});
}