Correction sur talent Dragon

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() {
@@ -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,

modules/hawkmoon-actor.js

@@ -67,6 +67,10 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   prepareArme(arme) {
+    if (this.type == "cellule") {
+      return arme
+    }
+
     arme = foundry.utils.duplicate(arme)
     let combat = this.getCombatValues()
     if (arme.system.typearme == "contact" || arme.system.typearme == "contactjet") {
@@ -202,6 +206,20 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   getCombatValues() {
+    if (this.type == "cellule") {
+      return {
+        initBase: 0,
+        initTotal: 0,
+        bonusDegats: 0,
+        bonusDegatsTotal: 0,
+        vitesseBase: 0,
+        vitesseTotal: 0,
+        defenseBase: 0,
+        protection: 0,
+        defenseTotal: 0
+      }
+    }
+
     let combat = {
       initBase: this.system.attributs.adr.value,
       initTotal: this.system.attributs.adr.value + this.system.combat.initbonus,
@@ -406,7 +424,7 @@ export class HawkmoonActor extends Actor {
     if (sante.etat == this.system.sante.nbcombativite) {
       ChatMessage.create({ content: `<strong>${this.name} est vaincu !</strong>` })
     }
-    this.processCombativite(sante)
+    // Duplicated ! this.processCombativite(sante)
   }
 
   /* -------------------------------------------- */
@@ -525,6 +543,23 @@ export class HawkmoonActor extends Actor {
     return init || -1
   }
 
+  /* -------------------------------------------- */
+  getBestAttackValue() {
+    let attackList = this.items.filter(item => (item.type == "arme" || item.type == "talent") && item.system.equipped)
+    let maxOff = 0
+    let bestArme
+    for (let arme of attackList) {
+      if (arme.type == "arme") {
+        arme = this.prepareArme(arme)
+      }
+      if (arme.system.totalOffensif > maxOff) {
+        maxOff = arme.system.totalOffensif
+        bestArme = foundry.utils.duplicate(arme)
+      }
+    }
+    return bestArme
+  }
+
   /* -------------------------------------------- */
   getBestDefenseValue() {
     let defenseList = this.items.filter(item => (item.type == "arme") && item.system.equipped)

modules/hawkmoon-cellule-sheet.js

@@ -7,10 +7,10 @@ import { HawkmoonUtility } from "./hawkmoon-utility.js";
 import { HawkmoonAutomation } from "./hawkmoon-automation.js";
 
 /* -------------------------------------------- */
-const __ALLOWED_ITEM_CELLULE = { "talent": 1, "ressource": 1, "contact": 1}
+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() {
@@ -45,6 +45,13 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       ressources: foundry.utils.duplicate(this.actor.getRessources()),
       contacts: foundry.utils.duplicate(this.actor.getContacts()),
       members: this.getMembers(),
+      equipements: foundry.utils.duplicate(this.actor.getEquipments()),
+      artefacts: foundry.utils.duplicate(this.actor.getArtefacts()),
+      armes: foundry.utils.duplicate(this.actor.getWeapons()),
+      monnaies: foundry.utils.duplicate(this.actor.getMonnaies()),
+      protections: foundry.utils.duplicate(this.actor.getArmors()),
+      richesse: this.actor.computeRichesse(),
+      valeurEquipement: this.actor.computeValeurEquipement(),
       description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
       options: this.options,
       owner: this.document.isOwner,
@@ -110,15 +117,15 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       let value = ev.currentTarget.value
       this.actor.editItemField(itemId, itemType, itemField, dataType, value)
     })
-
-    html.find('.quantity-minus').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      this.actor.incDecQuantity(li.data("item-id"), -1);
-    });
-    html.find('.quantity-plus').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      this.actor.incDecQuantity(li.data("item-id"), +1);
-    });
+    html.find('.quantity-modify').click(event => {
+      const li = $(event.currentTarget).parents(".item")
+      const value = Number($(event.currentTarget).data("quantite-value"))
+      this.actor.incDecQuantity( li.data("item-id"), value );
+    })
+    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;
@@ -149,7 +156,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       super._onDropItem(event, dragData)
       return
     }
-    ui.notifications("Ce type d'item n'est pas autorisé sur une Cellule.")
+    ui.notification.info("Ce type d'item n'est pas autorisé sur une Cellule.")
   }
 
 

modules/hawkmoon-config.js

