Correction sur talent Dragon

modules/hawkmoon-actor-sheet.js

@@ -7,12 +7,12 @@ 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() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
       template: "systems/fvtt-hawkmoon-cyd/templates/actor-sheet.html",
       width: 640,
@@ -25,7 +25,7 @@ export class HawkmoonActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)    
+    const objectData = foundry.utils.duplicate(this.object)
 
     let formData = {
       title: this.title,
@@ -39,29 +39,30 @@ export class HawkmoonActorSheet extends ActorSheet {
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
       skills: this.actor.getSkills(),
-      armes: duplicate(this.actor.getWeapons()),
+      armes: foundry.utils.duplicate(this.actor.getWeapons()),
-      monnaies: duplicate(this.actor.getMonnaies()),
+      monnaies: foundry.utils.duplicate(this.actor.getMonnaies()),
-      protections: duplicate(this.actor.getArmors()),
+      protections: foundry.utils.duplicate(this.actor.getArmors()),
-      historiques: duplicate(this.actor.getHistoriques() || []),
+      historiques: foundry.utils.duplicate(this.actor.getHistoriques() || []),
-      talents: duplicate(this.actor.getTalents() || []),
+      talents: foundry.utils.duplicate(this.actor.getTalents() || []),
-      mutations: duplicate(this.actor.getMutations() || []),
+      mutations: foundry.utils.duplicate(this.actor.getMutations() || []),
       talentsCell: this.getCelluleTalents(),
-      profils: duplicate(this.actor.getProfils()  || []),
+      profils: foundry.utils.duplicate(this.actor.getProfils()  || []),
-      combat: this.actor.getCombatValues(),      
+      combat: this.actor.getCombatValues(),
-      equipements: duplicate(this.actor.getEquipments()),
+      equipements: foundry.utils.duplicate(this.actor.getEquipments()),
-      artefacts: duplicate(this.actor.getArtefacts()),
+      artefacts: foundry.utils.duplicate(this.actor.getArtefacts()),
       richesse: this.actor.computeRichesse(),
       coupDevastateur: this.actor.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup devastateur" && !it.system.used),
       valeurEquipement: this.actor.computeValeurEquipement(),
       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}),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, {async: true}),
-      habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {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,
-      isGM: game.user.isGM
+      isGM: game.user.isGM,
+      config: game.system.hawkmoon.config
     }
     this.formData = formData;
 
@@ -90,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");
@@ -119,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"))
@@ -129,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")
@@ -146,9 +147,9 @@ export class HawkmoonActorSheet extends ActorSheet {
       let armeId  = li.data("item-id")
       this.actor.rollArmeOffensif(armeId)
     })
