Preparation du passage en v12

module/actor-sheet.js

@@ -28,7 +28,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorReveSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
       width: 550,
       showCompNiveauBase: false,
@@ -39,7 +39,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
   /* -------------------------------------------- */
   async getData() {
     let formData = await super.getData();
-    mergeObject(formData,
+    foundry.utils.mergeObject(formData,
       {
         editable: this.isEditable,
         cssClass: this.isEditable ? "editable" : "locked",
@@ -49,7 +49,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
         biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
         notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
       });
-    mergeObject(formData.calc, {
+    foundry.utils.mergeObject(formData.calc, {
       surenc: this.actor.computeMalusSurEncombrement(),
       surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
       resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),

module/actor.js

@@ -1731,7 +1731,7 @@ export class RdDActor extends RdDBaseActorSang {
       else {
         rollData.depenseReve = 0;
         rollData.show.reveInsuffisant = true;
-        mergeObject(rollData.rolled, RdDResolutionTable.getResultat("echec"), { overwrite: true });
+        foundry.utils.mergeObject(rollData.rolled, RdDResolutionTable.getResultat("echec"), { overwrite: true });
       }
     } else {
       if (rolled.isETotal) { // Echec total !
@@ -1908,7 +1908,7 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async _rollArt(artData, selected, oeuvre, callbackAction = r => this._resultArt(r)) {
     oeuvre.system.niveau = oeuvre.system.niveau ?? 0;
-    mergeObject(artData,
+    foundry.utils.mergeObject(artData,
       {
         oeuvre: oeuvre,
         art: oeuvre.type,
@@ -2338,7 +2338,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   async _xpCaracDerivee(xpData) {
     const caracs = RdDActor._getComposantsCaracDerivee(xpData.caracName)
-      .map(c => mergeObject(this.system.carac[c], { isMax: this.isCaracMax(c) }))
+      .map(c => foundry.utils.mergeObject(this.system.carac[c], { isMax: this.isCaracMax(c) }))
     switch (caracs.filter(it => !it.isMax).length) {
       case 0:
         xpData.caracRepartitionManuelle = true;
@@ -2686,7 +2686,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   static $transformSubActeurSuivant = (suivant, link) => {
-    return mergeObject(RdDBaseActor.extractActorMin(suivant), {
+    return foundry.utils.mergeObject(RdDBaseActor.extractActorMin(suivant), {
       ephemere: !suivant.prototypeToken.actorLink,
       coeur: link.coeur ?? 0,
       prochainCoeur: link.prochainCoeur ?? link.coeur ?? 0
@@ -2722,7 +2722,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   static $transformSubActeurVehicule = (vehicle, link) => {
-    return mergeObject(RdDBaseActor.extractActorMin(vehicle), {
+    return foundry.utils.mergeObject(RdDBaseActor.extractActorMin(vehicle), {
       system: { categorie: vehicle.system.categorie, etat: vehicle.system.etat }
     })
   };

module/actor/base-actor-reve-sheet.js

@@ -11,7 +11,7 @@ export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
       width: 550
     });
   }

module/actor/base-actor-reve.js

@@ -286,7 +286,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   getCarac() {
     // TODO: le niveau d'une entité de cauchemar devrait être exclu...
-    const carac = mergeObject(duplicate(this.system.carac),
+    const carac = foundry.utils.mergeObject(duplicate(this.system.carac),
       {
         'reve-actuel': this.getCaracReveActuel(),
         'chance-actuelle': this.getCaracChanceActuelle()
@@ -459,7 +459,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   async onAppliquerJetEncaissement(encaissement, attacker) { }
 
   async $afficherEncaissement(encaissement, show) {
-    mergeObject(encaissement, {
+    foundry.utils.mergeObject(encaissement, {
       alias: this.name,
       hasPlayerOwner: this.hasPlayerOwner,
       show: show ?? {}

module/actor/base-actor-sang.js

@@ -94,7 +94,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
     const perteVie = await this.santeIncDec("vie", -encaissement.vie);
     const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, blessure?.isCritique());
 
-    mergeObject(encaissement, {
+    foundry.utils.mergeObject(encaissement, {
       resteEndurance: perteEndurance.newValue,
       sonne: perteEndurance.sonne,
       jetEndurance: perteEndurance.jetEndurance,
@@ -135,7 +135,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
       result.perte = perte;
       if (perte > 1) {
         // Peut-être sonné si 2 points d'endurance perdus d'un coup
-        mergeObject(result, await this.jetEndurance(result.newValue));
+        foundry.utils.mergeObject(result, await this.jetEndurance(result.newValue));
       } else if (inc > 0) {
         await this.setSonne(false);
       }

module/actor/base-actor-sheet.js

@@ -15,7 +15,7 @@ export class RdDBaseActorSheet extends ActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(ActorSheet.defaultOptions, {
+    return foundry.utils.mergeObject(ActorSheet.defaultOptions, {
       classes: ["rdd", "sheet", "actor"],
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],

module/actor/base-actor.js

@@ -123,7 +123,7 @@ export class RdDBaseActor extends Actor {
 
   constructor(docData, context = {}) {
     if (!context.rdd?.ready) {
-      mergeObject(context, { rdd: { ready: true } });
+      foundry.utils.mergeObject(context, { rdd: { ready: true } });
       const ActorConstructor = game.system.rdd.actorClasses[docData.type];
       if (ActorConstructor) {
         if (!docData.img) {
@@ -453,7 +453,7 @@ export class RdDBaseActor extends Actor {
         type: item.type,
         img: item.img,
         name: item.name,
-        system: mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined })
+        system: foundry.utils.mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined })
       };
       const newItems = isItemEmpilable ? [baseItem] : Array.from({ length: quantite }, (_, i) => baseItem);
       const items = await this.createEmbeddedDocuments("Item", newItems);

module/actor/commerce-sheet.js

@@ -11,7 +11,7 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
       width: 600, height: 720,
       tabs: []
@@ -27,7 +27,7 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
   async getData() {
     const formData = await super.getData();
     if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
-      mergeObject(formData,
+      foundry.utils.mergeObject(formData,
         {
           title: this.actor.token.name,
           token: {

module/actor/creature-sheet.js

@@ -9,7 +9,7 @@ export class RdDCreatureSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorSangSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorSangSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
       width: 640, height: 720
     });

module/actor/entite-sheet.js

@@ -6,7 +6,7 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorReveSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
       width: 640, height: 720,
     });

module/actor/entite.js

@@ -76,7 +76,7 @@ export class RdDEntite extends RdDBaseActorReve {
 
   async onAppliquerJetEncaissement(encaissement, attacker) {
     const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance);
-    mergeObject(encaissement, {
+    foundry.utils.mergeObject(encaissement, {
       resteEndurance: perteEndurance.newValue,
       endurance: perteEndurance.perte
     });

module/actor/vehicule-sheet.js

@@ -6,7 +6,7 @@ export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
       width: 640, height: 720,
     });
@@ -15,7 +15,7 @@ export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
   /* -------------------------------------------- */
   async getData() {
     let formData = await super.getData();
-    mergeObject(formData,
+    foundry.utils.mergeObject(formData,
       {
         editable: this.isEditable,
         cssClass: this.isEditable ? "editable" : "locked",

module/dialog-choix-xp-carac.js

@@ -2,8 +2,8 @@
 export class DialogChoixXpCarac extends Dialog {
 
   static async choix(actor, xpData, caracs) {
-    caracs = caracs.map(it => mergeObject({ ajout: 0 }, it))
+    caracs = caracs.map(it => foundry.utils.mergeObject({ ajout: 0 }, it))
-    xpData = mergeObject({ reste: xpData.xpCarac }, xpData)
+    xpData = foundry.utils.mergeObject({ reste: xpData.xpCarac }, xpData)
     const dialogData = {
       title: `Choisissez la répartition d'expérience`,
       content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-choix-xp-carac.hbs", {
@@ -24,7 +24,7 @@ export class DialogChoixXpCarac extends Dialog {
   }
 
   constructor(dialogData, dialogOptions, actor, xpData, caracs) {
-    dialogData = mergeObject(dialogData, {
+    dialogData = foundry.utils.mergeObject(dialogData, {
       default: 'appliquer',
       buttons: {
         'appliquer': { icon:'<i class="fa-solid fa-check"></i>', label: "Ajouter la répartition", callback: it => this.appliquerSelection() }

module/dialog-item-vente.js

@@ -56,7 +56,7 @@ export class DialogItemVente extends Dialog {
   }
 
   updateVente(update) {
-    mergeObject(this.venteData, update);
+    foundry.utils.mergeObject(this.venteData, update);
   }
 
   getChoixVente() {

module/item-competence.js

@@ -199,7 +199,7 @@ export class RdDItemCompetence extends Item {
     if (idOrName == undefined || idOrName == "") {
       return RdDItemCompetence.sansCompetence();
     }
-    options = mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false });
+    options = foundry.utils.mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false });
     return RdDItemCompetence.findFirstItem(list, idOrName, options);
   }
 

module/item-competencecreature.js

@@ -33,7 +33,7 @@ export class RdDItemCompetenceCreature extends Item {
     if (categorieAttaque != undefined) {
       // si c'est un Item compétence: cloner pour ne pas modifier la compétence
       let arme = item.clone();
-      mergeObject(arme,
+      foundry.utils.mergeObject(arme,
         {
           action: item.isCompetencePossession() ? 'possession' : 'attaque',
           system: {

module/item-sheet.js

@@ -39,7 +39,7 @@ export class RdDItemSheet extends ItemSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: [SYSTEM_RDD, "sheet", "item"],
       template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
       width: 550,

module/item/blessure.js

@@ -39,7 +39,7 @@ export class RdDItemBlessure extends RdDItem {
       ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
       return undefined;
     }
-    return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
+    return foundry.utils.mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
   }
 
   static async applyFullBlessure(actor, gravite) {
@@ -106,7 +106,7 @@ export class RdDItemBlessure extends RdDItem {
   }
 
   async setSoinsBlessure(systemUpdate = {}) {
-    systemUpdate = mergeObject(systemUpdate, this.system, { overwrite: false }),
+    systemUpdate = foundry.utils.mergeObject(systemUpdate, this.system, { overwrite: false }),
       systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
     await this.update({
       img: this.getImgSoins(systemUpdate.gravite, systemUpdate.soinscomplets.done),
@@ -134,14 +134,14 @@ export class RdDItemBlessure extends RdDItem {
       if (rolled.isETotal) {
         message.content += ` -- une blessure ${label} s'infecte (temps de guérison augmenté de ${gravite} jours, perte de vie)`;
         await actor.santeIncDec("vie", -1);
-        mergeObject(update, {
+        foundry.utils.mergeObject(update, {
           system: { fin: { indexDate: timestamp.addJours(gravite).indexDate } }
         });
       }
       else {
         if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) {
           message.content += ` -- une blessure ${label} cicatrise`;
-          mergeObject(update, {
+          foundry.utils.mergeObject(update, {
             system: {
               gravite: graviteMoindre,
               temporel: { fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }

module/item/sheet-base-inventaire.js

@@ -8,7 +8,7 @@ const TYPE_ITEMS_NATURELS = ["faune", "herbe", "plante", "ingredient"];
 export class RdDItemInventaireSheet extends RdDItemSheet {
 
   static get defaultOptions() {
-    return mergeObject(RdDItemSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDItemSheet.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
     });
   }
@@ -23,7 +23,7 @@ export class RdDItemInventaireSheet extends RdDItemSheet {
 
   async getData() {
     const formData = await super.getData();
-    return mergeObject(formData, {
+    return foundry.utils.mergeObject(formData, {
       milieux: await game.system.rdd.environnement.autresMilieux(this.item)
     });
   }

module/item/sheet-rencontre.js

@@ -6,7 +6,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
   static get ITEM_TYPE() { return "rencontre" };
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }]
     });
   }
@@ -24,7 +24,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
   /* -------------------------------------------- */
   async getData() {
     const formData = await super.getData();
-    mergeObject(formData, {
+    foundry.utils.mergeObject(formData, {
       effets: {
         succes: {
           liste: RdDRencontre.getEffetsSucces(),

module/migrations.js

@@ -189,7 +189,7 @@ class _10_2_5_ArmesTirLancer extends Migration {
   get version() { return "10.2.5"; }
 
   migrateArmeTirLancer(it) {
-    let updates = mergeObject({ _id: it.id }, this.getMapping(it).updates);
+    let updates = foundry.utils.mergeObject({ _id: it.id }, this.getMapping(it).updates);
     console.log(it.name, updates);
     return updates;
   }
@@ -364,7 +364,7 @@ class _10_4_6_ServicesEnCommerces extends Migration {
     const item = await RdDItem.getCorrespondingItem(serviceRefItem);
     const itemToCreate = {
       name: item.name, img: item.img, type: item.type,
-      system: mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
+      system: foundry.utils.mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
     };
     return itemToCreate;
   }

module/misc.js

@@ -200,7 +200,7 @@ export class Misc {
 
   /* -------------------------------------------- */
   static findFirstLike(value, elements, options = {}) {
-    options = mergeObject({
+    options = foundry.utils.mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',
@@ -225,7 +225,7 @@ export class Misc {
   }
 
   static findAllLike(value, elements, options = {}) {
-    options = mergeObject({
+    options = foundry.utils.mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',

module/rdd-combat.js

@@ -128,7 +128,7 @@ export class RdDCombatManager extends Combat {
 
       // Send a chat message
       let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
-      let messageData = mergeObject(
+      let messageData = foundry.utils.mergeObject(
         {
           speaker: {
             scene: canvas.scene._id,
@@ -885,7 +885,7 @@ export class RdDCombat {
 
     this.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
     if (essaisPrecedents) {
-      mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
+      foundry.utils.mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
     }
 
     // # utilisation esquive

module/rdd-confirm.js

@@ -14,10 +14,10 @@ export class RdDConfirm {
         "cancel": RdDConfirm._createButtonCancel()
       };
       if (options.settingConfirmer) {
-        buttons = mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
+        buttons = foundry.utils.mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
       }
       if (autresActions) {
-        buttons = mergeObject(autresActions, buttons);
+        buttons = foundry.utils.mergeObject(autresActions, buttons);
       }
       const dialogDetails = {
         title: options.title,

module/rdd-resolution-table.js

@@ -158,7 +158,7 @@ export class RdDResolutionTable {
   static _updateChancesFactor(chances, diviseur) {
     if (chances.level > -11 && diviseur && diviseur > 1) {
       let newScore = Math.floor(chances.score / diviseur);
-      mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
     }
   }
 
@@ -166,27 +166,27 @@ export class RdDResolutionTable {
   static _updateChancesWithBonus(chances, bonus, finalLevel) {
     if (bonus && finalLevel > -11) {
       let newScore = Number(chances.score) + bonus;
-      mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
     }
   }
 
   /* -------------------------------------------- */
   static significativeRequise(chances) {
     chances.roll = Math.floor(chances.score / 2);
-    mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
+    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
   }
 
   /* -------------------------------------------- */
   static succesRequis(chances) {
     chances.roll = chances.score;
-    mergeObject(chances, reussites.find(x => x.code == 'norm'), { overwrite: true });
+    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'norm'), { overwrite: true });
   }
 
   /* -------------------------------------------- */
   static async rollChances(chances, diviseur, forceDiceResult = -1) {
     chances.forceDiceResult = forceDiceResult <= 0 || forceDiceResult > 100 ? undefined : { total: forceDiceResult };
     chances.roll = await RdDDice.rollTotal("1d100", chances);
-    mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
+    foundry.utils.mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
     return chances;
   }
 

module/rdd-roll-resolution-table.js

@@ -38,7 +38,7 @@ export class RdDRollResolutionTable extends Dialog {
       diffLibre: 0,
       use: { conditions:true, libre:true }
     }
-    mergeObject(rollData, defRollData, { overwrite: false });
+    foundry.utils.mergeObject(rollData, defRollData, { overwrite: false });
     for (let i = 1; i < 21; i++) {
       const key = `${i}`;
       rollData.carac[key] = { type: "number", value: i, label: key }

module/rdd-roll.js

@@ -65,7 +65,7 @@ export class RdDRoll extends Dialog {
       defaultRollData.carac["reve-actuel"] = actor.system.reve.reve
     }
 
-    mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
+    foundry.utils.mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
     if (rollData.forceCarac) {
       rollData.carac = rollData.forceCarac;
     }

module/rdd-sheet-utility.js

@@ -16,7 +16,7 @@ export class RdDSheetUtility {
       isObserver: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
       isOwner: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
     }
-    mergeObject(options, newOptions);
+    foundry.utils.mergeObject(options, newOptions);
     return options;
   }
 

module/rdd-tmr-dialog.js

@@ -536,7 +536,7 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   _rollPresentCite(rencData) {
     let rolled = RdDResolutionTable.computeChances(rencData.reve, 0);
-    mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
+    foundry.utils.mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
     RdDResolutionTable.succesRequis(rolled);
     return rolled;
   }

module/rolldata-ajustements.js

@@ -166,7 +166,7 @@ export class RollDataAjustements {
   /* -------------------------------------------- */
   static calcul(rollData, actor) {
     // s'assurer de la correction des infos rollData
-    mergeObject(rollData, { ajustements: {}, use: {} }, { overwrite: false })
+    foundry.utils.mergeObject(rollData, { ajustements: {}, use: {} }, { overwrite: false })
 
     for (var key in referenceAjustements) {
       const reference = referenceAjustements[key];

module/settings/regles-optionnelles.js

@@ -71,7 +71,7 @@ export class ReglesOptionnelles extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    mergeObject(options, {
+    foundry.utils.mergeObject(options, {
       id: "regles-optionnelles",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/regles-optionnelles.html",
       height: 650,

module/settings/system-compendiums.js

@@ -27,7 +27,7 @@ export class SystemCompendiums extends FormApplication {
   static init() {
     Object.keys(CONFIGURABLE_COMPENDIUMS).forEach(compendium => {
       const definition = CONFIGURABLE_COMPENDIUMS[compendium];
-      mergeObject(definition, {
+      foundry.utils.mergeObject(definition, {
         compendium: compendium,
         default: SystemCompendiums._getDefaultCompendium(compendium),
         setting: SystemCompendiums._getSettingCompendium(compendium)
@@ -138,7 +138,7 @@ export class SystemCompendiums extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    mergeObject(options, {
+    foundry.utils.mergeObject(options, {
       id: "system-compendiums",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/system-compendiums.html",
       height: 'fit-content',
@@ -152,7 +152,7 @@ export class SystemCompendiums extends FormApplication {
 
   getData() {
     const systemCompendiums = Object.values(CONFIGURABLE_COMPENDIUMS)
-      .map(it => mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
+      .map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
     const availableCompendiums = game.packs.map(pack => {
       return {
         name: pack.collection,
@@ -160,7 +160,7 @@ export class SystemCompendiums extends FormApplication {
         type: pack.metadata.type
       }
     });
-    return mergeObject(super.getData(), {
+    return foundry.utils.mergeObject(super.getData(), {
       systemCompendiums: systemCompendiums,
       availableCompendiums: availableCompendiums
     });

module/sommeil/app-astrologie.js

@@ -17,7 +17,7 @@ export class AppAstrologie extends Application {
 
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/sommeil/app-astrologie.hbs",
       title: "Astrologie",
       width: 'fit-content',
@@ -37,7 +37,7 @@ export class AppAstrologie extends Application {
   getData(options) {
     this.appData = super.getData(options)
     const calendrier = game.system.rdd.calendrier;
-    mergeObject(this.appData, {
+    foundry.utils.mergeObject(this.appData, {
       isGM: game.user.isGM,
       isActor: this.actor != undefined,
       calendrier: calendrier.getTimestamp().toCalendrier(),

module/time/rdd-calendrier.js

@@ -35,7 +35,7 @@ export class RdDCalendrier extends Application {
   }
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       title: "Calendrier",
       template: TEMPLATE_CALENDRIER,
       classes: ["calendar"],
@@ -120,7 +120,7 @@ export class RdDCalendrier extends Application {
 
   /* -------------------------------------------- */
   fillCalendrierData(formData = {}) {
-    mergeObject(formData, this.timestamp.toCalendrier());
+    foundry.utils.mergeObject(formData, this.timestamp.toCalendrier());
     formData.isGM = game.user.isGM;
     formData.heures = RdDTimestamp.definitions()
     formData.horlogeAnalogique = this.horlogeAnalogique;

module/tirage/fenetre-recherche-tirage.js

@@ -117,7 +117,7 @@ function $loadFilters(parameters) {
 
 export class FenetreRechercheTirage extends Application {
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/tirage/fenetre-recherche-tirage.hbs",
       title: `Recherches et tirages`,
       width: 600,
@@ -147,7 +147,7 @@ export class FenetreRechercheTirage extends Application {
   }
 
   async getData() {
-    return mergeObject(await super.getData(), this.parameters)
+    return foundry.utils.mergeObject(await super.getData(), this.parameters)
   }
 
   _canDragStart() { return true; }
@@ -294,7 +294,7 @@ class FenetreRechercheConfiguration extends Dialog {
   static async create() {
     const configuration = {
       compendiums: game.packs.filter(it => it.metadata.type == 'Item').map(it => it.metadata)
-        .map(it => mergeObject({ selected: game.system.rdd.environnement.compendiums.includes(it.id) }, it))
+        .map(it => foundry.utils.mergeObject({ selected: game.system.rdd.environnement.compendiums.includes(it.id) }, it))
     }
     const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/tirage/fenetre-recherche-configuration.hbs", configuration);
     new FenetreRechercheConfiguration(html).render(true);

module/tmr/effets-rencontres.js

@@ -107,7 +107,7 @@ export class EffetsRencontre {
   }
 
   static rdd_part_tete = async (dialog, context) => {
-    mergeObject(context, {
+    foundry.utils.mergeObject(context, {
       tete: context.rolled.isPart,
       poesie: await Poetique.getExtrait()
     })
@@ -118,7 +118,7 @@ export class EffetsRencontre {
   }
 
   static rdd_echec_queue = async (dialog, context) => {
-    mergeObject(context, {
+    foundry.utils.mergeObject(context, {
       queues: [await context.actor.ajouterQueue()],
       poesie: await Poetique.getExtrait()
     })

module/voyage/dialog-fatigue-voyage.js

@@ -147,7 +147,7 @@ export class DialogFatigueVoyage extends Dialog {
         ChatMessage.create({
           whisper: ChatUtility.getWhisperRecipientsAndGMs(it.actor.name),
           content: await renderTemplate(
-            'systems/foundryvtt-reve-de-dragon/templates/voyage/chat-fatigue_voyage.hbs', mergeObject(it,
+            'systems/foundryvtt-reve-de-dragon/templates/voyage/chat-fatigue_voyage.hbs', foundry.utils.mergeObject(it,
               {
                 parameters: this.parameters,
                 fatigueBase: fatigueBase,

system.json

@@ -528,8 +528,10 @@
     }
   ],
   "socket": true,
-  "gridDistance": 1,
+  "grid": {
-  "gridUnits": "m",
+    "distance": 1,
+    "units": "m"
+  },
   "primaryTokenAttribute": "sante.vie",
   "secondaryTokenAttribute": "sante.endurance",
   "media": [