@@ -3,10 +3,30 @@ export const HAWKMOON_CONFIG = {
   optionsDifficulte: [
     { key: "0", label: "Aucune/Inconnue" },
     { key: "5", label: "Facile (5)" },
+    { key: "6", label: "(6)" },
+    { key: "7", label: "(7)" },
+    { key: "8", label: "(8)" },
+    { key: "9", label: "(9)" },
     { key: "10", label: "Moyenne (10)" },
+    { key: "11", label: "(11)" },
+    { key: "12", label: "(12)" },
+    { key: "13", label: "(13)" },
+    { key: "14", label: "(14)" },
     { key: "15", label: "Ardue (15)" },
+    { key: "16", label: "(16)" },
+    { key: "17", label: "(17)" },
+    { key: "18", label: "(18)" },
+    { key: "19", label: "(19)" },
     { key: "20", label: "Hasardeuse (20)" },
+    { key: "21", label: "(21)" },
+    { key: "22", label: "(22)" },
+    { key: "23", label: "(23)" },
+    { key: "24", label: "(24)" },
     { key: "25", label: "Insensée (25)" },
+    { key: "26", label: "(26)" },
+    { key: "27", label: "(27)" },
+    { key: "28", label: "(28)" },
+    { key: "29", label: "(29)" },
     { key: "30", label: "Pure Folie (30)" }
   ],
   optionsDistanceTir: [
@@ -15,6 +35,12 @@ export const HAWKMOON_CONFIG = {
     { key: "porteelongue", label: "Longue ({protectionDefenseur}+14)" }
   ],
   optionsBonusMalus: [
+    { key: "-10", label: "-10" },
+    { key: "-9", label: "-9" },
+    { key: "-8", label: "-8" },
+    { key: "-7", label: "-7" },
+    { key: "-6", label: "-6" },
+    { key: "-5", label: "-5" },
     { key: "-4", label: "-4" },
     { key: "-3", label: "-3" },
     { key: "-2", label: "-2" },
@@ -23,7 +49,13 @@ export const HAWKMOON_CONFIG = {
     { key: "1", label: "+1" },
     { key: "2", label: "+2" },
     { key: "3", label: "+3" },
-    { key: "4", label: "+4" }
+    { key: "4", label: "+4" },
+    { key: "5", label: "+5" },
+    { key: "6", label: "+6" },
+    { key: "7", label: "+7" },
+    { key: "8", label: "+8" },
+    { key: "9", label: "+9" },
+    { key: "10", label: "+10" }
   ],
   optionsTailleCible: [
     { key: "normal", label: "Normal (SD+0)" },

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,7 +42,7 @@ 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);

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() {

modules/hawkmoon-main.js

@@ -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()
@@ -138,4 +138,3 @@ Hooks.on("chatMessage", (html, content, msg) => {
   }
   return true;
 });
-

modules/hawkmoon-roll-dialog.js

@@ -3,12 +3,12 @@ import { HawkmoonUtility } from "./hawkmoon-utility.js";
 export class HawkmoonRollDialog extends Dialog {
 
   /* -------------------------------------------- */
-  static async create(actor, rollData ) {
+  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 options = { classes: ["HawkmoonDialog"], width: 420, height: 'fit-content', 'z-index': 99999 };
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-hawkmoon-cyd/templates/roll-dialog-generic.html', rollData);
 
-    return new HawkmoonRollDialog(actor, rollData, html, options );
+    return new HawkmoonRollDialog(actor, rollData, html, options);
   }
 
   /* -------------------------------------------- */
@@ -31,7 +31,8 @@ export class HawkmoonRollDialog extends Dialog {
           icon: '<i class="fas fa-times"></i>',
           label: "Annuler",
           callback: () => { this.close() }
-        } },
+        }
+      },
       close: close
     }
 
@@ -42,9 +43,9 @@ export class HawkmoonRollDialog extends Dialog {
   }
 
   /* -------------------------------------------- */
