diff --git a/module/data/item/armor.mjs b/module/data/item/armor.mjs index d292b184..b0e4847f 100644 --- a/module/data/item/armor.mjs +++ b/module/data/item/armor.mjs @@ -23,7 +23,6 @@ export default class DHArmor extends AttachableItem { current: new fields.NumberField({ integer: true, min: 0, initial: 0 }), max: new fields.NumberField({ required: true, integer: true, initial: 0 }) }), - quantity: new fields.NumberField({ integer: true, initial: 1, min: 0, required: true }), baseThresholds: new fields.SchemaField({ major: new fields.NumberField({ integer: true, initial: 0 }), severe: new fields.NumberField({ integer: true, initial: 0 }) diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs index 2093e909..72718c5e 100644 --- a/module/data/item/base.mjs +++ b/module/data/item/base.mjs @@ -81,6 +81,9 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel { ); } + if (this.metadata.isInventoryItem) + schema.quantity = new fields.NumberField({ integer: true, initial: 1, min: 0, required: true }); + if (this.metadata.hasActions) schema.actions = new ActionsField(); return schema; diff --git a/module/data/item/consumable.mjs b/module/data/item/consumable.mjs index 89573364..e83a1a53 100644 --- a/module/data/item/consumable.mjs +++ b/module/data/item/consumable.mjs @@ -17,8 +17,7 @@ export default class DHConsumable extends BaseDataItem { const fields = foundry.data.fields; return { ...super.defineSchema(), - consumeOnUse: new fields.BooleanField({ initial: true }), - quantity: new fields.NumberField({ integer: true, initial: 1, min: 0, required: true }) + consumeOnUse: new fields.BooleanField({ initial: true }) }; } diff --git a/module/data/item/loot.mjs b/module/data/item/loot.mjs index 2d5865e9..d2b09427 100644 --- a/module/data/item/loot.mjs +++ b/module/data/item/loot.mjs @@ -14,10 +14,8 @@ export default class DHLoot extends BaseDataItem { /** @inheritDoc */ static defineSchema() { - const fields = foundry.data.fields; return { ...super.defineSchema(), - quantity: new fields.NumberField({ integer: true, initial: 1, min: 0, required: true }), }; } diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs index 55e70c4d..9335037c 100644 --- a/module/data/item/weapon.mjs +++ b/module/data/item/weapon.mjs @@ -26,7 +26,6 @@ export default class DHWeapon extends AttachableItem { label: 'DAGGERHEART.GENERAL.Tiers.singular' }), equipped: new fields.BooleanField({ initial: false }), - quantity: new fields.NumberField({ integer: true, initial: 1, min: 0, required: true }), //SETTINGS secondary: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }),