diff --git a/module/item.js b/module/item.js index 62b019d9..e52970e0 100644 --- a/module/item.js +++ b/module/item.js @@ -177,7 +177,7 @@ export class RdDItem extends Item { constructor(docData, context = {}) { if (!context.rdd?.ready) { - mergeObject(context, { rdd: { ready: true } }); + foundry.utils.mergeObject(context, { rdd: { ready: true } }); const ItemConstructor = game.system.rdd.itemClasses[docData.type]; if (ItemConstructor) { if (!docData.img) { diff --git a/module/settings/status-effects.js b/module/settings/status-effects.js index 9a51b70f..5323694d 100644 --- a/module/settings/status-effects.js +++ b/module/settings/status-effects.js @@ -65,7 +65,7 @@ export class StatusEffects extends FormApplication { static valeurSurprise(effect, isCombat) { if (statusSurpriseTotale.intersects(effect.statuses)) { - return 2; + return 2 } if (statusDemiSurprise.intersects(effect.statuses)) { return 1 @@ -110,7 +110,7 @@ export class StatusEffects extends FormApplication { static get defaultOptions() { const options = super.defaultOptions; - mergeObject(options, { + foundry.utils.mergeObject(options, { id: "status-effects", template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.html", height: 800,