-  roll ( dice) {
+  roll(dice) {
     this.rollData.mainDice = dice
-    HawkmoonUtility.rollHawkmoon( this.rollData )
+    HawkmoonUtility.rollHawkmoon(this.rollData)
   }
 
 
@@ -60,7 +61,7 @@ export class HawkmoonRollDialog extends Dialog {
     html.find('#modificateur').change(async (event) => {
       this.rollData.modificateur = Number(event.currentTarget.value)
     })
-    html.find('#difficulte').change( (event) =>  {
+    html.find('#difficulte').change((event) => {
       console.log("Difficulte: " + event.currentTarget.value)
       this.rollData.difficulte = Number(event.currentTarget.value)
     })

modules/hawkmoon-utility.js

@@ -3,10 +3,10 @@ import { HawkmoonCombat } from "./hawkmoon-combat.js";
 import { HawkmoonCommands } from "./hawkmoon-commands.js";
 
 /* -------------------------------------------- */
-const __distanceDifficulte = { "porteecourte": 5, "porteemoyenne": 9, "porteelongue": 14}
-const __tireurDeplacement = { immobile: 0, lent: 3, rapide: 5}
-const __cibleCouvert = { aucun: 0, leger: 5, complet: 10}
-const __tailleCible = { normal: 0, main: 10, enfant: 3, maison: -10}
+const __distanceDifficulte = { "porteecourte": 5, "porteemoyenne": 9, "porteelongue": 14 }
+const __tireurDeplacement = { immobile: 0, lent: 3, rapide: 5 }
+const __cibleCouvert = { aucun: 0, leger: 5, complet: 10 }
+const __tailleCible = { normal: 0, main: 10, enfant: 3, maison: -10 }
 
 /* -------------------------------------------- */
 export class HawkmoonUtility {
@@ -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);
     })
@@ -131,7 +130,7 @@ export class HawkmoonUtility {
   static createArrayOptionList(min, max) {
     let options = [];
     for (let i = min; i <= max; i++) {
-      options.push({key:`${i}`, label:`${i}`});
+      options.push({ key: `${i}`, label: `${i}` });
     }
     return 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")
@@ -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);
   }
 
   /* -------------------------------------------- */
@@ -279,9 +278,13 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static onSocketMesssage(msg) {
-    if (msg.name == "msg_apply_combativite") {
-      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+    if (msg.msg == "msg_apply_combativite") {
+      let defender = game.canvas.tokens.get(msg.data.defenderTokenId)?.actor
+      if (defender) {
         defender.changeEtatCombativite(msg.data.value)
+      } else {
+        console.warn("HawkmoonUtility.onSocketMesssage : Impossible de trouver le token pour appliquer la combativité", msg.defenderTokenId)
+      }
     }
   }
 
@@ -315,10 +318,10 @@ export class HawkmoonUtility {
         switch (rollMode) {
           case "blindroll": //GM only
             blind = true;
-          case "gmroll": //GM + rolling player
+          case "gmroll": // GM + rolling player
             whisper = this.getUsers(user => user.isGM);
             break;
-          case "roll": //everybody
+          case "roll": // everybody
             whisper = this.getUsers(user => user.active);
             break;
           case "selfroll":
@@ -355,14 +358,19 @@ export class HawkmoonUtility {
       }
     }
 
-    //console.log("Result : ", rollData)
+    //console.log("Result : ", rollData
+    this.computeResultQuality(rollData)
+  }
+
+  /* -------------------------------------------- */
+  static computeResultQuality(rollData) {
     if (rollData.difficulte > 0 && !rollData.isDramatique) {
       rollData.isSuccess = (rollData.finalResult >= rollData.difficulte)
       rollData.isHeroique = ((rollData.finalResult - rollData.difficulte) >= 10)
       rollData.isDramatique = ((rollData.finalResult - rollData.difficulte) <= -10)
     }
-
   }
+
   /* -------------------------------------------- */
   static applyCombativite(rollData, value) {
     if (game.user.isGM) {
@@ -432,10 +440,10 @@ export class HawkmoonUtility {
       rollData.diceFormula += `+3`
     }
     if (rollData.hasAmbidextre) {
-      if ( rollData.attaqueAmbidextre1) {
+      if (rollData.ambidextre1) {
         rollData.diceFormula += `-3`
-      } else if ( rollData.attaqueAmbidextre2) {
-        rollData.diceFormula += `-5`
+      } else if (rollData.ambidextre2) {
+        rollData.diceFormula += `-6`
       }
     }
     if (rollData.defenseurAuSol) {
@@ -454,7 +462,7 @@ export class HawkmoonUtility {
       rollData.diceFormula += `+5`
     }
     if (rollData.soutiens > 0) { // 1 soutien = +3, 2 soutiens = +4, 3 soutiens = +5
-      rollData.diceFormula += `+${rollData.soutiens+2}`
+      rollData.diceFormula += `+${rollData.soutiens + 2}`
     }
 
     if (rollData.arme?.system.isDistance) {
@@ -492,18 +500,18 @@ export class HawkmoonUtility {
     }
     if (rollData.feinte) {
       actor.changeBonneAventure(-1)
-      if ( rollData.isHeroique) {
+      if (rollData.isHeroique) {
         rollData.nbCombativitePerdu = "vaincu"
-      } else if  ( rollData.isSuccess) {
+      } else if (rollData.isSuccess) {
         rollData.nbCombativitePerdu = 2
       }
     }
 
     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) {
+    if ((rollData.coupBas || rollData.arme) && rollData.isSuccess && rollData.defenderTokenId) {
       this.applyCombativite(rollData, rollData.nbCombativitePerdu)
     }
     if (rollData.coupBas && rollData.isSuccess && rollData.defenderTokenId) {
@@ -514,30 +522,35 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static getCombativiteList(nbActivite) {
-    let list = [ { value: 0, label: "Combatif"}]
-    for (let i = 1; i < nbActivite-2; i++) {
-      list.push({ value: i, label:"Eprouvé " + i} )
+    let list = [{ value: String(0), label: "Combatif" }]
+    for (let i = 1; i < nbActivite - 2; i++) {
+      list.push({ value: String(i), label: "Eprouvé " + i })
     }
-    list[nbActivite-2] = { value: nbActivite-2, label:"Affaibli"}
-    list[nbActivite-1] = { value: nbActivite-1, label:"Très Affaibli"}
-    list[nbActivite] = { value: nbActivite, label:"Vaincu"}
+    list[nbActivite - 2] = { value: String(nbActivite - 2), label: "Affaibli" }
+    list[nbActivite - 1] = { value: String(nbActivite - 1), label: "Très Affaibli" }
+    list[nbActivite] = { value: String(nbActivite), label: "Vaincu" }
     return list
-
   }
+
   /* -------------------------------------------- */
   static async bonusRollHawkmoon(rollData) {
     rollData.bonusFormula = rollData.addedBonus
+    console.log("Bonus Roll Hawkmoon", rollData.bonusFormula)
 
+    if (!Number(rollData.bonusFormula)) {
       let bonusRoll = await new Roll(rollData.bonusFormula).roll()
       await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
       rollData.bonusRoll = foundry.utils.duplicate(bonusRoll)
+      rollData.finalResult += Number(rollData.bonusRoll.total)
+    } else {
+      rollData.finalResult += Number(rollData.bonusFormula)
+      console.log("Bonus Roll Hawkmoon 2", rollData.finalResult)
+    }
 
-    rollData.finalResult += rollData.bonusRoll.total
-
-    this.computeResult(rollData)
+    this.computeResultQuality(rollData)
 
     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)
 
   }
@@ -647,11 +660,11 @@ export class HawkmoonUtility {
       distanceTir: "porteemoyenne",
       attaqueCharge: false,
       attaqueDesarme: false,
-      attaqueAmbidextre1 : false,
-      attaqueAmbidextre2 : false,
-      chargeCavalerie : false,
-      contenir : false,
-      soutiens : 0
+      attaqueAmbidextre1: false,
+      attaqueAmbidextre2: false,
+      chargeCavalerie: false,
+      contenir: false,
+      soutiens: 0
     }
     return rollData
   }
@@ -663,6 +676,7 @@ export class HawkmoonUtility {
       rollData.defenderTokenId = target.id
       let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
       rollData.armeDefense = defender.getBestDefenseValue()
+      rollData.armeAttaqueDefenseur = defender.getBestAttackValue()
       rollData.targetVigueur = defender.getVigueur()
       rollData.protectionDefenseur = defender.getProtection()
       if (rollData.immobiliser || rollData.repousser) {
@@ -671,11 +685,13 @@ export class HawkmoonUtility {
       } else if (rollData.coupBas) {
         let combatValues = defender.getCombatValues()
         rollData.difficulte = combatValues.defenseTotal
-      }else if ( rollData.assomer) {
+      } else if (rollData.assomer) {
         rollData.difficulte = 3 + (defender.system.attributs.tre.value * 2)
+      } else if (rollData.desengager) {
+        rollData.difficulte = rollData.armeAttaqueDefenseur?.system?.totalOffensif || 0;
       } else if (rollData.armeDefense) {
         rollData.difficulte = rollData.armeDefense.system.totalDefensif
-        if ( !rollData.desengager && !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune ){
+        if (!rollData.desengager && !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune) {
           if (rollData.armeDefense.system.armenaturelle || rollData.armeDefense.system.armefortune) {
             rollData.bonusArmeNaturelle = 3
           }
@@ -693,7 +709,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")
@@ -712,7 +728,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")
@@ -733,13 +749,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)
@@ -765,7 +781,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

packs/aides-de-jeu/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000329

packs/aides-de-jeu/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:37.060687 7f19c6a006c0 Recovering log #195
-2024/05/31-14:00:37.518017 7f19c6a006c0 Delete type=3 #193
-2024/05/31-14:00:37.518100 7f19c6a006c0 Delete type=0 #195
+2025/11/21-21:17:11.288531 7f34ccff96c0 Recovering log #327
+2025/11/21-21:17:11.303357 7f34ccff96c0 Delete type=3 #325
+2025/11/21-21:17:11.303441 7f34ccff96c0 Delete type=0 #327
+2025/11/21-21:20:34.182000 7f322ffff6c0 Level-0 table #332: started
+2025/11/21-21:20:34.182040 7f322ffff6c0 Level-0 table #332: 0 bytes OK
+2025/11/21-21:20:34.189103 7f322ffff6c0 Delete type=0 #330
+2025/11/21-21:20:34.199156 7f322ffff6c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.220809 7f322ffff6c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)

packs/aides-de-jeu/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.916087 7ff4c34006c0 Recovering log #191
-2024/05/30-08:20:34.933156 7ff4c34006c0 Delete type=3 #189
-2024/05/30-08:20:34.933245 7ff4c34006c0 Delete type=0 #191
-2024/05/30-08:30:06.395846 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:06.395899 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:06.427199 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:06.427384 7ff4c0c006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.427410 7ff4c0c006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.824844 7f058d1fa6c0 Recovering log #323
+2025/10/26-15:18:50.834381 7f058d1fa6c0 Delete type=3 #321
+2025/10/26-15:18:50.834446 7f058d1fa6c0 Delete type=0 #323
+2025/10/26-15:36:37.999570 7f0586bff6c0 Level-0 table #328: started
+2025/10/26-15:36:37.999597 7f0586bff6c0 Level-0 table #328: 0 bytes OK
+2025/10/26-15:36:38.035738 7f0586bff6c0 Delete type=0 #326
+2025/10/26-15:36:38.190124 7f0586bff6c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:38.190183 7f0586bff6c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)

packs/armes/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000328

packs/armes/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.354612 7f19c7e006c0 Recovering log #195
-2024/05/31-14:00:36.408905 7f19c7e006c0 Delete type=3 #193
-2024/05/31-14:00:36.408966 7f19c7e006c0 Delete type=0 #195
+2025/11/21-21:17:11.119952 7f34cd7fa6c0 Recovering log #326
+2025/11/21-21:17:11.135840 7f34cd7fa6c0 Delete type=3 #324
+2025/11/21-21:17:11.135940 7f34cd7fa6c0 Delete type=0 #326
+2025/11/21-21:20:34.115063 7f322ffff6c0 Level-0 table #331: started
+2025/11/21-21:20:34.115090 7f322ffff6c0 Level-0 table #331: 0 bytes OK
+2025/11/21-21:20:34.121038 7f322ffff6c0 Delete type=0 #329
+2025/11/21-21:20:34.121241 7f322ffff6c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.121271 7f322ffff6c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)

packs/armes/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.748705 7ff4c16006c0 Recovering log #191
-2024/05/30-08:20:34.770253 7ff4c16006c0 Delete type=3 #189
-2024/05/30-08:20:34.770411 7ff4c16006c0 Delete type=0 #191
-2024/05/30-08:30:06.047232 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:06.047254 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:06.081200 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:06.081367 7ff4c0c006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.081387 7ff4c0c006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.724903 7f05877fe6c0 Recovering log #322
+2025/10/26-15:18:50.734667 7f05877fe6c0 Delete type=3 #320
+2025/10/26-15:18:50.734726 7f05877fe6c0 Delete type=0 #322
+2025/10/26-15:36:37.786399 7f0586bff6c0 Level-0 table #327: started
+2025/10/26-15:36:37.786438 7f0586bff6c0 Level-0 table #327: 0 bytes OK
+2025/10/26-15:36:37.828201 7f0586bff6c0 Delete type=0 #325
+2025/10/26-15:36:37.860961 7f0586bff6c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.860990 7f0586bff6c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)

packs/competences-creatures/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000328

packs/competences-creatures/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.234976 7f19c7e006c0 Recovering log #195
-2024/05/31-14:00:36.287333 7f19c7e006c0 Delete type=3 #193
-2024/05/31-14:00:36.287419 7f19c7e006c0 Delete type=0 #195
+2025/11/21-21:17:11.082663 7f34ccff96c0 Recovering log #326
+2025/11/21-21:17:11.097415 7f34ccff96c0 Delete type=3 #324
+2025/11/21-21:17:11.097522 7f34ccff96c0 Delete type=0 #326
+2025/11/21-21:20:34.082672 7f322ffff6c0 Level-0 table #331: started
+2025/11/21-21:20:34.082698 7f322ffff6c0 Level-0 table #331: 0 bytes OK
+2025/11/21-21:20:34.088631 7f322ffff6c0 Delete type=0 #329
+2025/11/21-21:20:34.094927 7f322ffff6c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.094971 7f322ffff6c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)

packs/competences-creatures/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.720508 7ff4c16006c0 Recovering log #191
-2024/05/30-08:20:34.731510 7ff4c16006c0 Delete type=3 #189
-2024/05/30-08:20:34.731576 7ff4c16006c0 Delete type=0 #191
-2024/05/30-08:30:05.963820 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:05.963879 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:05.997883 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:06.081326 7ff4c0c006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.081373 7ff4c0c006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.698736 7f058c9f96c0 Recovering log #322
+2025/10/26-15:18:50.709788 7f058c9f96c0 Delete type=3 #320
+2025/10/26-15:18:50.709858 7f058c9f96c0 Delete type=0 #322
+2025/10/26-15:36:37.564245 7f0586bff6c0 Level-0 table #327: started
+2025/10/26-15:36:37.564294 7f0586bff6c0 Level-0 table #327: 0 bytes OK
+2025/10/26-15:36:37.604220 7f0586bff6c0 Delete type=0 #325
+2025/10/26-15:36:37.709945 7f0586bff6c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.709995 7f0586bff6c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)

packs/competences/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000328

packs/competences/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.096613 7f19c7e006c0 Recovering log #195
-2024/05/31-14:00:36.152261 7f19c7e006c0 Delete type=3 #193
-2024/05/31-14:00:36.152502 7f19c7e006c0 Delete type=0 #195
+2025/11/21-21:17:11.044217 7f34ce7fc6c0 Recovering log #326
+2025/11/21-21:17:11.059351 7f34ce7fc6c0 Delete type=3 #324
+2025/11/21-21:17:11.059409 7f34ce7fc6c0 Delete type=0 #326
+2025/11/21-21:20:34.076024 7f322ffff6c0 Level-0 table #331: started
+2025/11/21-21:20:34.076057 7f322ffff6c0 Level-0 table #331: 0 bytes OK
+2025/11/21-21:20:34.082546 7f322ffff6c0 Delete type=0 #329
+2025/11/21-21:20:34.094915 7f322ffff6c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.094962 7f322ffff6c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)

packs/competences/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.675461 7ff4c16006c0 Recovering log #191
-2024/05/30-08:20:34.692897 7ff4c16006c0 Delete type=3 #189
-2024/05/30-08:20:34.692957 7ff4c16006c0 Delete type=0 #191
-2024/05/30-08:30:05.824069 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:05.824141 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:05.864619 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:05.864879 7ff4c0c006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:05.923774 7ff4c0c006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.672996 7f058d1fa6c0 Recovering log #322
+2025/10/26-15:18:50.683402 7f058d1fa6c0 Delete type=3 #320
+2025/10/26-15:18:50.683496 7f058d1fa6c0 Delete type=0 #322
+2025/10/26-15:36:37.604372 7f0586bff6c0 Level-0 table #327: started
+2025/10/26-15:36:37.604409 7f0586bff6c0 Level-0 table #327: 0 bytes OK
+2025/10/26-15:36:37.638938 7f0586bff6c0 Delete type=0 #325
+2025/10/26-15:36:37.709963 7f0586bff6c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.710002 7f0586bff6c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)

packs/equipement/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000328

packs/equipement/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.506398 7f19c7e006c0 Recovering log #195
-2024/05/31-14:00:36.606726 7f19c7e006c0 Delete type=3 #193
-2024/05/31-14:00:36.606779 7f19c7e006c0 Delete type=0 #195
+2025/11/21-21:17:11.157103 7f34ce7fc6c0 Recovering log #326
+2025/11/21-21:17:11.172875 7f34ce7fc6c0 Delete type=3 #324
+2025/11/21-21:17:11.172939 7f34ce7fc6c0 Delete type=0 #326
+2025/11/21-21:20:34.095092 7f322ffff6c0 Level-0 table #331: started
+2025/11/21-21:20:34.095126 7f322ffff6c0 Level-0 table #331: 0 bytes OK
+2025/11/21-21:20:34.102295 7f322ffff6c0 Delete type=0 #329
+2025/11/21-21:20:34.121183 7f322ffff6c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.121249 7f322ffff6c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)

packs/equipement/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.786440 7ff4c16006c0 Recovering log #191
-2024/05/30-08:20:34.796746 7ff4c16006c0 Delete type=3 #189
-2024/05/30-08:20:34.796849 7ff4c16006c0 Delete type=0 #191
-2024/05/30-08:30:06.081452 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:06.081472 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:06.114237 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:06.229981 7ff4c0c006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.230018 7ff4c0c006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.749067 7f058d1fa6c0 Recovering log #322
+2025/10/26-15:18:50.759273 7f058d1fa6c0 Delete type=3 #320
+2025/10/26-15:18:50.759337 7f058d1fa6c0 Delete type=0 #322
+2025/10/26-15:36:37.743796 7f0586bff6c0 Level-0 table #327: started
+2025/10/26-15:36:37.743858 7f0586bff6c0 Level-0 table #327: 0 bytes OK
+2025/10/26-15:36:37.786277 7f0586bff6c0 Delete type=0 #325
+2025/10/26-15:36:37.860948 7f0586bff6c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.860984 7f0586bff6c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)

packs/historiques/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000328

packs/historiques/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.294606 7f19c6a006c0 Recovering log #195
-2024/05/31-14:00:36.348946 7f19c6a006c0 Delete type=3 #193
-2024/05/31-14:00:36.349029 7f19c6a006c0 Delete type=0 #195
+2025/11/21-21:17:11.100312 7f34ce7fc6c0 Recovering log #326
+2025/11/21-21:17:11.117500 7f34ce7fc6c0 Delete type=3 #324
+2025/11/21-21:17:11.117567 7f34ce7fc6c0 Delete type=0 #326
+2025/11/21-21:20:34.069446 7f322ffff6c0 Level-0 table #331: started
+2025/11/21-21:20:34.069505 7f322ffff6c0 Level-0 table #331: 0 bytes OK
+2025/11/21-21:20:34.075899 7f322ffff6c0 Delete type=0 #329
+2025/11/21-21:20:34.094892 7f322ffff6c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.094951 7f322ffff6c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)

packs/historiques/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.733842 7ff4c34006c0 Recovering log #191
-2024/05/30-08:20:34.743469 7ff4c34006c0 Delete type=3 #189
-2024/05/30-08:20:34.743550 7ff4c34006c0 Delete type=0 #191
-2024/05/30-08:30:05.998107 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:05.998163 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:06.047044 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:06.081347 7ff4c0c006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.081380 7ff4c0c006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.712053 7f058d1fa6c0 Recovering log #322
+2025/10/26-15:18:50.722592 7f058d1fa6c0 Delete type=3 #320
+2025/10/26-15:18:50.722674 7f058d1fa6c0 Delete type=0 #322
+2025/10/26-15:36:37.639047 7f0586bff6c0 Level-0 table #327: started
+2025/10/26-15:36:37.639075 7f0586bff6c0 Level-0 table #327: 0 bytes OK
+2025/10/26-15:36:37.675760 7f0586bff6c0 Delete type=0 #325
+2025/10/26-15:36:37.709975 7f0586bff6c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.710009 7f0586bff6c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)

packs/mutations/CURRENT

@@ -1 +1 @@
-MANIFEST-000107
+MANIFEST-000238

packs/mutations/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.158899 7f19c6a006c0 Recovering log #105
-2024/05/31-14:00:36.211355 7f19c6a006c0 Delete type=3 #103
-2024/05/31-14:00:36.211422 7f19c6a006c0 Delete type=0 #105
+2025/11/21-21:17:11.062660 7f34cdffb6c0 Recovering log #236
+2025/11/21-21:17:11.079663 7f34cdffb6c0 Delete type=3 #234
+2025/11/21-21:17:11.079731 7f34cdffb6c0 Delete type=0 #236
+2025/11/21-21:20:34.088817 7f322ffff6c0 Level-0 table #241: started
+2025/11/21-21:20:34.088856 7f322ffff6c0 Level-0 table #241: 0 bytes OK
+2025/11/21-21:20:34.094750 7f322ffff6c0 Delete type=0 #239
+2025/11/21-21:20:34.094940 7f322ffff6c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.094980 7f322ffff6c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)

