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

deduplicate and simplify

Browse source
This commit is contained in:
psitacus 2025-07-09 01:05:44 -06:00
parent 598bf733f8
commit b269e58585
4 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -656,31 +656,14 @@ export default class CharacterSheet extends DHBaseActorSheet {
} }
async _onDragStart(event) { async _onDragStart(event) {
const target = event.target || event.currentTarget; const item = this.getItem(event);
const itemElement = target.closest('[data-item-id]');
if (itemElement) { const dragData = {
const itemId = itemElement.dataset.itemId; type: item.documentName,
const itemType = itemElement.dataset.type; uuid: item.uuid
};
let item;
if (itemType === 'effect') { event.dataTransfer.setData('text/plain', JSON.stringify(dragData));
item = this.document.effects.get(itemId);
} else {
item = this.document.items.get(itemId);
}
if (item) {
const dragData = {
type: item.documentName,
uuid: item.uuid
};
event.dataTransfer.setData('text/plain', JSON.stringify(dragData));
}
}
super._onDragStart(event); super._onDragStart(event);
} }

13
module/applications/sheets/items/armor.mjs
View file

@ -1,5 +1,5 @@
import DHBaseItemSheet from '../api/base-item.mjs'; import DHBaseItemSheet from '../api/base-item.mjs';
import { copyAttachmentEffectsToActor, removeAttachmentEffectsFromActor } from '../../../helpers/attachmentHelper.mjs'; import { copyAttachmentEffectsToActor, removeAttachmentFromItem } from '../../../helpers/attachmentHelper.mjs';
export default class ArmorSheet extends DHBaseItemSheet { export default class ArmorSheet extends DHBaseItemSheet {
/**@inheritdoc */ /**@inheritdoc */
@ -129,16 +129,9 @@ export default class ArmorSheet extends DHBaseItemSheet {
* @param {HTMLElement} target - The clicked element * @param {HTMLElement} target - The clicked element
*/ */
static async #removeAttachment(event, target) { static async #removeAttachment(event, target) {
const uuid = target.dataset.uuid; await removeAttachmentFromItem({
const currentAttached = this.document.system.attached;
await this.document.update({
'system.attached': currentAttached.filter(attachedUuid => attachedUuid !== uuid)
});
await removeAttachmentEffectsFromActor({
parentItem: this.document, parentItem: this.document,
attachedUuid: uuid, attachedUuid: target.dataset.uuid,
parentType: 'armor' parentType: 'armor'
}); });
} }

13
module/applications/sheets/items/weapon.mjs
View file

@ -1,5 +1,5 @@
import DHBaseItemSheet from '../api/base-item.mjs'; import DHBaseItemSheet from '../api/base-item.mjs';
import { copyAttachmentEffectsToActor, removeAttachmentEffectsFromActor } from '../../../helpers/attachmentHelper.mjs'; import { copyAttachmentEffectsToActor, removeAttachmentFromItem } from '../../../helpers/attachmentHelper.mjs';
export default class WeaponSheet extends DHBaseItemSheet { export default class WeaponSheet extends DHBaseItemSheet {
/**@inheritdoc */ /**@inheritdoc */
@ -130,16 +130,9 @@ export default class WeaponSheet extends DHBaseItemSheet {
* @param {HTMLElement} target - The clicked element * @param {HTMLElement} target - The clicked element
*/ */
static async #removeAttachment(event, target) { static async #removeAttachment(event, target) {
const uuid = target.dataset.uuid; await removeAttachmentFromItem({
const currentAttached = this.document.system.attached;
await this.document.update({
'system.attached': currentAttached.filter(attachedUuid => attachedUuid !== uuid)
});
await removeAttachmentEffectsFromActor({
parentItem: this.document, parentItem: this.document,
attachedUuid: uuid, attachedUuid: target.dataset.uuid,
parentType: 'weapon' parentType: 'weapon'
}); });
} }

24
module/helpers/attachmentHelper.mjs
View file

@ -72,6 +72,30 @@ export async function removeAttachmentEffectsFromActor({ parentItem, attachedUui
} }
} }
/**
* 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
});
}
/** /**
* Handle adding/removing attachment effects when a parent item is equipped/unequipped * Handle adding/removing attachment effects when a parent item is equipped/unequipped
* @param {Object} options - Configuration options * @param {Object} options - Configuration options