diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index 8286c35c..62cee893 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -13,12 +13,7 @@ export class MothershipActorSheet extends ActorSheet { height: 820, tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "character" }] } - - if (game.release.generation >= 12) { - return foundry.utils.mergeObject(super.defaultOptions, options); - } else { - return mergeObject(super.defaultOptions, options); - } + return foundry.utils.mergeObject(super.defaultOptions, options); } /* -------------------------------------------- */ diff --git a/module/actor/creature-sheet.js b/module/actor/creature-sheet.js index de9018b3..b66b7fc8 100644 --- a/module/actor/creature-sheet.js +++ b/module/actor/creature-sheet.js @@ -16,11 +16,7 @@ export class MothershipCreatureSheet extends ActorSheet { tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "character" }] }; - if (game.release.generation >= 12) { - return foundry.utils.mergeObject(super.defaultOptions, options); - } else { - return mergeObject(super.defaultOptions, options); - } + return foundry.utils.mergeObject(super.defaultOptions, options); } /** diff --git a/module/actor/ship-sheet-sbt.js b/module/actor/ship-sheet-sbt.js index c68fd796..afd2859b 100644 --- a/module/actor/ship-sheet-sbt.js +++ b/module/actor/ship-sheet-sbt.js @@ -25,12 +25,7 @@ export class MothershipShipSheetSBT extends ActorSheet { scrollY: [".sheet-body", "scroll-lock"] } - - if (game.release.generation >= 12) { - return foundry.utils.mergeObject(super.defaultOptions, options); - } else { - return mergeObject(super.defaultOptions, options); - } + return foundry.utils.mergeObject(super.defaultOptions, options); } diff --git a/module/actor/ship-sheet.js b/module/actor/ship-sheet.js index af1bd374..88163b64 100644 --- a/module/actor/ship-sheet.js +++ b/module/actor/ship-sheet.js @@ -6,7 +6,7 @@ export class MothershipShipSheet extends ActorSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["mosh", "sheet", "actor", "ship"], template: "systems/mosh/templates/actor/ship-sheet.html", width: 700, diff --git a/module/item/item-sheet.js b/module/item/item-sheet.js index fd530405..825f85d2 100644 --- a/module/item/item-sheet.js +++ b/module/item/item-sheet.js @@ -13,11 +13,7 @@ export class MothershipItemSheet extends ItemSheet { tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }] }; - if (game.release.generation >= 12) { - return foundry.utils.mergeObject(super.defaultOptions, options); - } else { - return mergeObject(super.defaultOptions, options); - } + return foundry.utils.mergeObject(super.defaultOptions, options); } /** @override */ diff --git a/module/mosh.js b/module/mosh.js index fcd75d9e..731245ed 100644 --- a/module/mosh.js +++ b/module/mosh.js @@ -257,7 +257,7 @@ Hooks.on("preCreateActor", (document, createData, options, userId) => { } // Set wounds, advantage, and display name visibility - mergeObject(createData, + foundry.utils.mergeObject(createData, { "token.bar1": { "attribute": "health" }, // Default Bar 1 to Health "token.bar2": { "attribute": "hits" }, // Default Bar 2 to Insanity