packs/mutations/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.697920 7ff4c34006c0 Recovering log #101
-2024/05/30-08:20:34.715302 7ff4c34006c0 Delete type=3 #99
-2024/05/30-08:20:34.715376 7ff4c34006c0 Delete type=0 #101
-2024/05/30-08:30:05.923786 7ff4c0c006c0 Level-0 table #106: started
-2024/05/30-08:30:05.923812 7ff4c0c006c0 Level-0 table #106: 0 bytes OK
-2024/05/30-08:30:05.963487 7ff4c0c006c0 Delete type=0 #104
-2024/05/30-08:30:06.047218 7ff4c0c006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.081359 7ff4c0c006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.686224 7f0587fff6c0 Recovering log #232
+2025/10/26-15:18:50.696079 7f0587fff6c0 Delete type=3 #230
+2025/10/26-15:18:50.696162 7f0587fff6c0 Delete type=0 #232
+2025/10/26-15:36:37.675951 7f0586bff6c0 Level-0 table #237: started
+2025/10/26-15:36:37.676003 7f0586bff6c0 Level-0 table #237: 0 bytes OK
+2025/10/26-15:36:37.709795 7f0586bff6c0 Delete type=0 #235
+2025/10/26-15:36:37.709986 7f0586bff6c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.710016 7f0586bff6c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)

