Hawkmoon : Foundry v13 migraton

modules/hawkmoon-actor-sheet.js

@@ -7,7 +7,7 @@ import { HawkmoonUtility } from "./hawkmoon-utility.js";
 import { HawkmoonAutomation } from "./hawkmoon-automation.js";
 
 /* -------------------------------------------- */
-export class HawkmoonActorSheet extends ActorSheet {
+export class HawkmoonActorSheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
@@ -25,7 +25,7 @@ export class HawkmoonActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = foundry.utils.duplicate(this.object)    
+    const objectData = foundry.utils.duplicate(this.object)
 
     let formData = {
       title: this.title,
@@ -47,7 +47,7 @@ export class HawkmoonActorSheet extends ActorSheet {
       mutations: foundry.utils.duplicate(this.actor.getMutations() || []),
       talentsCell: this.getCelluleTalents(),
       profils: foundry.utils.duplicate(this.actor.getProfils()  || []),
-      combat: this.actor.getCombatValues(),      
+      combat: this.actor.getCombatValues(),
       equipements: foundry.utils.duplicate(this.actor.getEquipments()),
       artefacts: foundry.utils.duplicate(this.actor.getArtefacts()),
       richesse: this.actor.computeRichesse(),
@@ -56,8 +56,8 @@ export class HawkmoonActorSheet extends ActorSheet {
       nbCombativite: this.actor.system.sante.nbcombativite,
       combativiteList: HawkmoonUtility.getCombativiteList(this.actor.system.sante.nbcombativite),
       initiative: this.actor.getFlag("world", "last-initiative") || -1,
-      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
-      habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, {async: true}),
+      habitat: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.habitat, {async: true}),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -91,14 +91,14 @@ export class HawkmoonActorSheet extends ActorSheet {
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
-    
+
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item")
       let itemId = li.data("item-id")
       const item = this.actor.items.get( itemId )
       item.sheet.render(true)
-    })      
+    })
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
@@ -120,7 +120,7 @@ export class HawkmoonActorSheet extends ActorSheet {
       let value = Number($(event.currentTarget).data("adversite-value"))
       this.actor.incDecAdversite(adv, value)
     })
-    
+
     html.find('.quantity-modify').click(event => {
       const li = $(event.currentTarget).parents(".item")
       const value = Number($(event.currentTarget).data("quantite-value"))
@@ -130,7 +130,7 @@ export class HawkmoonActorSheet extends ActorSheet {
     html.find('.roll-initiative').click((event) => {
       this.actor.rollAttribut("adr", true)
     })
-    
+
     html.find('.roll-attribut').click((event) => {
       const li = $(event.currentTarget).parents(".item")
       let attrKey = li.data("attr-key")
@@ -147,7 +147,7 @@ export class HawkmoonActorSheet extends ActorSheet {
       let armeId  = li.data("item-id")
       this.actor.rollArmeOffensif(armeId)
     })
-    
+
     html.find('.roll-assommer').click((event) => {
       this.actor.rollAssommer()
     })
@@ -163,30 +163,30 @@ export class HawkmoonActorSheet extends ActorSheet {
     html.find('.roll-desengager').click((event) => {
       this.actor.rollDesengager()
     })
-    
+
     html.find('.roll-arme-degats').click((event) => {
       const li = $(event.currentTarget).parents(".item")
       let armeId  = li.data("item-id")
       this.actor.rollArmeDegats(armeId)
     })
-    
+
     html.find('.item-add').click((event) => {
       const itemType = $(event.currentTarget).data("type")
       this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true })
     })
-    
+
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
       this.render(true);
-    });    
+    });
     html.find('.item-equip').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       this.actor.equipItem( li.data("item-id") );
-      this.render(true);      
+      this.render(true);
     });
 
   }