-    
+
-    html.find('.roll-assomer').click((event) => {
+    html.find('.roll-assommer').click((event) => {
-      this.actor.rollAssomer()
+      this.actor.rollAssommer()
     })
     html.find('.roll-coup-bas').click((event) => {
       this.actor.rollCoupBas()
@@ -162,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 
+   * This overrided create() function adds initial items
-   * Namely: Basic skills, money, 
+   * 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.
@@ -67,22 +67,26 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   prepareArme(arme) {
-    arme = duplicate(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") {
       let bonusDefense = this.getBonusDefenseFromTalents()
-      arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée"))
+      arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée"))
       arme.system.attrKey = "pui"
       arme.system.totalDegats = arme.system.degats + "+" + combat.bonusDegatsTotal
-      arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff + (this.system.combat.monte ? 3 : 0 )
+      arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff + (this.system.combat.monte ? 3 : 0)
-      arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense + (this.system.combat.monte ? 3 : 0 )
+      arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense + (this.system.combat.monte ? 3 : 0)
       console.log("Arme", arme.system.totalDefensif, combat, arme.system.competence.system.niveau, arme.system.seuildefense, bonusDefense)
       arme.system.isdefense = true
       arme.system.isMelee = true
       arme.system.isDistance = false
     }
     if (arme.system.typearme == "jet" || arme.system.typearme == "tir") {
-      arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance"))
+      arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance"))
       arme.system.attrKey = "adr"
       arme.system.totalOffensif = this.system.attributs.adr.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
       arme.system.totalDegats = arme.system.degats
@@ -146,7 +150,7 @@ export class HawkmoonActor extends Actor {
   getSkills() {
     let comp = []
     for (let item of this.items) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
       if (item.type == "competence") {
         item.system.attribut1total = item.system.niveau + (this.system.attributs[item.system.attribut1]?.value || 0)
         item.system.attribut2total = item.system.niveau + (this.system.attributs[item.system.attribut2]?.value || 0)
@@ -168,7 +172,7 @@ export class HawkmoonActor extends Actor {
 
   /* -----------------------  --------------------- */
   addMember(actorId) {
-    let members = duplicate(this.system.members)
+    let members = foundry.utils.duplicate(this.system.members)
     members.push({ id: actorId })
     this.update({ 'system.members': members })
   }
@@ -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,
@@ -235,21 +253,28 @@ export class HawkmoonActor extends Actor {
         this.update({ 'system.sante.vigueur': vigueur })
       }
     }
-
     super.prepareDerivedData()
   }
 
   /* -------------------------------------------- */
   _preUpdate(changed, options, user) {
-
+    if (changed?.system?.sante?.etat && changed?.system?.sante?.etat != this.system.sante.etat) {
+      setTimeout(() => {
+        this.processCombativite(changed.system.sante)
+      }, 800)
+    }
     super._preUpdate(changed, options, user);
   }
 
+  /* -------------------------------------------- */
+  _onUpdate(data, options, user) {
+    super._onUpdate(data, options, user);
+  }
   /* -------------------------------------------- */
   getItemById(id) {
     let item = this.items.find(item => item.id == id);
     if (item) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
     }
     return item;
   }
@@ -282,7 +307,7 @@ export class HawkmoonActor extends Actor {
   checkAttribut(attribut, minLevel) {
     let attr = this.system.attributs.find(at => at.labelnorm == attribut.toLowerCase())
     if (attr && attr.value >= minLevel) {
-      return { isValid: true, attr: duplicate(attr) }
+      return { isValid: true, attr: foundry.utils.duplicate(attr) }
     }
     return { isValid: false }
   }
@@ -290,11 +315,11 @@ export class HawkmoonActor extends Actor {
   checkAttributOrCompetenceLevel(compName, minLevel) {
     let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase() && i.system.niveau >= minLevel)
     if (comp) {
-      return { isValid: true, item: duplicate(comp) }
+      return { isValid: true, item: foundry.utils.duplicate(comp) }
     } else {
       for (let attrKey in this.system.attributs) {
         if (this.system.attributs[attrKey].label.toLowerCase() == compName.toLowerCase() && this.system.attributs[attrKey].value >= minLevel) {
-          return { isValid: true, item: duplicate(this.system.attributs[attrKey]) }
+          return { isValid: true, item: foundry.utils.duplicate(this.system.attributs[attrKey]) }
         }
       }
     }
@@ -304,7 +329,7 @@ export class HawkmoonActor extends Actor {
   addCompetenceBonus(compName, bonus, baCost) {
     let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase())
     if (comp) {
-      comp = duplicate(comp)
+      comp = foundry.utils.duplicate(comp)
       comp.system.bonus = bonus
       comp.system.baCost = baCost
       return { isValid: true, item: comp }
@@ -388,22 +413,28 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   changeEtatCombativite(value) {
-    if ( value === "vaincu") {
+    if (value === "vaincu") {
       value = 200
     }
-    let sante = duplicate(this.system.sante)
+    let sante = foundry.utils.duplicate(this.system.sante)
     sante.etat += Number(value)
     sante.etat = Math.max(sante.etat, 0)
-    sante.etat = Math.min(sante.etat, 5)
+    sante.etat = Math.min(sante.etat, this.system.sante.nbcombativite)
     this.update({ 'system.sante': sante })
     if (sante.etat == this.system.sante.nbcombativite) {
       ChatMessage.create({ content: `<strong>${this.name} est vaincu !</strong>` })
     }
+    // Duplicated ! this.processCombativite(sante)
+  }
+
+  /* -------------------------------------------- */
+  processCombativite(sante) {
+    sante = sante || foundry.utils.duplicate(this.system.sante)
     // Gestion des états affaibli et très affaibli
-    if (sante.etat == this.system.sante.nbcombativite-2 || sante.etat == this.system.sante.nbcombativite-1) {
+    if (sante.etat == this.system.sante.nbcombativite - 2 || sante.etat == this.system.sante.nbcombativite - 1) {
-      if (sante.etat == this.system.sante.nbcombativite-2 && this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "encaissement")) {
+      if (sante.etat == this.system.sante.nbcombativite - 2 && this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "encaissement")) {
         ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Encaissement. Pensez à les ajouter à la fin de la scène !</strong>` })
-      } else if (sante.etat == this.system.sante.nbcombativite-1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) {
+      } else if (sante.etat == this.system.sante.nbcombativite - 1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) {
         ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Vaillant. Pensez à les ajouter à la fin de la scène !</strong>` })
       } else {
         ChatMessage.create({ content: `<strong>${this.name} subit 2 adversités rouge !</strong>` })
@@ -425,13 +456,13 @@ export class HawkmoonActor extends Actor {
   getSubActors() {
     let subActors = [];
     for (let id of this.system.subactors) {
-      subActors.push(duplicate(game.actors.get(id)));
+      subActors.push(foundry.utils.duplicate(game.actors.get(id)));
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = duplicate(this.system.subactors);
+    let subActors = foundry.utils.duplicate(this.system.subactors);
     subActors.push(subActorId);
     await this.update({ 'system.subactors': subActors });
   }
@@ -453,9 +484,10 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   async incDecAdversite(adv, incDec = 0) {
-    let adversite = duplicate(this.system.adversite)
+    let adversite = foundry.utils.duplicate(this.system.adversite)
     adversite[adv] += Number(incDec)
     adversite[adv] = Math.max(adversite[adv], 0)
+    adversite[adv] = Math.min(adversite[adv], 20)
     this.update({ 'system.adversite': adversite })
   }
   /* -------------------------------------------- */
@@ -500,7 +532,7 @@ export class HawkmoonActor extends Actor {
   /* -------------------------------------------- */
   async setPredilectionUsed(compId, predIdx) {
     let comp = this.items.get(compId)
-    let pred = duplicate(comp.system.predilections)
+    let pred = foundry.utils.duplicate(comp.system.predilections)
     pred[predIdx].used = true
     await this.updateEmbeddedDocuments('Item', [{ _id: compId, 'system.predilections': pred }])
   }
@@ -511,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)
@@ -522,7 +571,7 @@ export class HawkmoonActor extends Actor {
       }
       if (arme.system.totalDefensif > maxDef) {
         maxDef = arme.system.totalDefensif
-        bestArme = duplicate(arme)
+        bestArme = foundry.utils.duplicate(arme)
       }
     }
     return bestArme
@@ -537,7 +586,7 @@ export class HawkmoonActor extends Actor {
         for (let auto of talent.system.automations) {
           if (auto.eventtype === "prepare-roll") {
             if (auto.competence.toLowerCase() == competence.name.toLowerCase()) {
-              talent = duplicate(talent)
+              talent = foundry.utils.duplicate(talent)
               talent.system.bonus = auto.bonus
               talent.system.baCost = auto.baCost
               talents.push(talent)
@@ -569,26 +618,33 @@ export class HawkmoonActor extends Actor {
     rollData.nbAdversites = this.getTotalAdversite()
     rollData.talents = []
     rollData.attrKey2 = "none"
-    rollData.coupDevastateur = this.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup dévastateur" && !it.system.used)
+    rollData.coupDevastateur = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "coup dévastateur" && !it.system.used)
     rollData.hasAmbidextre = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "ambidextre")
-    rollData.hasFeinte = this.system.bonneaventure.actuelle >0 && this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "feinte")
+    rollData.hasFeinte = this.system.bonneaventure.actuelle > 0 && this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "feinte")
     rollData.isMonte = this.system.combat.monte
+    rollData.config = game.system.hawkmoon.config
 
     if (attrKey) {
       rollData.attrKey = attrKey
       if (attrKey != "tochoose") {
         rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + this.system.attributs[attrKey].labelnorm + ".webp"
-        rollData.attr = duplicate(this.system.attributs[attrKey])
+        rollData.attr = foundry.utils.duplicate(this.system.attributs[attrKey])
       }
     }
     if (compId) {
-      rollData.competence = duplicate(this.items.get(compId) || {})
+      rollData.competence = foundry.utils.duplicate(this.items.get(compId) || {})
-      rollData.maitrises = rollData.competence.system.predilections.filter(p => p.maitrise)
+      let maitrises = [{ key: "none", label: "Aucune" }]
+      rollData.competence.system.predilections.forEach(function (item) {
+        if (item.maitrise) {
+          maitrises.push({ key: item.id, label: item.name });
+        }
+      })
+      rollData.maitrises = maitrises // rollData.competence.system.predilections.filter(p => p.maitrise)
       rollData.actionImg = rollData.competence?.img
       rollData.talents = this.searchRelevantTalents(rollData.competence)
     }
     if (compName) {
-      rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
+      rollData.competence = foundry.utils.duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
       rollData.actionImg = rollData.competence?.img
     }
     return rollData
@@ -626,7 +682,7 @@ export class HawkmoonActor extends Actor {
     rollDialog.render(true)
   }
   /* -------------------------------------------- */
-  async rollAssomer() {
+  async rollAssommer() {
     let rollData = this.getCommonRollData("pui", undefined, "Filouterie")
     rollData.assomer = true
     rollData.conditionsCommunes = true
@@ -672,7 +728,7 @@ export class HawkmoonActor extends Actor {
     let rollDialog = await HawkmoonRollDialog.create(this, rollData)
     rollDialog.render(true)
   }
-  
+
   /* -------------------------------------------- */
   async rollArmeDegats(armeId, targetVigueur = undefined, rollDataInput = undefined) {
     let arme = this.items.get(armeId)
@@ -687,7 +743,7 @@ export class HawkmoonActor extends Actor {
     if (rollDataInput?.applyCoupDevastateur) {
       bonus2 = Math.floor(this.system.attributs.pui.value / 2)
       let talent = this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "coup dévastateur")
-      this.updateEmbeddedDocuments('Item', [{ _id: talent.id, 'system.used': true }]) 
+      this.updateEmbeddedDocuments('Item', [{ _id: talent.id, 'system.used': true }])
     }
 
     if (rollDataInput?.isHeroique) {
@@ -697,7 +753,7 @@ export class HawkmoonActor extends Actor {
       if (rollDataInput?.chargeCavalerie) {
         bonus = 6
       }
-      roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
+      roll = await new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll()
     } else {
       if (rollDataInput?.attaqueCharge) {
         bonus = 3
@@ -705,13 +761,13 @@ export class HawkmoonActor extends Actor {
       if (rollDataInput?.chargeCavalerie) {
         bonus = 4
       }
-      roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
+      roll = await new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll()
     }
     await HawkmoonUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"));
     let nbEtatPerdus = 0
     if (targetVigueur) {
       nbEtatPerdus = Math.floor(roll.total / targetVigueur)
-    } 
+    }
     //console.log(roll)
     let rollData = {
       arme: arme,

modules/hawkmoon-automation.js

@@ -14,10 +14,10 @@ export class HawkmoonAutomation {
     this.__objectTypes = { }
     
     Object.entries(game.data.model.Actor).forEach(kv => { 
-      this.__objectTypes[kv[0]] = duplicate(kv[1])
+      this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1])
     })
     Object.entries(game.data.model.Item).forEach(kv => { 
-      this.__objectTypes[kv[0]] = duplicate(kv[1])
+      this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1])
     })
   }
 

modules/hawkmoon-cellule-sheet.js

@@ -7,15 +7,15 @@ 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() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
       template: "systems/fvtt-hawkmoon-cyd/templates/cellule-sheet.html",
       width: 640,
@@ -28,7 +28,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)
+    const objectData = foundry.utils.duplicate(this.object)
 
     let formData = {
       title: this.title,
@@ -41,15 +41,23 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       system: objectData.system,
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
-      talents: duplicate(this.actor.getTalents() || {}),
+      talents: foundry.utils.duplicate(this.actor.getTalents() || {}),
-      ressources: duplicate(this.actor.getRessources()),
+      ressources: foundry.utils.duplicate(this.actor.getRessources()),
-      contacts: duplicate(this.actor.getContacts()),
+      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,
       editScore: this.options.editScore,
-      isGM: game.user.isGM
+      isGM: game.user.isGM,
+      config: game.system.hawkmoon.config
     }
     this.formData = formData;
 
@@ -87,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")
@@ -109,15 +117,15 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       let value = ev.currentTarget.value
       this.actor.editItemField(itemId, itemType, itemField, dataType, value)
     })
-
+    html.find('.quantity-modify').click(event => {
-    html.find('.quantity-minus').click(event => {
+      const li = $(event.currentTarget).parents(".item")
-      const li = $(event.currentTarget).parents(".item");
+      const value = Number($(event.currentTarget).data("quantite-value"))
-      this.actor.incDecQuantity(li.data("item-id"), -1);
+      this.actor.incDecQuantity( li.data("item-id"), value );
-    });
+    })
-    html.find('.quantity-plus').click(event => {
+    html.find('.item-add').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
+      const itemType = $(event.currentTarget).data("type")
-      this.actor.incDecQuantity(li.data("item-id"), +1);
+      this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true })
-    });
+    })
 
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
@@ -128,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é.")
@@ -148,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-combat.js

@@ -7,8 +7,8 @@ export class HawkmoonCombat extends Combat {
   async rollInitiative(ids, formula = undefined, messageOptions = {} ) {
     ids = typeof ids === "string" ? [ids] : ids;
     for (let cId of ids) {
-      const c = this.combatants.get(ids[cId]);
+      const c = this.combatants.get(cId);
-      //console.log("Init for combattant", c )
+      console.log("Init for combattant", c, ids)
       let id = c._id || c.id
       let initValue = c.actor ? c.actor.getInitiativeScore() : 0
       await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initValue } ]);

modules/hawkmoon-config.js

@@ -0,0 +1,143 @@
+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: [
+    { key: "porteecourte", label: "Courte ({protectionDefenseur}+5)" },
+    { key: "porteemoyenne", label: "Moyenne ({protectionDefenseur}+9)" },
+    { 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" },
+    { key: "-1", label: "-1" },
+    { key: "0", label: "0" },
+    { key: "1", label: "+1" },
+    { key: "2", label: "+2" },
+    { key: "3", label: "+3" },
+    { 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)" },
+    { key: "main", label: "Main (SD+10)" },
+    { key: "enfant", label: "Enfant (SD+3)" },
+    { key: "maison", label: "Maison (SD-10)" }
+  ],
+  optionsCouvert: [
+    { key: "aucun", label: "Aucun" },
+    { key: "leger", label: "Léger (SD+5)" },
+    { key: "complet", label: "Quasi complet (SD+10)" }
+  ],
+  optionsTireurDeplacement: [
+    { key: "immobile", label: "Immobile (SD+0)" },
+    { key: "lent", label: "Lent (SD+3)" },
+    { key: "rapide", label: "Rapide (SD+5)" }
+  ],
+  optionsSoutiens: [
+    { key: "0", label: "Aucun" },
+    { key: "1", label: "Un soutien (+3)" },
+    { key: "2", label: "Deux soutiens (+4)" },
+    { key: "3", label: "Trois soutiens (+5)" }
+  ],
+  optionsStatutResistant: [
+    { key: "commun", label: "Commun" },
+    { key: "clandestin", label: "Clandestin" },
+    { key: "insurge", label: "Insurgé" }
+  ],
+  optionsTypeArme: [
+    {key: "contact", label: "Arme de contact"},
+    {key: "contactjet", label: "Arme de contact et de Jet"},
+    {key: "jet", label: "Arme de Jet"},
+    {key: "tir", label: "Arme de Tir"}
+  ],
+  optionsArtefactBranche: [
+    {key: "alchimie", label: "Alchimie"},
+    {key: "biologie", label: "Biologie"},
+    {key: "electricite", label: "Electricité"},
+    {key: "mecanique", label: "Mécanique"},
+    {key: "scienceesprit", label: "Science de l'Esprit"}
+  ],
+  optionsArtefactBranche2: [
+    {key: "none", label: "Aucune"},
+    {key: "alchimie", label: "Alchimie"},
+    {key: "biologie", label: "Biologie"},
+    {key: "electricite", label: "Electricité"},
+    {key: "mecanique", label: "Mécanique"},
+    {key: "scienceesprit", label: "Science de l'Esprit"}
+  ],
+  optionsTypeContact: [
+    {key: "contact", label: "Contact"},
+    {key: "allie", label: "Allié"}
+  ],
+  optionsTypeMutation: [
+    {key: "tares_communes", label: "Tares et Malformations communes"},
+    {key: "evolutions_communes", label: "Evolutions communes"},
+    {key: "tares_rares", label: "Tares et Malformations rares"},
+    {key: "evolutions_rares", label: "Evolutions rares"},
+    {key: "tares_majeures", label: "Tares et Maformations majeures"},
+    {key: "evolutions_majeures", label: "Evolutions majeures"},
+    {key: "tares_except", label: "Tares et Malformations exceptionnelles"},
+    {key: "evolutions_except", label: "Evolutions exceptionnelles"}
+  ],
+  optionsTypeTalent: [
+    {key: "personnage", label: "Personnage"},
+    {key: "cellule", label: "Cellule"},
+    {key: "traitespece", label: "Trait d'espèce"}
+  ],
+  optionsUseTalent: [
+    {key: "permanent", label: "Permanent"},
+    {key: "sceance", label: "Une fois par scéance"},
+    {key: "scenario", label: "Une fois par scénario"},
+    {key: "jour", label: "Une fois par jour"},
+    {key: "unique", label: "Unique"}
+  ],
+  optionsAutomationEvent: [
+    {key: "on-drop", label: "Drop sur l'acteur"},
+    {key: "prepare-roll", label: "Préparation d'un jet"},
+    {key: "bonus-permanent", label: "Bonus permanent"}
+  ],
+  optionsBonusPermanent: [
+    {key: "vigueur", label: "Vigueur"},
+    {key: "bonus-defensif", label: "Bonus au Seuil de Défense"}
+  ]
+}

modules/hawkmoon-creature-sheet.js

@@ -13,7 +13,7 @@ export class HawkmoonCreatureSheet extends HawkmoonActorSheet {
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
       template: "systems/fvtt-hawkmoon-cyd/templates/creature-sheet.html",
       width: 640,

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,12 +4,12 @@ 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() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "item"],
       template: "systems/fvtt-hawkmoon-cyd/templates/item-sheet.html",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
@@ -48,7 +48,7 @@ export class HawkmoonItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)
+    const objectData = foundry.utils.duplicate(this.object)
     let formData = {
       title: this.title,
       id: this.id,
@@ -64,7 +64,8 @@ export class HawkmoonItemSheet extends ItemSheet {
       owner: this.document.isOwner,
       description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
       mr: (this.object.type == 'specialisation'),
-      isGM: game.user.isGM
+      isGM: game.user.isGM,
+      config: game.system.hawkmoon.config
     }
 
     if (  objectData.type == "don") {
@@ -89,7 +90,7 @@ export class HawkmoonItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   postItem() {
-    let chatData = duplicate(HawkmoonUtility.data(this.item));
+    let chatData = foundry.utils.duplicate(HawkmoonUtility.data(this.item));
     if (this.actor) {
       chatData.actor = { id: this.actor.id };
     }
@@ -132,7 +133,7 @@ export class HawkmoonItemSheet extends ItemSheet {
     html.find('.edit-predilection').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred[index].name = ev.currentTarget.value
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
@@ -140,70 +141,70 @@ export class HawkmoonItemSheet extends ItemSheet {
     html.find('.edit-predilection-description').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       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")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       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")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       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")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       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 = duplicate(this.object.system.predilections)
+      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 => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred.splice(index,1)
       this.object.update( { 'system.predilections': pred })
     })
 
     html.find('#add-automation').click(ev => {
-      let autom = duplicate(this.object.system.automations)
+      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 => {
       const li = $(ev.currentTarget).parents(".automation-item")
       let index = li.data("automation-index")
-      let autom = duplicate(this.object.system.automations)
+      let autom = foundry.utils.duplicate(this.object.system.automations)
       autom.splice(index,1)
       this.object.update( { 'system.automations': autom })
     })
     html.find('.automation-edit-field').change(ev => {
       let index = $(ev.currentTarget).data("automation-index")
       let field = $(ev.currentTarget).data("automation-field")
-      let auto = duplicate(this.object.system.automations)
+      let auto = foundry.utils.duplicate(this.object.system.automations)
       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

@@ -18,6 +18,7 @@ import { HawkmoonCombat } from "./hawkmoon-combat.js";
 import { HawkmoonItem } from "./hawkmoon-item.js";
 import { HawkmoonAutomation } from "./hawkmoon-automation.js";
 import { HawkmoonTokenHud } from "./hawkmoon-hud.js";
+import { HAWKMOON_CONFIG } from "./hawkmoon-config.js";
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -32,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
@@ -50,18 +51,19 @@ Hooks.once("init", async function () {
   CONFIG.Item.documentClass = HawkmoonItem
   game.system.hawkmoon = {
     HawkmoonUtility,
-    HawkmoonAutomation
+    HawkmoonAutomation,
+    config : HAWKMOON_CONFIG
   }
 
   /* -------------------------------------------- */
-  // Register sheet application classes
+  // Regster sheet application classes
-  Actors.unregisterSheet("core", ActorSheet);
+  foundry.documents.collections.Actors.unregisterSheet("core", foundry.appv1.sheets.ActorSheet);
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonActorSheet, { types: ["personnage"], makeDefault: true })
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonActorSheet, { types: ["personnage"], makeDefault: true })
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCreatureSheet, { types: ["creature"], makeDefault: true })
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCreatureSheet, { types: ["creature"], makeDefault: true })
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCelluleSheet, { types: ["cellule"], makeDefault: true });
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCelluleSheet, { types: ["cellule"], makeDefault: true });
 
-  Items.unregisterSheet("core", ItemSheet);
+  foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
-  Items.registerSheet("fvtt-hawkmoon-cyd", HawkmoonItemSheet, { makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", HawkmoonItemSheet, { makeDefault: true })
 
   HawkmoonUtility.init()
   HawkmoonAutomation.init()
@@ -82,6 +84,19 @@ function welcomeMessage() {
     ` });
 }
 
+/* -------------------------------------------- */
+async function importDefaultScene() {
+  let exists = game.scenes.find(j => j.name == "Accueil");
+  if (!exists) {
+    const scenes = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.scenes")
+    let newDocuments = scenes.filter(i => i.name == "Accueil");
+    if (newDocuments) {
+      await game.scenes.documentClass.create(newDocuments);
+      game.scenes.find(i => i.name == "Accueil").activate();
+    }
+  }
+}
+
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -105,6 +120,7 @@ Hooks.once("ready", function () {
     console.log("No stats available, giving up.")
   )
 
+  importDefaultScene()
   welcomeMessage()
 
 });
@@ -122,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 options = { classes: ["HawkmoonDialog"], width: 420, 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 );
+    return new HawkmoonRollDialog(actor, rollData, html, options);
   }
 
   /* -------------------------------------------- */
@@ -16,22 +16,23 @@ export class HawkmoonRollDialog extends Dialog {
     let conf = {
       title: "Test de Capacité",
       content: html,
-      buttons: { 
+      buttons: {
         rolld10: {
-            icon: '<i class="fas fa-check"></i>',
+          icon: '<i class="fas fa-check"></i>',
-            label: "Lancer 1d10",
+          label: "Lancer 1d10",
-            callback: () => { this.roll("d10") } 
+          callback: () => { this.roll("d10") }
-          },
+        },
-          rolld20: {
+        rolld20: {
-            icon: '<i class="fas fa-check"></i>',
+          icon: '<i class="fas fa-check"></i>',
-            label: "Lancer 1d20",
+          label: "Lancer 1d20",
-            callback: () => { this.roll("d20") } 
+          callback: () => { this.roll("d20") }
-          },
+        },
-          cancel: {
+        cancel: {
-            icon: '<i class="fas fa-times"></i>',
+          icon: '<i class="fas fa-times"></i>',
-            label: "Annuler",
+          label: "Annuler",
-            callback: () => { this.close() }
+          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)
   }
 
 
@@ -56,86 +57,87 @@ export class HawkmoonRollDialog extends Dialog {
     function onLoad() {
     }
     $(function () { onLoad(); });
-    
+
-    html.find('#modificateur').change(async (event) =>  {
+    html.find('#modificateur').change(async (event) => {
       this.rollData.modificateur = Number(event.currentTarget.value)
     })
-    html.find('#difficulte').change(async (event) =>  {
+    html.find('#difficulte').change((event) => {
+      console.log("Difficulte: " + event.currentTarget.value)
       this.rollData.difficulte = Number(event.currentTarget.value)
     })
-    html.find('#attrKey').change(async (event) =>  {
+    html.find('#attrKey').change(async (event) => {
       this.rollData.attrKey = String(event.currentTarget.value)
-    })    
+    })
-    html.find('#attrKey2').change(async (event) =>  {
+    html.find('#attrKey2').change(async (event) => {
       this.rollData.attrKey2 = String(event.currentTarget.value)
-    })    
+    })
-    html.find('#select-maitrise').change(async (event) =>  {
+    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

@@ -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 __distanceDifficulte = { "porteecourte": 5, "porteemoyenne": 9, "porteelongue": 14 }
-const __tireurDeplacement = { immobile: 0, lent: 3, rapide: 5}
+const __tireurDeplacement = { immobile: 0, lent: 3, rapide: 5 }
-const __cibleCouvert = { aucun: 0, leger: 5, complet: 10}
+const __cibleCouvert = { aucun: 0, leger: 5, complet: 10 }
-const __tailleCible = { normal: 0, main: 10, enfant: 3, maison: -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);
     })
@@ -114,6 +113,26 @@ export class HawkmoonUtility {
     let logoPause = "systems/fvtt-hawkmoon-cyd/assets/logos/" + game.settings.get("fvtt-hawkmoon-cyd", "hawkmoon-pause-logo") + ".webp"
     let logoImg = document.querySelector('#pause').children[0]
     logoImg.setAttribute('style', `content: url(${logoPause})`)
+
+    game.system.hawkmoon.config.listeNiveauSkill = this.createDirectOptionList(0, 10)
+    game.system.hawkmoon.config.listeNiveauCreature = this.createDirectOptionList(0, 35)
+    game.system.hawkmoon.config.listeNiveauContact = this.createDirectOptionList(1, 3)
+  }
+
+  /* -------------------------------------------- */
+  static createDirectOptionList(min, max) {
+    let options = {};
+    for (let i = min; i <= max; i++) {
+      options[`${i}`] = `${i}`;
+    }
+    return options;
+  }
+  static createArrayOptionList(min, max) {
+    let options = [];
+    for (let i = min; i <= max; i++) {
+      options.push({ key: `${i}`, label: `${i}` });
+    }
+    return options;
   }
 
   /* -------------------------------------------- */
@@ -135,25 +154,25 @@ 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)
       let rollData = message.getFlag("world", "hawkmoon-roll")
       let actor = HawkmoonUtility.getActorFromRollData(rollData)
       await actor.setPredilectionUsed(rollData.competence._id, predIdx)
-      rollData.competence = duplicate(actor.getCompetence(rollData.competence._id))
+      rollData.competence = foundry.utils.duplicate(actor.getCompetence(rollData.competence._id))
       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")
@@ -161,7 +180,7 @@ export class HawkmoonUtility {
       rollData.applyCoupDevastateur = true
       actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
     })
-    
+
   }
 
   /* -------------------------------------------- */
@@ -172,14 +191,11 @@ export class HawkmoonUtility {
       'systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html',
       'systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html',
       'systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau-creature.html',
       'systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html',
       '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);
   }
 
   /* -------------------------------------------- */
@@ -256,15 +272,19 @@ export class HawkmoonUtility {
 
     let id = rollData.rollId;
     let oldRollData = this.rollDataStore[id] || {};
-    let newRollData = mergeObject(oldRollData, rollData);
+    let newRollData = foundry.utils.mergeObject(oldRollData, rollData);
     this.rollDataStore[id] = newRollData;
   }
 
   /* -------------------------------------------- */
   static onSocketMesssage(msg) {
-    if (msg.name == "msg_apply_combativite") {
+    if (msg.msg == "msg_apply_combativite") {
-      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      let defender = game.canvas.tokens.get(msg.data.defenderTokenId)?.actor
-      defender.changeEtatCombativite(msg.data.value)
+      if (defender) {
+        defender.changeEtatCombativite(msg.data.value)
+      } else {
+        console.warn("HawkmoonUtility.onSocketMesssage : Impossible de trouver le token pour appliquer la combativité", msg.defenderTokenId)
+      }
     }
   }
 
@@ -298,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":
@@ -338,17 +358,22 @@ 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) {     
+    if (game.user.isGM) {
       let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
       defender.changeEtatCombativite(value)
     } else {
@@ -364,10 +389,10 @@ export class HawkmoonUtility {
     }
     if (!rollData.attr) {
       rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
-      rollData.attr = duplicate(actor.system.attributs[rollData.attrKey])
+      rollData.attr = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey])
     }
     if (rollData.attrKey2 != "none") {
-      rollData.attr2 = duplicate(actor.system.attributs[rollData.attrKey2])
+      rollData.attr2 = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey2])
     }
 
     if (rollData.maitriseId != "none") {
@@ -379,10 +404,10 @@ export class HawkmoonUtility {
 
     //console.log("BEFORE COMP", rollData)
     if (rollData.competence) {
-      rollData.predilections = duplicate(rollData.competence.system.predilections || [])
+      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)
@@ -406,7 +431,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}`
@@ -415,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) {
+      } else if (rollData.ambidextre2) {
-        rollData.diceFormula += `-5`
+        rollData.diceFormula += `-6`
       }
     }
     if (rollData.defenseurAuSol) {
@@ -437,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) {
@@ -447,24 +472,25 @@ export class HawkmoonUtility {
       rollData.difficulte += __tailleCible[rollData.tailleCible]
       rollData.difficulte += rollData.cibleDeplace ? 3 : 0
       rollData.difficulte += rollData.cibleCaC ? 3 : 0
+      rollData.difficulte += rollData.protectionDefenseur
     }
     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 
 
-    let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
+    // Gestion de la feinte éventuelle
+    rollData.nbCombativitePerdu = 1
+
+    let myRoll = await new Roll(rollData.diceFormula).roll()
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = duplicate(myRoll)
+    rollData.roll = foundry.utils.duplicate(myRoll)
     console.log(">>>> ", myRoll)
 
     rollData.finalResult = myRoll.total
@@ -474,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) {
@@ -496,30 +522,35 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static getCombativiteList(nbActivite) {
-    let list = [ { value: 0, label: "Combatif"}]
+    let list = [{ value: String(0), label: "Combatif" }]
-    for (let i = 1; i < nbActivite-2; i++) {
+    for (let i = 1; i < nbActivite - 2; i++) {
-      list.push({ value: i, label:"Eprouvé " + i} )
+      list.push({ value: String(i), label: "Eprouvé " + i })
     }
-    list[nbActivite-2] = { value: nbActivite-2, label:"Affaibli"}
+    list[nbActivite - 2] = { value: String(nbActivite - 2), label: "Affaibli" }
-    list[nbActivite-1] = { value: nbActivite-1, label:"Très Affaibli"}
+    list[nbActivite - 1] = { value: String(nbActivite - 1), label: "Très Affaibli" }
-    list[nbActivite] = { value: nbActivite, label:"Vaincu"}
+    list[nbActivite] = { value: String(nbActivite), label: "Vaincu" }
     return list
-
   }
+
   /* -------------------------------------------- */
   static async bonusRollHawkmoon(rollData) {
     rollData.bonusFormula = rollData.addedBonus
+    console.log("Bonus Roll Hawkmoon", rollData.bonusFormula)
 
-    let bonusRoll = new Roll(rollData.bonusFormula).roll({ async: false })
+    if (!Number(rollData.bonusFormula)) {
-    await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
+      let bonusRoll = await new Roll(rollData.bonusFormula).roll()
-    rollData.bonusRoll = duplicate(bonusRoll)
+      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.computeResultQuality(rollData)
-
-    this.computeResult(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)
 
   }
@@ -546,7 +577,7 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static blindMessageToGM(chatOptions) {
-    let chatGM = duplicate(chatOptions);
+    let chatGM = foundry.utils.duplicate(chatOptions);
     chatGM.whisper = this.getUsers(user => user.isGM);
     chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
@@ -610,7 +641,7 @@ export class HawkmoonUtility {
   /* -------------------------------------------- */
   static getBasicRollData() {
     let rollData = {
-      rollId: randomID(16),
+      rollId: foundry.utils.randomID(16),
       rollMode: game.settings.get("core", "rollMode"),
       modificateursOptions: this.getModificateurOptions(),
       pointAmeOptions: this.getPointAmeOptions(),
@@ -629,11 +660,11 @@ export class HawkmoonUtility {
       distanceTir: "porteemoyenne",
       attaqueCharge: false,
       attaqueDesarme: false,
-      attaqueAmbidextre1 : false,
+      attaqueAmbidextre1: false,
-      attaqueAmbidextre2 : false,
+      attaqueAmbidextre2: false,
-      chargeCavalerie : false,
+      chargeCavalerie: false,
-      contenir : false,
+      contenir: false,
-      soutiens : 0
+      soutiens: 0
     }
     return rollData
   }
@@ -645,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) {
@@ -653,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
           }
@@ -675,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")
@@ -694,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")
@@ -715,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)
@@ -747,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-000136
+MANIFEST-000329

packs/aides-de-jeu/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.566443 7f2f096006c0 Recovering log #134
+2025/11/21-21:17:11.288531 7f34ccff96c0 Recovering log #327
-2024/04/01-22:07:51.577334 7f2f096006c0 Delete type=3 #132
+2025/11/21-21:17:11.303357 7f34ccff96c0 Delete type=3 #325
-2024/04/01-22:07:51.577410 7f2f096006c0 Delete type=0 #134
+2025/11/21-21:17:11.303441 7f34ccff96c0 Delete type=0 #327
-2024/04/01-22:13:32.050850 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.182000 7f322ffff6c0 Level-0 table #332: started
-2024/04/01-22:13:32.050905 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.182040 7f322ffff6c0 Level-0 table #332: 0 bytes OK
-2024/04/01-22:13:32.057948 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.189103 7f322ffff6c0 Delete type=0 #330
-2024/04/01-22:13:32.058093 7f2f03a006c0 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.199156 7f322ffff6c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
-2024/04/01-22:13:32.058108 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.296804 7f2f0aa006c0 Recovering log #130
+2025/10/26-15:18:50.824844 7f058d1fa6c0 Recovering log #323
-2024/04/01-20:54:39.306972 7f2f0aa006c0 Delete type=3 #128
+2025/10/26-15:18:50.834381 7f058d1fa6c0 Delete type=3 #321
-2024/04/01-20:54:39.307035 7f2f0aa006c0 Delete type=0 #130
+2025/10/26-15:18:50.834446 7f058d1fa6c0 Delete type=0 #323
-2024/04/01-22:07:29.430307 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.999570 7f0586bff6c0 Level-0 table #328: started
-2024/04/01-22:07:29.430369 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.999597 7f0586bff6c0 Level-0 table #328: 0 bytes OK
-2024/04/01-22:07:29.436789 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:38.035738 7f0586bff6c0 Delete type=0 #326
-2024/04/01-22:07:29.450601 7f2f03a006c0 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.190124 7f0586bff6c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
-2024/04/01-22:07:29.450636 7f2f03a006c0 Manual compaction at level-1 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-000136
+MANIFEST-000328

packs/armes/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.476426 7f2f08c006c0 Recovering log #134
+2025/11/21-21:17:11.119952 7f34cd7fa6c0 Recovering log #326
-2024/04/01-22:07:51.486878 7f2f08c006c0 Delete type=3 #132
+2025/11/21-21:17:11.135840 7f34cd7fa6c0 Delete type=3 #324
-2024/04/01-22:07:51.486968 7f2f08c006c0 Delete type=0 #134
+2025/11/21-21:17:11.135940 7f34cd7fa6c0 Delete type=0 #326
-2024/04/01-22:13:31.982119 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.115063 7f322ffff6c0 Level-0 table #331: started
-2024/04/01-22:13:31.982141 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.115090 7f322ffff6c0 Level-0 table #331: 0 bytes OK
-2024/04/01-22:13:31.988528 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.121038 7f322ffff6c0 Delete type=0 #329
-2024/04/01-22:13:32.002072 7f2f03a006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:32.002126 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.206727 7f2f096006c0 Recovering log #130
+2025/10/26-15:18:50.724903 7f05877fe6c0 Recovering log #322
-2024/04/01-20:54:39.217337 7f2f096006c0 Delete type=3 #128
+2025/10/26-15:18:50.734667 7f05877fe6c0 Delete type=3 #320
-2024/04/01-20:54:39.217418 7f2f096006c0 Delete type=0 #130
+2025/10/26-15:18:50.734726 7f05877fe6c0 Delete type=0 #322
-2024/04/01-22:07:29.396472 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.786399 7f0586bff6c0 Level-0 table #327: started
-2024/04/01-22:07:29.396496 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.786438 7f0586bff6c0 Level-0 table #327: 0 bytes OK
-2024/04/01-22:07:29.402800 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:37.828201 7f0586bff6c0 Delete type=0 #325
-2024/04/01-22:07:29.402967 7f2f03a006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.402999 7f2f03a006c0 Manual compaction at level-1 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-000136
+MANIFEST-000328

packs/competences-creatures/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.452809 7f2f08c006c0 Recovering log #134
+2025/11/21-21:17:11.082663 7f34ccff96c0 Recovering log #326
-2024/04/01-22:07:51.463021 7f2f08c006c0 Delete type=3 #132
+2025/11/21-21:17:11.097415 7f34ccff96c0 Delete type=3 #324
-2024/04/01-22:07:51.463077 7f2f08c006c0 Delete type=0 #134
+2025/11/21-21:17:11.097522 7f34ccff96c0 Delete type=0 #326
-2024/04/01-22:13:31.975221 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.082672 7f322ffff6c0 Level-0 table #331: started
-2024/04/01-22:13:31.975257 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.082698 7f322ffff6c0 Level-0 table #331: 0 bytes OK
-2024/04/01-22:13:31.982008 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.088631 7f322ffff6c0 Delete type=0 #329
-2024/04/01-22:13:32.002059 7f2f03a006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:32.002136 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.182267 7f2f096006c0 Recovering log #130
+2025/10/26-15:18:50.698736 7f058c9f96c0 Recovering log #322
-2024/04/01-20:54:39.192171 7f2f096006c0 Delete type=3 #128
+2025/10/26-15:18:50.709788 7f058c9f96c0 Delete type=3 #320
-2024/04/01-20:54:39.192286 7f2f096006c0 Delete type=0 #130
+2025/10/26-15:18:50.709858 7f058c9f96c0 Delete type=0 #322
-2024/04/01-22:07:29.376886 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.564245 7f0586bff6c0 Level-0 table #327: started
-2024/04/01-22:07:29.376924 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.564294 7f0586bff6c0 Level-0 table #327: 0 bytes OK
-2024/04/01-22:07:29.382840 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:37.604220 7f0586bff6c0 Delete type=0 #325
-2024/04/01-22:07:29.402928 7f2f03a006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.402961 7f2f03a006c0 Manual compaction at level-1 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-000136
+MANIFEST-000328

packs/competences/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.425994 7f2f08c006c0 Recovering log #134
+2025/11/21-21:17:11.044217 7f34ce7fc6c0 Recovering log #326
-2024/04/01-22:07:51.437211 7f2f08c006c0 Delete type=3 #132
+2025/11/21-21:17:11.059351 7f34ce7fc6c0 Delete type=3 #324
-2024/04/01-22:07:51.437281 7f2f08c006c0 Delete type=0 #134
+2025/11/21-21:17:11.059409 7f34ce7fc6c0 Delete type=0 #326
-2024/04/01-22:13:31.947285 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.076024 7f322ffff6c0 Level-0 table #331: started
-2024/04/01-22:13:31.947371 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.076057 7f322ffff6c0 Level-0 table #331: 0 bytes OK
-2024/04/01-22:13:31.954193 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.082546 7f322ffff6c0 Delete type=0 #329
-2024/04/01-22:13:31.965060 7f2f03a006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:31.975114 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.156310 7f2f096006c0 Recovering log #130
+2025/10/26-15:18:50.672996 7f058d1fa6c0 Recovering log #322
-2024/04/01-20:54:39.166480 7f2f096006c0 Delete type=3 #128
+2025/10/26-15:18:50.683402 7f058d1fa6c0 Delete type=3 #320
-2024/04/01-20:54:39.166647 7f2f096006c0 Delete type=0 #130
+2025/10/26-15:18:50.683496 7f058d1fa6c0 Delete type=0 #322
-2024/04/01-22:07:29.363532 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.604372 7f0586bff6c0 Level-0 table #327: started
-2024/04/01-22:07:29.363586 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.604409 7f0586bff6c0 Level-0 table #327: 0 bytes OK
-2024/04/01-22:07:29.370456 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:37.638938 7f0586bff6c0 Delete type=0 #325
-2024/04/01-22:07:29.376809 7f2f03a006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.376842 7f2f03a006c0 Manual compaction at level-1 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-000136
+MANIFEST-000328

packs/equipement/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.500239 7f2f08c006c0 Recovering log #134
+2025/11/21-21:17:11.157103 7f34ce7fc6c0 Recovering log #326
-2024/04/01-22:07:51.510328 7f2f08c006c0 Delete type=3 #132
+2025/11/21-21:17:11.172875 7f34ce7fc6c0 Delete type=3 #324
-2024/04/01-22:07:51.510446 7f2f08c006c0 Delete type=0 #134
+2025/11/21-21:17:11.172939 7f34ce7fc6c0 Delete type=0 #326
-2024/04/01-22:13:32.002229 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.095092 7f322ffff6c0 Level-0 table #331: started
-2024/04/01-22:13:32.002366 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.095126 7f322ffff6c0 Level-0 table #331: 0 bytes OK
-2024/04/01-22:13:32.009059 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.102295 7f322ffff6c0 Delete type=0 #329
-2024/04/01-22:13:32.029514 7f2f03a006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:32.029552 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.230551 7f2f096006c0 Recovering log #130
+2025/10/26-15:18:50.749067 7f058d1fa6c0 Recovering log #322
-2024/04/01-20:54:39.241470 7f2f096006c0 Delete type=3 #128
+2025/10/26-15:18:50.759273 7f058d1fa6c0 Delete type=3 #320
-2024/04/01-20:54:39.241521 7f2f096006c0 Delete type=0 #130
+2025/10/26-15:18:50.759337 7f058d1fa6c0 Delete type=0 #322
-2024/04/01-22:07:29.409907 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.743796 7f0586bff6c0 Level-0 table #327: started
-2024/04/01-22:07:29.409931 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.743858 7f0586bff6c0 Level-0 table #327: 0 bytes OK
-2024/04/01-22:07:29.416151 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:37.786277 7f0586bff6c0 Delete type=0 #325
-2024/04/01-22:07:29.430115 7f2f03a006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.430150 7f2f03a006c0 Manual compaction at level-1 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-000136
+MANIFEST-000328

packs/historiques/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.464548 7f2f096006c0 Recovering log #134
+2025/11/21-21:17:11.100312 7f34ce7fc6c0 Recovering log #326
-2024/04/01-22:07:51.474762 7f2f096006c0 Delete type=3 #132
+2025/11/21-21:17:11.117500 7f34ce7fc6c0 Delete type=3 #324
-2024/04/01-22:07:51.474814 7f2f096006c0 Delete type=0 #134
+2025/11/21-21:17:11.117567 7f34ce7fc6c0 Delete type=0 #326
-2024/04/01-22:13:31.994868 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.069446 7f322ffff6c0 Level-0 table #331: started
-2024/04/01-22:13:31.994897 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.069505 7f322ffff6c0 Level-0 table #331: 0 bytes OK
-2024/04/01-22:13:32.001931 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.075899 7f322ffff6c0 Delete type=0 #329
-2024/04/01-22:13:32.002088 7f2f03a006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:32.002104 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.194244 7f2f0aa006c0 Recovering log #130
+2025/10/26-15:18:50.712053 7f058d1fa6c0 Recovering log #322
-2024/04/01-20:54:39.205006 7f2f0aa006c0 Delete type=3 #128
+2025/10/26-15:18:50.722592 7f058d1fa6c0 Delete type=3 #320
-2024/04/01-20:54:39.205058 7f2f0aa006c0 Delete type=0 #130
+2025/10/26-15:18:50.722674 7f058d1fa6c0 Delete type=0 #322
-2024/04/01-22:07:29.382979 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.639047 7f0586bff6c0 Level-0 table #327: started
-2024/04/01-22:07:29.383007 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.639075 7f0586bff6c0 Level-0 table #327: 0 bytes OK
-2024/04/01-22:07:29.390105 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:37.675760 7f0586bff6c0 Delete type=0 #325
-2024/04/01-22:07:29.402938 7f2f03a006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.402955 7f2f03a006c0 Manual compaction at level-1 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-000046
+MANIFEST-000238

packs/mutations/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.439395 7f2f096006c0 Recovering log #44
+2025/11/21-21:17:11.062660 7f34cdffb6c0 Recovering log #236
-2024/04/01-22:07:51.449639 7f2f096006c0 Delete type=3 #42
+2025/11/21-21:17:11.079663 7f34cdffb6c0 Delete type=3 #234
-2024/04/01-22:07:51.449809 7f2f096006c0 Delete type=0 #44
+2025/11/21-21:17:11.079731 7f34cdffb6c0 Delete type=0 #236
-2024/04/01-22:13:31.988644 7f2f03a006c0 Level-0 table #49: started
+2025/11/21-21:20:34.088817 7f322ffff6c0 Level-0 table #241: started
-2024/04/01-22:13:31.988670 7f2f03a006c0 Level-0 table #49: 0 bytes OK
+2025/11/21-21:20:34.088856 7f322ffff6c0 Level-0 table #241: 0 bytes OK
-2024/04/01-22:13:31.994741 7f2f03a006c0 Delete type=0 #47
+2025/11/21-21:20:34.094750 7f322ffff6c0 Delete type=0 #239
-2024/04/01-22:13:32.002081 7f2f03a006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:32.002145 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.168907 7f2f0aa006c0 Recovering log #40
+2025/10/26-15:18:50.686224 7f0587fff6c0 Recovering log #232
-2024/04/01-20:54:39.180221 7f2f0aa006c0 Delete type=3 #38
+2025/10/26-15:18:50.696079 7f0587fff6c0 Delete type=3 #230
-2024/04/01-20:54:39.180329 7f2f0aa006c0 Delete type=0 #40
+2025/10/26-15:18:50.696162 7f0587fff6c0 Delete type=0 #232
-2024/04/01-22:07:29.370572 7f2f03a006c0 Level-0 table #45: started
+2025/10/26-15:36:37.675951 7f0586bff6c0 Level-0 table #237: started
-2024/04/01-22:07:29.370596 7f2f03a006c0 Level-0 table #45: 0 bytes OK
+2025/10/26-15:36:37.676003 7f0586bff6c0 Level-0 table #237: 0 bytes OK
-2024/04/01-22:07:29.376673 7f2f03a006c0 Delete type=0 #43
+2025/10/26-15:36:37.709795 7f0586bff6c0 Delete type=0 #235
-2024/04/01-22:07:29.376821 7f2f03a006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.376834 7f2f03a006c0 Manual compaction at level-1 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-000136
+MANIFEST-000328

packs/profils/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.513697 7f2f096006c0 Recovering log #134
+2025/11/21-21:17:11.175622 7f34cd7fa6c0 Recovering log #326
-2024/04/01-22:07:51.524162 7f2f096006c0 Delete type=3 #132
+2025/11/21-21:17:11.190667 7f34cd7fa6c0 Delete type=3 #324
-2024/04/01-22:07:51.524250 7f2f096006c0 Delete type=0 #134
+2025/11/21-21:17:11.190757 7f34cd7fa6c0 Delete type=0 #326
-2024/04/01-22:13:32.009193 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.109081 7f322ffff6c0 Level-0 table #331: started
-2024/04/01-22:13:32.009221 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.109106 7f322ffff6c0 Level-0 table #331: 0 bytes OK
-2024/04/01-22:13:32.016206 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.114933 7f322ffff6c0 Delete type=0 #329
-2024/04/01-22:13:32.029527 7f2f03a006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:32.029566 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.244713 7f2f0aa006c0 Recovering log #130
+2025/10/26-15:18:50.761639 7f05877fe6c0 Recovering log #322
-2024/04/01-20:54:39.256127 7f2f0aa006c0 Delete type=3 #128
+2025/10/26-15:18:50.771506 7f05877fe6c0 Delete type=3 #320
-2024/04/01-20:54:39.256187 7f2f0aa006c0 Delete type=0 #130
+2025/10/26-15:18:50.771562 7f05877fe6c0 Delete type=0 #322
-2024/04/01-22:07:29.403047 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.710125 7f0586bff6c0 Level-0 table #327: started
-2024/04/01-22:07:29.403129 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.710175 7f0586bff6c0 Level-0 table #327: 0 bytes OK
-2024/04/01-22:07:29.409782 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:37.743520 7f0586bff6c0 Delete type=0 #325
-2024/04/01-22:07:29.430103 7f2f03a006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.430143 7f2f03a006c0 Manual compaction at level-1 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-000136
+MANIFEST-000328

packs/protections/LOG

@@ -1,8 +1,8 @@
-2024/04/01-22:07:51.488998 7f2f096006c0 Recovering log #134
+2025/11/21-21:17:11.139151 7f34cdffb6c0 Recovering log #326
-2024/04/01-22:07:51.498770 7f2f096006c0 Delete type=3 #132
+2025/11/21-21:17:11.154714 7f34cdffb6c0 Delete type=3 #324
-2024/04/01-22:07:51.498840 7f2f096006c0 Delete type=0 #134
+2025/11/21-21:17:11.154795 7f34cdffb6c0 Delete type=0 #326
-2024/04/01-22:13:32.023304 7f2f03a006c0 Level-0 table #139: started
+2025/11/21-21:20:34.102428 7f322ffff6c0 Level-0 table #331: started
-2024/04/01-22:13:32.023327 7f2f03a006c0 Level-0 table #139: 0 bytes OK
+2025/11/21-21:20:34.102452 7f322ffff6c0 Level-0 table #331: 0 bytes OK
-2024/04/01-22:13:32.029397 7f2f03a006c0 Delete type=0 #137
+2025/11/21-21:20:34.108966 7f322ffff6c0 Delete type=0 #329
-2024/04/01-22:13:32.029559 7f2f03a006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:13:32.029582 7f2f03a006c0 Manual compaction at level-1 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/04/01-20:54:39.219310 7f2f0aa006c0 Recovering log #130
+2025/10/26-15:18:50.736841 7f058c9f96c0 Recovering log #322
-2024/04/01-20:54:39.229233 7f2f0aa006c0 Delete type=3 #128
+2025/10/26-15:18:50.746818 7f058c9f96c0 Delete type=3 #320
-2024/04/01-20:54:39.229286 7f2f0aa006c0 Delete type=0 #130
+2025/10/26-15:18:50.746894 7f058c9f96c0 Delete type=0 #322
-2024/04/01-22:07:29.390224 7f2f03a006c0 Level-0 table #135: started
+2025/10/26-15:36:37.828362 7f0586bff6c0 Level-0 table #327: started
-2024/04/01-22:07:29.390248 7f2f03a006c0 Level-0 table #135: 0 bytes OK
+2025/10/26-15:36:37.828487 7f0586bff6c0 Level-0 table #327: 0 bytes OK
-2024/04/01-22:07:29.396354 7f2f03a006c0 Delete type=0 #133
+2025/10/26-15:36:37.860797 7f0586bff6c0 Delete type=0 #325
-2024/04/01-22:07:29.402947 7f2f03a006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
+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)
-2024/04/01-22:07:29.402979 7f2f03a006c0 Manual compaction at level-1 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

@@ -0,0 +1 @@
+MANIFEST-000167

packs/scenes/LOG

@@ -0,0 +1,8 @@
+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)