packs/profils/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000328

packs/profils/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.614314 7f19c6a006c0 Recovering log #195
-2024/05/31-14:00:36.664608 7f19c6a006c0 Delete type=3 #193
-2024/05/31-14:00:36.664740 7f19c6a006c0 Delete type=0 #195
+2025/11/21-21:17:11.175622 7f34cd7fa6c0 Recovering log #326
+2025/11/21-21:17:11.190667 7f34cd7fa6c0 Delete type=3 #324
+2025/11/21-21:17:11.190757 7f34cd7fa6c0 Delete type=0 #326
+2025/11/21-21:20:34.109081 7f322ffff6c0 Level-0 table #331: started
+2025/11/21-21:20:34.109106 7f322ffff6c0 Level-0 table #331: 0 bytes OK
+2025/11/21-21:20:34.114933 7f322ffff6c0 Delete type=0 #329
+2025/11/21-21:20:34.121229 7f322ffff6c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.121264 7f322ffff6c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)

packs/profils/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.800876 7ff4c34006c0 Recovering log #191
-2024/05/30-08:20:34.812006 7ff4c34006c0 Delete type=3 #189
-2024/05/30-08:20:34.812097 7ff4c34006c0 Delete type=0 #191
-2024/05/30-08:30:06.155084 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:06.155158 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:06.197414 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:06.230004 7ff4c0c006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.230039 7ff4c0c006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.761639 7f05877fe6c0 Recovering log #322
+2025/10/26-15:18:50.771506 7f05877fe6c0 Delete type=3 #320
+2025/10/26-15:18:50.771562 7f05877fe6c0 Delete type=0 #322
+2025/10/26-15:36:37.710125 7f0586bff6c0 Level-0 table #327: started
+2025/10/26-15:36:37.710175 7f0586bff6c0 Level-0 table #327: 0 bytes OK
+2025/10/26-15:36:37.743520 7f0586bff6c0 Delete type=0 #325
+2025/10/26-15:36:37.860930 7f0586bff6c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.860978 7f0586bff6c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)

