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

try to make it drier

Browse source
This commit is contained in:
psitacus 2025-07-09 00:00:57 -06:00
parent 7ffafae475
commit 745e68b4e2
6 changed files with 151 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

57
module/data/item/armor.mjs
View file

@ -2,6 +2,7 @@ import BaseDataItem from './base.mjs';
import ActionField from '../fields/actionField.mjs';
import { armorFeatures } from '../../config/itemConfig.mjs';
import { actionsTypes } from '../action/_module.mjs';
import { handleAttachmentEffectsOnEquipChange } from '../../helpers/attachmentHelper.mjs';
export default class DHArmor extends BaseDataItem {
/** @inheritDoc */
@ -56,7 +57,11 @@ export default class DHArmor extends BaseDataItem {
// Handle equipped status changes for attachment effects
if (changes.system?.equipped !== undefined && changes.system.equipped !== this.equipped) {
await this._handleAttachmentEffectsOnEquipChange(changes.system.equipped);
await handleAttachmentEffectsOnEquipChange({
parentItem: this.parent,
newEquippedStatus: changes.system.equipped,
parentType: 'armor'
});
}
if (changes.system.features) {
@ -97,54 +102,4 @@ export default class DHArmor extends BaseDataItem {
}
}
}
/**
* Handle adding/removing attachment effects when armor is equipped/unequipped
* @param {boolean} newEquippedStatus - The new equipped status
*/
async _handleAttachmentEffectsOnEquipChange(newEquippedStatus) {
const actor = this.parent.parent;
if (!actor || !this.attached?.length) return;
if (newEquippedStatus) {
// Armor is being equipped - add attachment effects
const effectsToCreate = [];
for (const attachedUuid of this.attached) {
const attachedItem = await fromUuid(attachedUuid);
if (attachedItem && attachedItem.effects.size > 0) {
for (const effect of attachedItem.effects) {
// Copy ALL effects when item is attached - attachment-only flag only matters for non-attached items
const effectData = effect.toObject();
effectData.origin = `${this.parent.uuid}:${attachedUuid}`;
effectData.flags = {
...effectData.flags,
daggerheart: {
...effectData.flags?.daggerheart,
attachmentSource: {
armorUuid: this.parent.uuid,
itemUuid: attachedUuid,
originalEffectId: effect.id
}
}
};
effectsToCreate.push(effectData);
}
}
}
if (effectsToCreate.length > 0) {
await actor.createEmbeddedDocuments('ActiveEffect', effectsToCreate);
}
} else {
// Armor is being unequipped - remove attachment effects
const effectsToRemove = actor.effects.filter(effect => {
const attachmentSource = effect.flags?.daggerheart?.attachmentSource;
return attachmentSource && attachmentSource.armorUuid === this.parent.uuid;
});
if (effectsToRemove.length > 0) {
await actor.deleteEmbeddedDocuments('ActiveEffect', effectsToRemove.map(e => e.id));
}
}
}
}

57
module/data/item/weapon.mjs
View file

@ -1,6 +1,7 @@
import BaseDataItem from './base.mjs';
import { actionsTypes } from '../action/_module.mjs';
import ActionField from '../fields/actionField.mjs';
import { handleAttachmentEffectsOnEquipChange } from '../../helpers/attachmentHelper.mjs';
export default class DHWeapon extends BaseDataItem {
/** @inheritDoc */
@ -81,7 +82,11 @@ export default class DHWeapon extends BaseDataItem {
// Handle equipped status changes for attachment effects
if (changes.system?.equipped !== undefined && changes.system.equipped !== this.equipped) {
await this._handleAttachmentEffectsOnEquipChange(changes.system.equipped);
await handleAttachmentEffectsOnEquipChange({
parentItem: this.parent,
newEquippedStatus: changes.system.equipped,
parentType: 'weapon'
});
}
if (changes.system?.features) {
@ -122,54 +127,4 @@ export default class DHWeapon extends BaseDataItem {
}
}
}
/**
* Handle adding/removing attachment effects when weapon is equipped/unequipped
* @param {boolean} newEquippedStatus - The new equipped status
*/
async _handleAttachmentEffectsOnEquipChange(newEquippedStatus) {
const actor = this.parent.parent;
if (!actor || !this.attached?.length) return;
if (newEquippedStatus) {
// Weapon is being equipped - add attachment effects
const effectsToCreate = [];
for (const attachedUuid of this.attached) {
const attachedItem = await fromUuid(attachedUuid);
if (attachedItem && attachedItem.effects.size > 0) {
for (const effect of attachedItem.effects) {
// Copy ALL effects when item is attached - attachment-only flag only matters for non-attached items
const effectData = effect.toObject();
effectData.origin = `${this.parent.uuid}:${attachedUuid}`;
effectData.flags = {
...effectData.flags,
daggerheart: {
...effectData.flags?.daggerheart,
attachmentSource: {
weaponUuid: this.parent.uuid,
itemUuid: attachedUuid,
originalEffectId: effect.id
}
}
};
effectsToCreate.push(effectData);
}
}
}
if (effectsToCreate.length > 0) {
await actor.createEmbeddedDocuments('ActiveEffect', effectsToCreate);
}
} else {
// Weapon is being unequipped - remove attachment effects
const effectsToRemove = actor.effects.filter(effect => {
const attachmentSource = effect.flags?.daggerheart?.attachmentSource;
return attachmentSource && attachmentSource.weaponUuid === this.parent.uuid;
});
if (effectsToRemove.length > 0) {
await actor.deleteEmbeddedDocuments('ActiveEffect', effectsToRemove.map(e => e.id));
}
}
}
}