-  
+
   /* -------------------------------------------- */
   /** @override */
   setPosition(options = {}) {

modules/hawkmoon-actor.js

@@ -17,8 +17,8 @@ export class HawkmoonActor extends Actor {
   /**
    * Override the create() function to provide additional SoS functionality.
    *
-   * This overrided create() function adds initial items 
-   * Namely: Basic skills, money, 
+   * This overrided create() function adds initial items
+   * Namely: Basic skills, money,
    *
    * @param {Object} data        Barebones actor data which this function adds onto.
    * @param {Object} options     (Unused) Additional options which customize the creation workflow.

modules/hawkmoon-cellule-sheet.js

@@ -10,7 +10,7 @@ import { HawkmoonAutomation } from "./hawkmoon-automation.js";
 const __ALLOWED_ITEM_CELLULE = { "talent": 1, "ressource": 1, "contact": 1, "equipement": 1, "protection": 1, "artefact": 1, "arme": 1, "monnaie": 1 }
 
 /* -------------------------------------------- */
-export class HawkmoonCelluleSheet extends ActorSheet {
+export class HawkmoonCelluleSheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
@@ -95,7 +95,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       let actorId = li.data("actor-id")
       this.actor.removeMember(actorId)
     })
-    
+
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item")
@@ -136,7 +136,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
   /* -------------------------------------------- */
   async _onDropActor(event, dragData) {
     const actor = fromUuidSync(dragData.uuid)
-    if (actor) { 
+    if (actor) {
       this.actor.addMember(actor.id)
     } else {
       ui.notifications.warn("Cet acteur n'a pas été trouvé.")

modules/hawkmoon-hud.js

@@ -22,7 +22,7 @@ export class HawkmoonTokenHud {
 
     const hudData = { actor: actor }
 
-    const controlIconActions = html.find('.control-icon[data-action=combat]');
+    const controlIconActions = $(html).find('.control-icon[data-action=combat]');
     // initiative
     await HawkmoonTokenHud._configureSubMenu(controlIconActions, 'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.html', hudData,
       (event) => {
@@ -34,7 +34,7 @@ export class HawkmoonTokenHud {
 
   /* -------------------------------------------- */
   static async addTokenHudExtensions(app, html, tokenId) {
-    const controlIconCombat  = html.find('.control-icon[data-action=combat]')
+    const controlIconCombat  = $(html).find('.control-icon[data-action=combat]')
     if (controlIconCombat.length>0 ) {
       HawkmoonTokenHud.addExtensionHud(app, html, tokenId);
     }
@@ -42,11 +42,11 @@ export class HawkmoonTokenHud {
 
   /* -------------------------------------------- */
   static async _configureSubMenu(insertionPoint, template, hudData, onMenuItem) {
-    const hud = $(await renderTemplate(template, hudData))
+    const hud = $(await foundry.applications.handlebars.renderTemplate(template, hudData))
     const list = hud.find('div.hawkmoon-hud-list')
-    
+
     HawkmoonTokenHud._toggleHudListActive(hud, list);
-    
+
     hud.find('img.hawkmoon-hud-togglebutton').click(event => HawkmoonTokenHud._toggleHudListActive(hud, list));
     list.find('.hawkmoon-hud-adversite').click(onMenuItem);
 

modules/hawkmoon-item-sheet.js

@@ -4,7 +4,7 @@ import { HawkmoonUtility } from "./hawkmoon-utility.js";
  * Extend the basic ItemSheet with some very simple modifications
  * @extends {ItemSheet}
  */
-export class HawkmoonItemSheet extends ItemSheet {
+export class HawkmoonItemSheet extends foundry.appv1.sheets.ItemSheet {
 
   /** @override */
   static get defaultOptions() {
@@ -145,7 +145,7 @@ export class HawkmoonItemSheet extends ItemSheet {
       pred[index].description = ev.currentTarget.value
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })    
+    })
     html.find('.predilection-acquise').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
@@ -153,7 +153,7 @@ export class HawkmoonItemSheet extends ItemSheet {
       pred[index].acquise = ev.currentTarget.checked
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })          
+    })
     html.find('.predilection-maitrise').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
@@ -161,7 +161,7 @@ export class HawkmoonItemSheet extends ItemSheet {
       pred[index].maitrise = ev.currentTarget.checked
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })      
+    })
     html.find('.predilection-used').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
@@ -169,11 +169,11 @@ export class HawkmoonItemSheet extends ItemSheet {
       pred[index].used = ev.currentTarget.checked
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })    
-    
+    })
+
     html.find('#add-predilection').click(ev => {
       let pred = foundry.utils.duplicate(this.object.system.predilections)
-      pred.push( { name: "Nouvelle prédilection", id: randomID(16), used: false }) 
+      pred.push( { name: "Nouvelle prédilection", id: randomID(16), used: false })
       this.object.update( { 'system.predilections': pred })
     })
     html.find('.delete-prediction').click(ev => {
@@ -186,7 +186,7 @@ export class HawkmoonItemSheet extends ItemSheet {
 
     html.find('#add-automation').click(ev => {
       let autom = foundry.utils.duplicate(this.object.system.automations)
-      autom.push( { eventtype: "on-drop", name: "Automatisation 1", bonusname: "vigueur", bonus: 0, competence: "", minLevel: 0, baCost: 0, id: randomID(16) }) 
+      autom.push( { eventtype: "on-drop", name: "Automatisation 1", bonusname: "vigueur", bonus: 0, competence: "", minLevel: 0, baCost: 0, id: randomID(16) })
       this.object.update( { 'system.automations': autom })
     })
     html.find('.delete-automation').click(ev => {
@@ -203,8 +203,8 @@ export class HawkmoonItemSheet extends ItemSheet {
       auto[index][field] = ev.currentTarget.value
       auto[index].id = auto[index].id || randomID(16)
       this.object.update( { 'system.automations': auto })
-    })    
-    
+    })
+
     // Update Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");

modules/hawkmoon-main.js

@@ -33,7 +33,7 @@ Hooks.once("init", async function () {
   HawkmoonUtility.preloadHandlebarsTemplates()
 
   /* -------------------------------------------- */
-  // Set an initiative formula for the system 
+  // Set an initiative formula for the system
   CONFIG.Combat.initiative = {
     formula: "1d10",
     decimals: 1
@@ -56,14 +56,14 @@ Hooks.once("init", async function () {
   }
 
   /* -------------------------------------------- */
-  // Register sheet application classes
-  Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonActorSheet, { types: ["personnage"], makeDefault: true })
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCreatureSheet, { types: ["creature"], makeDefault: true })
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCelluleSheet, { types: ["cellule"], makeDefault: true });
+  // Regster sheet application classes
+  foundry.documents.collections.Actors.unregisterSheet("core", foundry.appv1.sheets.ActorSheet);
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonActorSheet, { types: ["personnage"], makeDefault: true })
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCreatureSheet, { types: ["creature"], makeDefault: true })
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCelluleSheet, { types: ["cellule"], makeDefault: true });
 
-  Items.unregisterSheet("core", ItemSheet);
-  Items.registerSheet("fvtt-hawkmoon-cyd", HawkmoonItemSheet, { makeDefault: true })
+  foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", HawkmoonItemSheet, { makeDefault: true })
 
   HawkmoonUtility.init()
   HawkmoonAutomation.init()
@@ -92,7 +92,7 @@ async function importDefaultScene() {
     let newDocuments = scenes.filter(i => i.name == "Accueil");
     if (newDocuments) {
       await game.scenes.documentClass.create(newDocuments);
-      game.scenes.find(i => i.name == "Accueil").activate();  
+      game.scenes.find(i => i.name == "Accueil").activate();
     }
   }
 }
@@ -119,7 +119,7 @@ Hooks.once("ready", function () {
   }).catch(err=>
     console.log("No stats available, giving up.")
   )
-  
+
   importDefaultScene()
   welcomeMessage()
 
@@ -138,4 +138,3 @@ Hooks.on("chatMessage", (html, content, msg) => {
   }
   return true;
 });
-

modules/hawkmoon-roll-dialog.js

@@ -6,7 +6,7 @@ export class HawkmoonRollDialog extends Dialog {
   static async create(actor, rollData ) {
 
     let options = { classes: ["HawkmoonDialog"], width: 320, height: 'fit-content', 'z-index': 99999 };
-    let html = await renderTemplate('systems/fvtt-hawkmoon-cyd/templates/roll-dialog-generic.html', rollData);
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-hawkmoon-cyd/templates/roll-dialog-generic.html', rollData);
 
     return new HawkmoonRollDialog(actor, rollData, html, options );
   }
@@ -16,16 +16,16 @@ export class HawkmoonRollDialog extends Dialog {
     let conf = {
       title: "Test de Capacité",
       content: html,
-      buttons: { 
+      buttons: {
         rolld10: {
             icon: '<i class="fas fa-check"></i>',
             label: "Lancer 1d10",
-            callback: () => { this.roll("d10") } 
+            callback: () => { this.roll("d10") }
           },
           rolld20: {
             icon: '<i class="fas fa-check"></i>',
             label: "Lancer 1d20",
-            callback: () => { this.roll("d20") } 
+            callback: () => { this.roll("d20") }
           },
           cancel: {
             icon: '<i class="fas fa-times"></i>',
@@ -56,7 +56,7 @@ export class HawkmoonRollDialog extends Dialog {
     function onLoad() {
     }
     $(function () { onLoad(); });
-    
+
     html.find('#modificateur').change(async (event) =>  {
       this.rollData.modificateur = Number(event.currentTarget.value)
     })
@@ -66,77 +66,77 @@ export class HawkmoonRollDialog extends Dialog {
     })
     html.find('#attrKey').change(async (event) =>  {
       this.rollData.attrKey = String(event.currentTarget.value)
-    })    
+    })
     html.find('#attrKey2').change(async (event) =>  {
       this.rollData.attrKey2 = String(event.currentTarget.value)
-    })    
+    })
     html.find('#select-maitrise').change(async (event) =>  {
       this.rollData.maitriseId = String(event.currentTarget.value)
     })
     html.find('#competence-talents').change((event) => {
-      this.rollData.selectedTalents = $('#competence-talents').val()      
+      this.rollData.selectedTalents = $('#competence-talents').val()
     })
     html.find('#taille-cible').change((event) => {
-      this.rollData.tailleCible = String(event.currentTarget.value)      
+      this.rollData.tailleCible = String(event.currentTarget.value)
     })
     html.find('#tireur-deplacement').change((event) => {
-      this.rollData.tireurDeplacement = String(event.currentTarget.value)      
+      this.rollData.tireurDeplacement = String(event.currentTarget.value)
     })
     html.find('#cible-couvert').change((event) => {
-      this.rollData.cibleCouvert = String(event.currentTarget.value)      
+      this.rollData.cibleCouvert = String(event.currentTarget.value)
     })
     html.find('#distance-tir').change((event) => {
-      this.rollData.distanceTir = String(event.currentTarget.value)      
+      this.rollData.distanceTir = String(event.currentTarget.value)
     })
     html.find('#bonus-malus-context').change((event) => {
-      this.rollData.bonusMalusContext = Number(event.currentTarget.value)      
+      this.rollData.bonusMalusContext = Number(event.currentTarget.value)
     })
     html.find('#defenseur-au-sol').change((event) => {
-      this.rollData.defenseurAuSol = event.currentTarget.checked      
+      this.rollData.defenseurAuSol = event.currentTarget.checked
     })
     html.find('#ambidextre-1').change((event) => {
-      this.rollData.ambidextre1 = event.currentTarget.checked      
+      this.rollData.ambidextre1 = event.currentTarget.checked
     })
     html.find('#ambidextre-2').change((event) => {
       this.rollData.ambidextre2 = event.currentTarget.checked
     })
     html.find('#attaque-monte').change((event) => {
       this.rollData.attqueMonte = event.currentTarget.checked
-    })  
+    })
     html.find('#defenseur-aveugle').change((event) => {
-      this.rollData.defenseurAveugle = event.currentTarget.checked      
+      this.rollData.defenseurAveugle = event.currentTarget.checked
     })
     html.find('#defenseur-de-dos').change((event) => {
-      this.rollData.defenseurDeDos = event.currentTarget.checked      
+      this.rollData.defenseurDeDos = event.currentTarget.checked
     })
     html.find('#defenseur-restreint').change((event) => {
-      this.rollData.defenseurRestreint = event.currentTarget.checked      
+      this.rollData.defenseurRestreint = event.currentTarget.checked
     })
     html.find('#defenseur-immobilise').change((event) => {
-      this.rollData.defenseurImmobilise = event.currentTarget.checked      
+      this.rollData.defenseurImmobilise = event.currentTarget.checked
     })
     html.find('#attaque-charge').change((event) => {
-      this.rollData.attaqueCharge = event.currentTarget.checked      
+      this.rollData.attaqueCharge = event.currentTarget.checked
     })
     html.find('#charge-cavalerie').change((event) => {
-      this.rollData.chargeCavalerie = event.currentTarget.checked      
+      this.rollData.chargeCavalerie = event.currentTarget.checked
     })
     html.find('#attaquants-multiple').change((event) => {
-      this.rollData.attaquantsMultiples = event.currentTarget.checked      
+      this.rollData.attaquantsMultiples = event.currentTarget.checked
     })
     html.find('#soutiens').change((event) => {
-      this.rollData.soutiens = Number(event.currentTarget.value)     
+      this.rollData.soutiens = Number(event.currentTarget.value)
     })
     html.find('#feinte').change((event) => {
-      this.rollData.feinte = event.currentTarget.checked    
+      this.rollData.feinte = event.currentTarget.checked
     })
     html.find('#contenir').change((event) => {
-      this.rollData.contenir = event.currentTarget.checked      
+      this.rollData.contenir = event.currentTarget.checked
     })
     html.find('#attaque-desarme').change((event) => {
-      this.rollData.attaqueDesarme = event.currentTarget.checked      
+      this.rollData.attaqueDesarme = event.currentTarget.checked
     })
-    
+
 
   }
 }

modules/hawkmoon-utility.js

@@ -15,8 +15,7 @@ export class HawkmoonUtility {
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => HawkmoonUtility.chatListeners(html))
-    Hooks.on("getChatLogEntryContext", (html, options) => HawkmoonUtility.chatRollMenu(html, options))
-
+    Hooks.on("getChatMessageContextOptions", (html, options) => HawkmoonUtility.chatRollMenu(html, options))
     Hooks.on("getCombatTrackerEntryContext", (html, options) => {
       HawkmoonUtility.pushInitiativeOptions(html, options);
     })
@@ -155,7 +154,7 @@ export class HawkmoonUtility {
   /* -------------------------------------------- */
   static async chatListeners(html) {
 
-    html.on("click", '.predilection-reroll', async event => {
+    $(html).on("click", '.predilection-reroll', async event => {
       let predIdx = $(event.currentTarget).data("predilection-index")
       let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
@@ -166,14 +165,14 @@ export class HawkmoonUtility {
       HawkmoonUtility.rollHawkmoon(rollData)
     })
 
-    html.on("click", '.roll-chat-degat', async event => {
+    $(html).on("click", '.roll-chat-degat', async event => {
       let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "hawkmoon-roll")
       let actor = HawkmoonUtility.getActorFromRollData(rollData)
       actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
     })
-    html.on("click", '.roll-chat-degat-devastateur', async event => {
+    $(html).on("click", '.roll-chat-degat-devastateur', async event => {
       let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "hawkmoon-roll")
@@ -181,7 +180,7 @@ export class HawkmoonUtility {
       rollData.applyCoupDevastateur = true
       actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
     })
-    
+
   }
 
   /* -------------------------------------------- */
@@ -196,7 +195,7 @@ export class HawkmoonUtility {
       'systems/fvtt-hawkmoon-cyd/templates/partial-automation.html',
       'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.html',
     ]
-    return loadTemplates(templatePaths);
+    return foundry.applications.handlebars.loadTemplates(templatePaths);
   }
 
   /* -------------------------------------------- */
@@ -365,7 +364,7 @@ export class HawkmoonUtility {
   }
   /* -------------------------------------------- */
   static applyCombativite(rollData, value) {
-    if (game.user.isGM) {     
+    if (game.user.isGM) {
       let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
       defender.changeEtatCombativite(value)
     } else {
@@ -399,7 +398,7 @@ export class HawkmoonUtility {
       rollData.predilections = foundry.utils.duplicate(rollData.competence.system.predilections || [])
       let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
       rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.system.niveau}+${rollData.modificateur}+${compmod}`
-      
+
       if (rollData.selectedTalents && rollData.selectedTalents.length > 0) {
         for (let id of rollData.selectedTalents) {
           let talent = rollData.talents.find(t => t._id == id)
@@ -423,7 +422,7 @@ export class HawkmoonUtility {
     } else {
       rollData.diceFormula += `+${rollData.attr.value}*${rollData.multiplier}+${rollData.modificateur}+${rollData.bonusMalusContext}`
     }
-    
+
     // Bonus arme naturelle en défense
     if (rollData.bonusArmeNaturelle) {
       rollData.diceFormula += `+${rollData.bonusArmeNaturelle}`
@@ -469,16 +468,16 @@ export class HawkmoonUtility {
     if (rollData.attaqueDesarme) {
       rollData.difficulte += 10
     }
-        
+
     // Ajout adversités
     rollData.diceFormula += `-${rollData.nbAdversites}`
 
     if (rollData.arme && rollData.arme.type == "arme") {
       rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}`
     }
-    
+
     // Gestion de la feinte éventuelle
-    rollData.nbCombativitePerdu = 1 
+    rollData.nbCombativitePerdu = 1
 
     let myRoll = await new Roll(rollData.diceFormula).roll()
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
@@ -500,7 +499,7 @@ export class HawkmoonUtility {
     }
 
     this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
     }, rollData)
 
     if ( (rollData.coupBas || rollData.arme) && rollData.isSuccess && rollData.defenderTokenId) {
@@ -696,7 +695,7 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static applyBonneAventureRoll(li, changed, addedBonus) {
-    let msgId = li.data("message-id")
+    let msgId = $(li).data("message-id")
     let msg = game.messages.get(msgId)
     if (msg) {
       let rollData = msg.getFlag("world", "hawkmoon-roll")
@@ -715,7 +714,7 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static applyEclatRoll(li, changed, addedBonus) {
-    let msgId = li.data("message-id")
+    let msgId = $(li).data("message-id")
     let msg = game.messages.get(msgId)
     if (msg) {
       let rollData = msg.getFlag("world", "hawkmoon-roll")
@@ -736,13 +735,13 @@ export class HawkmoonUtility {
   static chatRollMenu(html, options) {
     let canApply = li => canvas.tokens.controlled.length && li.find(".hawkmoon-roll").length
     let canApplyBA = function (li) {
-      let message = game.messages.get(li.attr("data-message-id"))
+      let message = game.messages.get($(li).attr("data-message-id"))
       let rollData = message.getFlag("world", "hawkmoon-roll")
       let actor = HawkmoonUtility.getActorFromRollData(rollData)
       return (!rollData.isReroll && actor.getBonneAventure() > 0)
     }
     let canApplyPE = function (li) {
-      let message = game.messages.get(li.attr("data-message-id"))
+      let message = game.messages.get($(li).attr("data-message-id"))
       let rollData = message.getFlag("world", "hawkmoon-roll")
       let actor = HawkmoonUtility.getActorFromRollData(rollData)
       return (!rollData.isReroll && actor.getEclat() > 0)
@@ -768,7 +767,7 @@ export class HawkmoonUtility {
         name: "Relancer le dé (1 point d'Eclat)",
         icon: "<i class='fas fa-user-plus'></i>",
         condition: canApply && canApplyPE,
-        callback: li => HawkmoonUtility.applyEclatRoll(li, -3, "reroll")
+        callback: li => HawkmoonUtility.applyEclatRoll(li, -1, "reroll")
       }
     )
     return options