packs/protections/CURRENT

@@ -1 +1 @@
-MANIFEST-000197
+MANIFEST-000328

packs/protections/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.416695 7f19c6a006c0 Recovering log #195
-2024/05/31-14:00:36.489832 7f19c6a006c0 Delete type=3 #193
-2024/05/31-14:00:36.489937 7f19c6a006c0 Delete type=0 #195
+2025/11/21-21:17:11.139151 7f34cdffb6c0 Recovering log #326
+2025/11/21-21:17:11.154714 7f34cdffb6c0 Delete type=3 #324
+2025/11/21-21:17:11.154795 7f34cdffb6c0 Delete type=0 #326
+2025/11/21-21:20:34.102428 7f322ffff6c0 Level-0 table #331: started
+2025/11/21-21:20:34.102452 7f322ffff6c0 Level-0 table #331: 0 bytes OK
+2025/11/21-21:20:34.108966 7f322ffff6c0 Delete type=0 #329
+2025/11/21-21:20:34.121216 7f322ffff6c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.121256 7f322ffff6c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)

packs/protections/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.773528 7ff4c34006c0 Recovering log #191
-2024/05/30-08:20:34.783658 7ff4c34006c0 Delete type=3 #189
-2024/05/30-08:20:34.783714 7ff4c34006c0 Delete type=0 #191
-2024/05/30-08:30:06.114430 7ff4c0c006c0 Level-0 table #196: started
-2024/05/30-08:30:06.114476 7ff4c0c006c0 Level-0 table #196: 0 bytes OK
-2024/05/30-08:30:06.154788 7ff4c0c006c0 Delete type=0 #194
-2024/05/30-08:30:06.229993 7ff4c0c006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.230025 7ff4c0c006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.736841 7f058c9f96c0 Recovering log #322
+2025/10/26-15:18:50.746818 7f058c9f96c0 Delete type=3 #320
+2025/10/26-15:18:50.746894 7f058c9f96c0 Delete type=0 #322
+2025/10/26-15:36:37.828362 7f0586bff6c0 Level-0 table #327: started
+2025/10/26-15:36:37.828487 7f0586bff6c0 Level-0 table #327: 0 bytes OK
+2025/10/26-15:36:37.860797 7f0586bff6c0 Delete type=0 #325
+2025/10/26-15:36:37.860970 7f0586bff6c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.860996 7f0586bff6c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)

