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

its a desert

Browse source
This commit is contained in:
psitacus 2025-07-09 01:14:54 -06:00
parent b269e58585
commit 99aca056c8
3 changed files with 90 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import DHBaseItemSheet from '../api/base-item.mjs';
import { copyAttachmentEffectsToActor, removeAttachmentFromItem } from '../../../helpers/attachmentHelper.mjs';
import { copyAttachmentEffectsToActor, removeAttachmentFromItem, prepareAttachmentContext, addAttachmentToItem } from '../../../helpers/attachmentHelper.mjs';
export default class ArmorSheet extends DHBaseItemSheet {
/**@inheritdoc */
@ -57,17 +57,7 @@ export default class ArmorSheet extends DHBaseItemSheet {
context.features = this.document.system.features.map(x => x.value);
break;
case 'attachments':
const attachedUUIDs = this.document.system.attached;
context.attachedItems = await Promise.all(
attachedUUIDs.map(async uuid => {
const item = await fromUuid(uuid);
return {
uuid: uuid,
name: item?.name || 'Unknown Item',
img: item?.img || 'icons/svg/item-bag.svg'
};
})
);
context.attachedItems = await prepareAttachmentContext(this.document);
break;
}
@ -98,29 +88,11 @@ export default class ArmorSheet extends DHBaseItemSheet {
const item = await Item.implementation.fromDropData(data);
if (!item) return;
const currentAttached = this.document.system.attached;
const newUUID = item.uuid;
if (currentAttached.includes(newUUID)) {
ui.notifications.warn(`${item.name} is already attached to this armor.`);
return;
}
const updatedAttached = [...currentAttached, newUUID];
await this.document.update({
'system.attached': updatedAttached
await addAttachmentToItem({
parentItem: this.document,
droppedItem: item,
parentType: 'armor'
});
const actor = this.document.parent;
if (actor && item.effects.size > 0 && this.document.system.equipped) {
await copyAttachmentEffectsToActor({
parentItem: this.document,
attachedItem: item,
attachedUuid: newUUID,
parentType: 'armor'
});
}
}
/**

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

@ -1,5 +1,5 @@
import DHBaseItemSheet from '../api/base-item.mjs';
import { copyAttachmentEffectsToActor, removeAttachmentFromItem } from '../../../helpers/attachmentHelper.mjs';
import { copyAttachmentEffectsToActor, removeAttachmentFromItem, prepareAttachmentContext, addAttachmentToItem } from '../../../helpers/attachmentHelper.mjs';
export default class WeaponSheet extends DHBaseItemSheet {
/**@inheritdoc */
@ -57,17 +57,7 @@ export default class WeaponSheet extends DHBaseItemSheet {
context.systemFields.attack.fields = this.document.system.attack.schema.fields;
break;
case 'attachments':
const attachedUUIDs = this.document.system.attached;
context.attachedItems = await Promise.all(
attachedUUIDs.map(async uuid => {
const item = await fromUuid(uuid);
return {
uuid: uuid,
name: item?.name || 'Unknown Item',
img: item?.img || 'icons/svg/item-bag.svg'
};
})
);
context.attachedItems = await prepareAttachmentContext(this.document);
break;
}
return context;
@ -97,31 +87,11 @@ export default class WeaponSheet extends DHBaseItemSheet {
const item = await Item.implementation.fromDropData(data);
if (!item) return;
const currentAttached = this.document.system.attached;
const newUUID = item.uuid;
if (currentAttached.includes(newUUID)) {
ui.notifications.warn(`${item.name} is already attached to this weapon.`);
return;
}
const updatedAttached = [...currentAttached, newUUID];
await this.document.update({
'system.attached': updatedAttached
await addAttachmentToItem({
parentItem: this.document,
droppedItem: item,
parentType: 'weapon'
});
// Copy ALL effects from attached item to actor (only if weapon is equipped)
// Both attachment-only and regular effects should be copied when attached
const actor = this.document.parent;
if (actor && item.effects.size > 0 && this.document.system.equipped) {
await copyAttachmentEffectsToActor({
parentItem: this.document,
attachedItem: item,
attachedUuid: newUUID,
parentType: 'weapon'
});
}
}
/**

78
module/helpers/attachmentHelper.mjs
View file

@ -136,3 +136,81 @@ export async function handleAttachmentEffectsOnEquipChange({ parentItem, newEqui
}
}
}
/**
* Prepare attachment context data for rendering
* @param {Item} parentItem - The item (armor/weapon) that has attachments
* @returns {Promise<Object[]>} Array of attachment data objects
*/
export async function prepareAttachmentContext(parentItem) {
const attachedUUIDs = parentItem.system.attached;
return await Promise.all(
attachedUUIDs.map(async uuid => {
const item = await fromUuid(uuid);
return {
uuid: uuid,
name: item?.name || 'Unknown Item',
img: item?.img || 'icons/svg/item-bag.svg'
};
})
);
}
/**
* Add an attachment to an item via drag and drop
* @param {Object} options - Configuration options
* @param {Item} options.parentItem - The item (armor/weapon) that the item is being attached to
* @param {Item} options.droppedItem - The item being attached
* @param {string} options.parentType - Type of parent item ("armor" or "weapon")
* @returns {Promise<void>}
*/
export async function addAttachmentToItem({ parentItem, droppedItem, parentType }) {
const currentAttached = parentItem.system.attached;
const newUUID = droppedItem.uuid;
if (currentAttached.includes(newUUID)) {
ui.notifications.warn(`${droppedItem.name} is already attached to this ${parentType}.`);
return;
}
const updatedAttached = [...currentAttached, newUUID];
await parentItem.update({
'system.attached': updatedAttached
});
// Copy effects from attached item to actor (only if parent item is equipped)
const actor = parentItem.parent;
if (actor && droppedItem.effects.size > 0 && parentItem.system.equipped) {
await copyAttachmentEffectsToActor({
parentItem,
attachedItem: droppedItem,
attachedUuid: newUUID,
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
});
}