From 11e2f285a86f467b69b69decf34db281fa070f23 Mon Sep 17 00:00:00 2001
From: Melon-PieldeSapo <hfazefiris@gmail.com>
Date: Mon, 6 Jan 2025 13:22:00 +0100
Subject: [PATCH] Update to use foundry.utils.mergeObject

---
 module/actor/actor-sheet.js    | 7 +------
 module/actor/creature-sheet.js | 6 +-----
 module/actor/ship-sheet-sbt.js | 7 +------
 module/actor/ship-sheet.js     | 2 +-
 module/item/item-sheet.js      | 6 +-----
 module/mosh.js                 | 2 +-
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index 8286c35..62cee89 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 de9018b..b66b7fc 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 8f925dd..4eb8f15 100644
--- a/module/actor/ship-sheet-sbt.js
+++ b/module/actor/ship-sheet-sbt.js
@@ -24,12 +24,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 af1bd37..88163b6 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 fd53040..825f85d 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 fac2334..f0e1062 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