packs/scenes/CURRENT

@@ -1 +1 @@
-MANIFEST-000033
+MANIFEST-000167

packs/scenes/LOG

@@ -1,3 +1,8 @@
-2024/05/31-14:00:36.977032 7f19c6a006c0 Recovering log #31
-2024/05/31-14:00:37.050459 7f19c6a006c0 Delete type=3 #29
-2024/05/31-14:00:37.050537 7f19c6a006c0 Delete type=0 #31
+2025/11/21-21:17:11.269484 7f34cdffb6c0 Recovering log #165
+2025/11/21-21:17:11.284464 7f34cdffb6c0 Delete type=3 #163
+2025/11/21-21:17:11.284524 7f34cdffb6c0 Delete type=0 #165
+2025/11/21-21:20:34.145250 7f322ffff6c0 Level-0 table #170: started
+2025/11/21-21:20:34.145279 7f322ffff6c0 Level-0 table #170: 0 bytes OK
+2025/11/21-21:20:34.151544 7f322ffff6c0 Delete type=0 #168
+2025/11/21-21:20:34.151702 7f322ffff6c0 Manual compaction at level-0 from '!scenes!VOzC5ey4qi1C34MY' @ 72057594037927935 : 1 .. '!scenes!mfosNsLsHN5Pf4TO' @ 0 : 0; will stop at (end)
+2025/11/21-21:20:34.164154 7f322ffff6c0 Manual compaction at level-1 from '!scenes!VOzC5ey4qi1C34MY' @ 72057594037927935 : 1 .. '!scenes!mfosNsLsHN5Pf4TO' @ 0 : 0; will stop at (end)

