diff --git a/module/dialogs/DiceList.mjs b/module/dialogs/DiceList.mjs index f9793de..3c305c8 100644 --- a/module/dialogs/DiceList.mjs +++ b/module/dialogs/DiceList.mjs @@ -12,7 +12,7 @@ export class DiceList extends GenericDialog { }; static get defaultOptions() { - const opts = mergeObject({ + const opts = foundry.utils.mergeObject({ ...super.defaultOptions, template: `systems/dotdungeon/templates/dialogs/diceList.hbs`, width: 275, diff --git a/module/models/Item/Aspect.mjs b/module/models/Item/Aspect.mjs index eb1ffed..92b3eac 100644 --- a/module/models/Item/Aspect.mjs +++ b/module/models/Item/Aspect.mjs @@ -10,7 +10,7 @@ export class AspectItemData extends DescribedItemData { delete parentSchema.quantity_affects_used_capacity; delete parentSchema.usage_cost; - return mergeObject(parentSchema, { + return foundry.utils.mergeObject(parentSchema, { used: new fields.BooleanField({ initial: false }), /** The number of seconds that the effect of the aspect stays */ deactivateAfter: new fields.NumberField({ nullable: true }), diff --git a/module/models/Item/DescribedItemData.mjs b/module/models/Item/DescribedItemData.mjs index ebfce48..eb913a0 100644 --- a/module/models/Item/DescribedItemData.mjs +++ b/module/models/Item/DescribedItemData.mjs @@ -3,7 +3,7 @@ import { CommonItemData } from "./CommonItemData.mjs"; export class DescribedItemData extends CommonItemData { static defineSchema() { const fields = foundry.data.fields; - return mergeObject(super.defineSchema(), { + return foundry.utils.mergeObject(super.defineSchema(), { description: new fields.StringField({ initial: ``, blank: true, diff --git a/module/models/Item/Equipment.mjs b/module/models/Item/Equipment.mjs index 82b58de..309fd3b 100644 --- a/module/models/Item/Equipment.mjs +++ b/module/models/Item/Equipment.mjs @@ -3,6 +3,6 @@ import { DescribedItemData } from "./DescribedItemData.mjs"; export class EquipmentItemData extends DescribedItemData { static defineSchema() { const fields = foundry.data.fields; - return mergeObject(super.defineSchema(), {}); + return foundry.utils.mergeObject(super.defineSchema(), {}); }; }; diff --git a/module/models/Item/Pet.mjs b/module/models/Item/Pet.mjs index 886e761..34c6de5 100644 --- a/module/models/Item/Pet.mjs +++ b/module/models/Item/Pet.mjs @@ -9,7 +9,7 @@ export class PetItemData extends DescribedItemData { delete parentSchema.quantity_affects_used_capacity; delete parentSchema.usage_cost; - return mergeObject(parentSchema, { + return foundry.utils.mergeObject(parentSchema, { upkeep: new fields.NumberField({ initial: null, nullable: true }), pokeballd: new fields.BooleanField({ initial: true }), }); diff --git a/module/models/Item/Spell.mjs b/module/models/Item/Spell.mjs index 6bd90f6..f96381f 100644 --- a/module/models/Item/Spell.mjs +++ b/module/models/Item/Spell.mjs @@ -4,7 +4,7 @@ import DOTDUNGEON from "../../config.mjs"; export class SpellItemData extends DescribedItemData { static defineSchema() { const fields = foundry.data.fields; - return mergeObject(super.defineSchema(), { + return foundry.utils.mergeObject(super.defineSchema(), { skill: new fields.StringField({ initial: ``, blank: true, diff --git a/module/models/Item/Weapon.mjs b/module/models/Item/Weapon.mjs index 5b9cf67..20db6b7 100644 --- a/module/models/Item/Weapon.mjs +++ b/module/models/Item/Weapon.mjs @@ -4,7 +4,7 @@ import DOTDUNGEON from "../../config.mjs"; export class WeaponItemData extends DescribedItemData { static defineSchema() { const fields = foundry.data.fields; - return mergeObject(super.defineSchema(), { + return foundry.utils.mergeObject(super.defineSchema(), { damage: new fields.StringField({ initial: null, nullable: true, diff --git a/module/models/template.mjs b/module/models/template.mjs index f3cea2a..77340ee 100644 --- a/module/models/template.mjs +++ b/module/models/template.mjs @@ -3,7 +3,7 @@ import { DescribedItemData } from "./DescribedItemData.mjs"; export class TemplateData extends DescribedItemData { static defineSchema() { const fields = foundry.data.fields; - return mergeObject(super.defineSchema(), { + return foundry.utils.mergeObject(super.defineSchema(), { }); }; }; diff --git a/module/sheets/Actors/PC/PlayerSheetV2.mjs b/module/sheets/Actors/PC/PlayerSheetV2.mjs index 9dd14ac..e39f7e3 100644 --- a/module/sheets/Actors/PC/PlayerSheetV2.mjs +++ b/module/sheets/Actors/PC/PlayerSheetV2.mjs @@ -6,7 +6,7 @@ import { GenericContextMenu } from "../../../utils/GenericContextMenu.mjs"; export class PlayerSheetv2 extends GenericActorSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { template: `systems/dotdungeon/templates/actors/char-sheet/v2/sheet.hbs`, diff --git a/module/sheets/GenericActorSheet.mjs b/module/sheets/GenericActorSheet.mjs index 32b6d5e..50dcada 100644 --- a/module/sheets/GenericActorSheet.mjs +++ b/module/sheets/GenericActorSheet.mjs @@ -3,7 +3,7 @@ import DOTDUNGEON from "../config.mjs"; export class GenericActorSheet extends ActorSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { scrollY: [`.scrollable`], diff --git a/module/sheets/Items/AspectSheet.mjs b/module/sheets/Items/AspectSheet.mjs index c43a01c..2bf8638 100644 --- a/module/sheets/Items/AspectSheet.mjs +++ b/module/sheets/Items/AspectSheet.mjs @@ -2,7 +2,7 @@ import { GenericItemSheet } from "./GenericItemSheet.mjs"; export class AspectSheet extends GenericItemSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { template: `systems/dotdungeon/templates/items/aspect.hbs`, diff --git a/module/sheets/Items/PetSheet.mjs b/module/sheets/Items/PetSheet.mjs index 169516c..a2db3b9 100644 --- a/module/sheets/Items/PetSheet.mjs +++ b/module/sheets/Items/PetSheet.mjs @@ -2,7 +2,7 @@ import { GenericItemSheet } from "./GenericItemSheet.mjs"; export class PetSheet extends GenericItemSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { template: `systems/dotdungeon/templates/items/pet.hbs`, diff --git a/module/sheets/Items/SpellSheet.mjs b/module/sheets/Items/SpellSheet.mjs index cabf2db..8e92831 100644 --- a/module/sheets/Items/SpellSheet.mjs +++ b/module/sheets/Items/SpellSheet.mjs @@ -2,7 +2,7 @@ import { GenericItemSheet } from "./GenericItemSheet.mjs"; export class SpellSheet extends GenericItemSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { template: `systems/dotdungeon/templates/items/spell.hbs`, diff --git a/module/sheets/Items/UntypedItemSheet.mjs b/module/sheets/Items/UntypedItemSheet.mjs index 90061b0..a62b7dd 100644 --- a/module/sheets/Items/UntypedItemSheet.mjs +++ b/module/sheets/Items/UntypedItemSheet.mjs @@ -3,7 +3,7 @@ import { GenericItemSheet } from "./GenericItemSheet.mjs"; export class UntypedItemSheet extends GenericItemSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { template: `systems/dotdungeon/templates/items/untyped/v2/index.hbs`, diff --git a/module/sheets/MVPPCSheet.mjs b/module/sheets/MVPPCSheet.mjs index 3572b25..a5f05f5 100644 --- a/module/sheets/MVPPCSheet.mjs +++ b/module/sheets/MVPPCSheet.mjs @@ -5,7 +5,7 @@ export class MVPPCSheet extends GenericActorSheet { /** @override {ActorHandler} actor */ static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { template: `systems/dotdungeon/templates/actors/char-sheet-mvp/sheet.hbs` diff --git a/module/sheets/MobSheet.mjs b/module/sheets/MobSheet.mjs index b2ecc06..b2f2213 100644 --- a/module/sheets/MobSheet.mjs +++ b/module/sheets/MobSheet.mjs @@ -3,7 +3,7 @@ import { DiceList } from "../dialogs/DiceList.mjs"; export class MobSheet extends GenericActorSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { template: `systems/dotdungeon/templates/actors/mobs/main.hbs`, diff --git a/module/sheets/SyncVariations/AbstractSyncSheet.mjs b/module/sheets/SyncVariations/AbstractSyncSheet.mjs index 53bfdf1..80e372b 100644 --- a/module/sheets/SyncVariations/AbstractSyncSheet.mjs +++ b/module/sheets/SyncVariations/AbstractSyncSheet.mjs @@ -2,7 +2,7 @@ import { GenericActorSheet } from "../GenericActorSheet.mjs"; export class AbstractSyncSheet extends GenericActorSheet { static get defaultOptions() { - let opts = mergeObject( + let opts = foundry.utils.mergeObject( super.defaultOptions, { width: 200,