From b7ea925276ca30fcf8aab70efe62611af84423f5 Mon Sep 17 00:00:00 2001 From: Dapoulp <74197441+Dapoulp@users.noreply.github.com> Date: Fri, 13 Jun 2025 23:59:20 +0200 Subject: [PATCH] Fix action for items (#135) --- module/data/item/armor.mjs | 2 ++ module/data/item/consumable.mjs | 4 +++- module/data/item/domainCard.mjs | 4 ++-- module/data/item/feature.mjs | 3 ++- module/data/item/miscellaneous.mjs | 2 ++ module/data/item/weapon.mjs | 1 - 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/module/data/item/armor.mjs b/module/data/item/armor.mjs index e8137340..7ee20c29 100644 --- a/module/data/item/armor.mjs +++ b/module/data/item/armor.mjs @@ -1,4 +1,5 @@ import BaseDataItem from './base.mjs'; +import ActionField from '../fields/actionField.mjs'; export default class DHArmor extends BaseDataItem { /** @inheritDoc */ @@ -27,6 +28,7 @@ export default class DHArmor extends BaseDataItem { major: new fields.NumberField({ integer: true, initial: 0 }), severe: new fields.NumberField({ integer: true, initial: 0 }) }), + actions: new fields.ArrayField(new ActionField()) }; } diff --git a/module/data/item/consumable.mjs b/module/data/item/consumable.mjs index b399b4dc..aff7eea0 100644 --- a/module/data/item/consumable.mjs +++ b/module/data/item/consumable.mjs @@ -1,4 +1,5 @@ import BaseDataItem from "./base.mjs"; +import ActionField from '../fields/actionField.mjs'; export default class DHConsumable extends BaseDataItem { /** @inheritDoc */ @@ -16,7 +17,8 @@ export default class DHConsumable extends BaseDataItem { const fields = foundry.data.fields; return { ...super.defineSchema(), - consumeOnUse: new fields.BooleanField({ initial: false }) + consumeOnUse: new fields.BooleanField({ initial: false }), + actions: new fields.ArrayField(new ActionField()) }; } } diff --git a/module/data/item/domainCard.mjs b/module/data/item/domainCard.mjs index 814626e3..dcafd0d9 100644 --- a/module/data/item/domainCard.mjs +++ b/module/data/item/domainCard.mjs @@ -1,5 +1,5 @@ -import DHAction from '../action/action.mjs'; import BaseDataItem from './base.mjs'; +import ActionField from '../fields/actionField.mjs'; export default class DHDomainCard extends BaseDataItem { /** @inheritDoc */ @@ -22,7 +22,7 @@ export default class DHDomainCard extends BaseDataItem { type: new fields.StringField({ choices: SYSTEM.DOMAIN.cardTypes, required: true, blank: true }), foundation: new fields.BooleanField({ initial: false }), inVault: new fields.BooleanField({ initial: false }), - actions: new fields.ArrayField(new fields.EmbeddedDataField(DHAction)) + actions: new fields.ArrayField(new ActionField()) }; } diff --git a/module/data/item/feature.mjs b/module/data/item/feature.mjs index 37e8ae3a..026580c3 100644 --- a/module/data/item/feature.mjs +++ b/module/data/item/feature.mjs @@ -1,6 +1,7 @@ import { getTier } from '../../helpers/utils.mjs'; import DHAction from '../action/action.mjs'; import BaseDataItem from './base.mjs'; +import ActionField from '../fields/actionField.mjs'; export default class DHFeature extends BaseDataItem { /** @inheritDoc */ @@ -93,7 +94,7 @@ export default class DHFeature extends BaseDataItem { }) }) ), - actions: new fields.ArrayField(new fields.EmbeddedDataField(DHAction)) + actions: new fields.ArrayField(new ActionField()) }; } diff --git a/module/data/item/miscellaneous.mjs b/module/data/item/miscellaneous.mjs index 561384b3..71daad57 100644 --- a/module/data/item/miscellaneous.mjs +++ b/module/data/item/miscellaneous.mjs @@ -1,4 +1,5 @@ import BaseDataItem from './base.mjs'; +import ActionField from '../fields/actionField.mjs'; export default class DHMiscellaneous extends BaseDataItem { /** @inheritDoc */ @@ -16,6 +17,7 @@ export default class DHMiscellaneous extends BaseDataItem { const fields = foundry.data.fields; return { ...super.defineSchema(), + actions: new fields.ArrayField(new ActionField()) }; } } diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs index 02fcd568..c007bd35 100644 --- a/module/data/item/weapon.mjs +++ b/module/data/item/weapon.mjs @@ -46,7 +46,6 @@ export default class DHWeapon extends BaseDataItem { max: 1, validTypes: ['weapon'] }), - // actions: new fields.ArrayField(new fields.EmbeddedDataField(DHAttackAction)) actions: new fields.ArrayField(new ActionField()) }; }