From 6700c8c1fbd41f998678056ae79e472fd66c6e19 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Fri, 19 Jan 2024 20:38:22 -0700 Subject: [PATCH] Remove some stuff that I started but began to overwhelm me --- module/documents/Item/Handler.mjs | 2 -- module/documents/Item/Structure.mjs | 23 ----------------------- module/models/Item/Equipment.mjs | 1 - module/models/Item/Pet.mjs | 4 ++-- module/models/Item/Structure.mjs | 22 ---------------------- module/models/template.mjs | 9 +++++++++ 6 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 module/documents/Item/Structure.mjs delete mode 100644 module/models/Item/Structure.mjs create mode 100644 module/models/template.mjs diff --git a/module/documents/Item/Handler.mjs b/module/documents/Item/Handler.mjs index 7b1f210..c072abd 100644 --- a/module/documents/Item/Handler.mjs +++ b/module/documents/Item/Handler.mjs @@ -1,13 +1,11 @@ import AspectItem from "./Aspect.mjs"; import SpellItem from "./Spell.mjs"; -import StructureItem from "./Structure.mjs"; /** @extends {Item} */ export class ItemHandler extends Item { proxyTargets = { aspect: AspectItem, spell: SpellItem, - structure: StructureItem, }; constructor(data, ctx) { diff --git a/module/documents/Item/Structure.mjs b/module/documents/Item/Structure.mjs deleted file mode 100644 index c443a21..0000000 --- a/module/documents/Item/Structure.mjs +++ /dev/null @@ -1,23 +0,0 @@ -import { ItemHandler } from "./Handler.mjs"; - -/** @this {ItemHandler} */ -async function _preCreate() { - if (this.isEmbedded) { - let actor = this.actor; - if (actor.type === "settlement") { - return await actor.preItemEmbed(this); - }; - ui.notifications.error( - game.i18n.format( - `dotdungeon.notification.error.cant-embed-item`, - { item: this, actor } - ), - { console: false, } - ); - return false; - }; -}; - -export default { - _preCreate, -}; \ No newline at end of file diff --git a/module/models/Item/Equipment.mjs b/module/models/Item/Equipment.mjs index 48e2f53..6e9d7f9 100644 --- a/module/models/Item/Equipment.mjs +++ b/module/models/Item/Equipment.mjs @@ -9,7 +9,6 @@ export class EquipmentItemData extends DescribedItemData { nullable: true, required: false, }), - material }); }; }; diff --git a/module/models/Item/Pet.mjs b/module/models/Item/Pet.mjs index 439449e..7d46e94 100644 --- a/module/models/Item/Pet.mjs +++ b/module/models/Item/Pet.mjs @@ -4,8 +4,8 @@ export class PetItemData extends DescribedItemData { static defineSchema() { const fields = foundry.data.fields; return mergeObject(super.defineSchema(), { - upkeep: new fields.NumberField({ intial: null, nullable: true }), - pokeballd: new fields.BooleanField({ initial: false }), + upkeep: new fields.NumberField({ initial: null, nullable: true }), + pokeballd: new fields.BooleanField({ initial: true }), }); }; }; diff --git a/module/models/Item/Structure.mjs b/module/models/Item/Structure.mjs deleted file mode 100644 index 7127c30..0000000 --- a/module/models/Item/Structure.mjs +++ /dev/null @@ -1,22 +0,0 @@ -import { DescribedItemData } from "./DescribedItemData.mjs"; - -export class StructureItemData extends DescribedItemData { - static defineSchema() { - const fields = foundry.data.fields; - return mergeObject(super.defineSchema(), { - one_night: new fields.NumberField({ - initial: null, - nullable: true, - }), - upkeep: new fields.NumberField({ - initial: null, - nullable: true, - }), - construction_length: new fields.NumberField({ - min: 0, - initial: 0, - nullable: false, - }), - }); - }; -}; \ No newline at end of file diff --git a/module/models/template.mjs b/module/models/template.mjs new file mode 100644 index 0000000..f3cea2a --- /dev/null +++ b/module/models/template.mjs @@ -0,0 +1,9 @@ +import { DescribedItemData } from "./DescribedItemData.mjs"; + +export class TemplateData extends DescribedItemData { + static defineSchema() { + const fields = foundry.data.fields; + return mergeObject(super.defineSchema(), { + }); + }; +};