Update to use foundry.utils.mergeObject
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 */
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user