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

Corrected back to actions for right items

Browse source
This commit is contained in:
WBHarry 2025-07-05 21:34:15 +02:00
parent 3d735e6a09
commit eb96e8b813
17 changed files with 148 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
import BaseDataItem from './base.mjs';
import ActionField from '../fields/actionField.mjs';
import { armorFeatures } from '../../config/itemConfig.mjs';
import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
export default class DHArmor extends BaseDataItem {
/** @inheritDoc */
@ -22,7 +22,7 @@ export default class DHArmor extends BaseDataItem {
tier: new fields.NumberField({ required: true, integer: true, initial: 1, min: 1 }),
equipped: new fields.BooleanField({ initial: false }),
baseScore: new fields.NumberField({ integer: true, initial: 0 }),
armorFeatures: new fields.ArrayField(
features: new fields.ArrayField(
new fields.SchemaField({
value: new fields.StringField({
required: true,
@ -40,28 +40,32 @@ export default class DHArmor extends BaseDataItem {
major: new fields.NumberField({ integer: true, initial: 0 }),
severe: new fields.NumberField({ integer: true, initial: 0 })
}),
features: new ForeignDocumentUUIDArrayField({ type: 'Item' })
actions: new fields.ArrayField(new ActionField())
};
}
get featureInfo() {
return this.feature ? CONFIG.DH.ITEM.armorFeatures[this.feature] : null;
}
async _preUpdate(changes, options, user) {
const allowed = await super._preUpdate(changes, options, user);
if (allowed === false) return false;
if (changes.system?.armorFeatures) {
const removed = this.armorFeatures.filter(x => !changes.system.armorFeatures.includes(x));
const added = changes.system.armorFeatures.filter(x => !this.armorFeatures.includes(x));
if (changes.system.features) {
const removed = this.features.filter(x => !changes.system.features.includes(x));
const added = changes.system.features.filter(x => !this.features.includes(x));
for (var armorFeature of removed) {
for (var effectId of armorFeature.effectIds) {
for (var feature of removed) {
for (var effectId of feature.effectIds) {
await this.parent.effects.get(effectId).delete();
}
changes.system.actions = this.actions.filter(x => !armorFeature.actionIds.includes(x._id));
changes.system.actions = this.actions.filter(x => !feature.actionIds.includes(x._id));
}
for (var armorFeature of added) {
const featureData = armorFeatures[armorFeature.value];
for (var feature of added) {
const featureData = armorFeatures[feature.value];
if (featureData.effects?.length > 0) {
const embeddedItems = await this.parent.createEmbeddedDocuments('ActiveEffect', [
{
@ -70,7 +74,7 @@ export default class DHArmor extends BaseDataItem {
changes: featureData.effects.flatMap(x => x.changes)
}
]);
armorFeature.effectIds = embeddedItems.map(x => x.id);
feature.effectIds = embeddedItems.map(x => x.id);
}
if (featureData.actions?.length > 0) {
const newActions = featureData.actions.map(action => {
@ -81,7 +85,7 @@ export default class DHArmor extends BaseDataItem {
);
});
changes.system.actions = [...this.actions, ...newActions];
armorFeature.actionIds = newActions.map(x => x._id);
feature.actionIds = newActions.map(x => x._id);
}
}
}

4
module/data/item/consumable.mjs
View file

@ -1,5 +1,5 @@
import BaseDataItem from './base.mjs';
import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHConsumable extends BaseDataItem {
/** @inheritDoc */
@ -19,7 +19,7 @@ export default class DHConsumable extends BaseDataItem {
return {
...super.defineSchema(),
consumeOnUse: new fields.BooleanField({ initial: false }),
features: new ForeignDocumentUUIDArrayField({ type: 'Item' })
actions: new fields.ArrayField(new ActionField())
};
}
}

4
module/data/item/domainCard.mjs
View file

@ -1,5 +1,5 @@
import BaseDataItem from './base.mjs';
import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHDomainCard extends BaseDataItem {
/** @inheritDoc */
@ -30,7 +30,7 @@ export default class DHDomainCard extends BaseDataItem {
}),
foundation: new fields.BooleanField({ initial: false }),
inVault: new fields.BooleanField({ initial: false }),
features: new ForeignDocumentUUIDArrayField({ type: 'Item' })
actions: new fields.ArrayField(new ActionField())
};
}

5
module/data/item/miscellaneous.mjs
View file

@ -1,5 +1,5 @@
import BaseDataItem from './base.mjs';
import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHMiscellaneous extends BaseDataItem {
/** @inheritDoc */
@ -15,9 +15,10 @@ export default class DHMiscellaneous extends BaseDataItem {
/** @inheritDoc */
static defineSchema() {
const fields = foundry.data.fields;
return {
...super.defineSchema(),
features: new ForeignDocumentUUIDArrayField({ type: 'Item' })
actions: new fields.ArrayField(new ActionField())
};
}
}

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

@ -1,6 +1,6 @@
import BaseDataItem from './base.mjs';
import { actionsTypes } from '../action/_module.mjs';
import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHWeapon extends BaseDataItem {
/** @inheritDoc */
@ -38,7 +38,7 @@ export default class DHWeapon extends BaseDataItem {
initial: 'physical'
})
}),
weaponFeatures: new fields.ArrayField(
features: new fields.ArrayField(
new fields.SchemaField({
value: new fields.StringField({
required: true,
@ -49,7 +49,7 @@ export default class DHWeapon extends BaseDataItem {
actionIds: new fields.ArrayField(new fields.StringField({ required: true }))
})
),
features: new ForeignDocumentUUIDArrayField({ type: 'Item' })
actions: new fields.ArrayField(new ActionField())
};
}
@ -57,9 +57,9 @@ export default class DHWeapon extends BaseDataItem {
const allowed = await super._preUpdate(changes, options, user);
if (allowed === false) return false;
if (changes.system?.weaponFeatures) {
const removed = this.weaponFeatures.filter(x => !changes.system.weaponFeatures.includes(x));
const added = changes.system.weaponFeatures.filter(x => !this.weaponFeatures.includes(x));
if (changes.system?.features) {
const removed = this.features.filter(x => !changes.system.features.includes(x));
const added = changes.system.features.filter(x => !this.features.includes(x));
for (var weaponFeature of removed) {
for (var effectId of weaponFeature.effectIds) {