packs/scenes/LOG.old

@@ -1,8 +1,8 @@
-2024/05/30-08:20:34.900298 7ff4c34006c0 Recovering log #27
-2024/05/30-08:20:34.910330 7ff4c34006c0 Delete type=3 #25
-2024/05/30-08:20:34.910386 7ff4c34006c0 Delete type=0 #27
-2024/05/30-08:30:06.313985 7ff4c0c006c0 Level-0 table #32: started
-2024/05/30-08:30:06.314032 7ff4c0c006c0 Level-0 table #32: 0 bytes OK
-2024/05/30-08:30:06.351730 7ff4c0c006c0 Delete type=0 #30
-2024/05/30-08:30:06.395708 7ff4c0c006c0 Manual compaction at level-0 from '!scenes!CXx90Qk7nXEd2uTh' @ 72057594037927935 : 1 .. '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 0 : 0; will stop at (end)
-2024/05/30-08:30:06.395765 7ff4c0c006c0 Manual compaction at level-1 from '!scenes!CXx90Qk7nXEd2uTh' @ 72057594037927935 : 1 .. '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 0 : 0; will stop at (end)
+2025/10/26-15:18:50.811691 7f0587fff6c0 Recovering log #161
+2025/10/26-15:18:50.821681 7f0587fff6c0 Delete type=3 #159
+2025/10/26-15:18:50.821761 7f0587fff6c0 Delete type=0 #161
+2025/10/26-15:36:37.961254 7f0586bff6c0 Level-0 table #166: started
+2025/10/26-15:36:37.961290 7f0586bff6c0 Level-0 table #166: 0 bytes OK
+2025/10/26-15:36:37.999333 7f0586bff6c0 Delete type=0 #164
+2025/10/26-15:36:37.999500 7f0586bff6c0 Manual compaction at level-0 from '!scenes!VOzC5ey4qi1C34MY' @ 72057594037927935 : 1 .. '!scenes!mfosNsLsHN5Pf4TO' @ 0 : 0; will stop at (end)
+2025/10/26-15:36:37.999534 7f0586bff6c0 Manual compaction at level-1 from '!scenes!VOzC5ey4qi1C34MY' @ 72057594037927935 : 1 .. '!scenes!mfosNsLsHN5Pf4TO' @ 0 : 0; will stop at (end)

packs/tables/CURRENT

@@ -1 +1 @@
-MANIFEST-000196
+MANIFEST-000324

packs/tables/LOG

@@ -1,3 +1,7 @@
-2024/05/31-14:00:36.856788 7f19c7e006c0 Recovering log #194
-2024/05/31-14:00:36.974747 7f19c7e006c0 Delete type=3 #192
-2024/05/31-14:00:36.974809 7f19c7e006c0 Delete type=0 #194
+2025/11/21-21:17:11.238038 7f34ccff96c0 Recovering log #322
+2025/11/21-21:17:11.266542 7f34ccff96c0 Delete type=3 #320
+2025/11/21-21:17:11.266608 7f34ccff96c0 Delete type=0 #322
+2025/11/21-21:20:34.138228 7f322ffff6c0 Level-0 table #327: started
+2025/11/21-21:20:34.138262 7f322ffff6c0 Level-0 table #327: 0 bytes OK
+2025/11/21-21:20:34.145084 7f322ffff6c0 Delete type=0 #325
+2025/11/21-21:20:34.151692 7f322ffff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)