Foundry/.dungeon
0
0
Fork 0
Code Issues 57 Pull requests Projects Releases 7 Packages Wiki Activity Actions

Fix deprecation warnings for v12

Browse source
This commit is contained in:
Oliver-Akins 2024-04-18 17:37:18 -06:00
parent 2df7d2243f
commit 484c7a375c
17 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/dialogs/DiceList.mjs
View file

@ -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,

2
module/models/Item/Aspect.mjs
View file

@ -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 }),

2
module/models/Item/DescribedItemData.mjs
View file

@ -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,

2
module/models/Item/Equipment.mjs
View file

@ -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(), {});
};
};

2
module/models/Item/Pet.mjs
View file

@ -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 }),
});

2
module/models/Item/Spell.mjs
View file

@ -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,

2
module/models/Item/Weapon.mjs
View file

@ -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,

2
module/models/template.mjs
View file

@ -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(), {
});
};
};

2
module/sheets/Actors/PC/PlayerSheetV2.mjs
View file

@ -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`,

2
module/sheets/GenericActorSheet.mjs
View file

@ -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`],

2
module/sheets/Items/AspectSheet.mjs
View file

@ -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`,

2
module/sheets/Items/PetSheet.mjs
View file

@ -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`,

2
module/sheets/Items/SpellSheet.mjs
View file

@ -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`,

2
module/sheets/Items/UntypedItemSheet.mjs
View file

@ -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`,

2
module/sheets/MVPPCSheet.mjs
View file

@ -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`

2
module/sheets/MobSheet.mjs
View file

@ -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`,

2
module/sheets/SyncVariations/AbstractSyncSheet.mjs
View file

@ -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,