Correction sur SD à distance

.gitignore

@@ -8,7 +8,3 @@ todo.md
 /jsconfig.json
 /package.json
 /package-lock.json
-/packs/*/
-/packs/*/CURRENT
-/packs/*/LOG
-/packs/*/LOCK

modules/hawkmoon-actor-sheet.js

@@ -146,6 +146,23 @@ export class HawkmoonActorSheet extends ActorSheet {
       let armeId  = li.data("item-id")
       this.actor.rollArmeOffensif(armeId)
     })
+    
+    html.find('.roll-assomer').click((event) => {
+      this.actor.rollAssomer()
+    })
+    html.find('.roll-coup-bas').click((event) => {
+      this.actor.rollCoupBas()
+    })
+    html.find('.roll-immobiliser').click((event) => {
+      this.actor.rollImmobiliser()
+    })
+    html.find('.roll-repousser').click((event) => {
+      this.actor.rollRepousser()
+    })
+    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")

modules/hawkmoon-actor.js

@@ -74,8 +74,8 @@ export class HawkmoonActor extends Actor {
       arme.system.competence = 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
+      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
+      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
@@ -211,7 +211,7 @@ export class HawkmoonActor extends Actor {
       vitesseTotal: this.getVitesseBase() + this.system.combat.vitessebonus,
       defenseBase: this.getDefenseBase(),
       protection: this.getProtection(),
-      defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite()
+      defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite() + (this.system.combat.defensetotale ? 3 : 0)
     }
     return combat
   }
@@ -388,6 +388,9 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   changeEtatCombativite(value) {
+    if ( value === "vaincu") {
+      value = 200
+    }
     let sante = duplicate(this.system.sante)
     sante.etat += Number(value)
     sante.etat = Math.max(sante.etat, 0)
@@ -567,6 +570,9 @@ export class HawkmoonActor extends Actor {
     rollData.talents = []
     rollData.attrKey2 = "none"
     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.isMonte = this.system.combat.monte
 
     if (attrKey) {
       rollData.attrKey = attrKey
@@ -619,6 +625,53 @@ export class HawkmoonActor extends Actor {
     let rollDialog = await HawkmoonRollDialog.create(this, rollData)
     rollDialog.render(true)
   }
+  /* -------------------------------------------- */
+  async rollAssomer() {
+    let rollData = this.getCommonRollData("pui", undefined, "Filouterie")
+    rollData.assomer = true
+    rollData.conditionsCommunes = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
+  /* -------------------------------------------- */
+  async rollCoupBas() {
+    let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
+    rollData.coupBas = true
+    rollData.conditionsCommunes = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
+  /* -------------------------------------------- */
+  async rollImmobiliser() {
+    let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
+    rollData.immobiliser = true
+    rollData.conditionsCommunes = true
+    rollData.cibleconsciente = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
+  /* -------------------------------------------- */
+  async rollRepousser() {
+    let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
+    rollData.repousser = true
+    rollData.conditionsCommunes = true
+    rollData.cibleconsciente = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
+  /* -------------------------------------------- */
+  async rollDesengager() {
+    let rollData = this.getCommonRollData("adr", undefined, "Mouvements")
+    rollData.desengager = true
+    rollData.conditionsCommunes = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
   
   /* -------------------------------------------- */
   async rollArmeDegats(armeId, targetVigueur = undefined, rollDataInput = undefined) {
@@ -641,11 +694,17 @@ export class HawkmoonActor extends Actor {
       if (rollDataInput?.attaqueCharge) {
         bonus = 5
       }
+      if (rollDataInput?.chargeCavalerie) {
+        bonus = 6
+      }
       roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
     } else {
       if (rollDataInput?.attaqueCharge) {
         bonus = 3
       }
+      if (rollDataInput?.chargeCavalerie) {
+        bonus = 4
+      }
       roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
     }
     await HawkmoonUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"));
@@ -653,7 +712,7 @@ export class HawkmoonActor extends Actor {
     if (targetVigueur) {
       nbEtatPerdus = Math.floor(roll.total / targetVigueur)
     } 
-    console.log(roll)
+    //console.log(roll)
     let rollData = {
       arme: arme,
       finalResult: roll.total,

modules/hawkmoon-roll-dialog.js

@@ -93,6 +93,15 @@ export class HawkmoonRollDialog extends Dialog {
     html.find('#defenseur-au-sol').change((event) => {
       this.rollData.defenseurAuSol = event.currentTarget.checked      
     })
+    html.find('#ambidextre-1').change((event) => {
+      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      
     })
@@ -108,6 +117,21 @@ export class HawkmoonRollDialog extends Dialog {
     html.find('#attaque-charge').change((event) => {
       this.rollData.attaqueCharge = event.currentTarget.checked      
     })
+    html.find('#charge-cavalerie').change((event) => {
+      this.rollData.chargeCavalerie = event.currentTarget.checked      
+    })
+    html.find('#attaquants-multiple').change((event) => {
+      this.rollData.attaquantsMultiples = event.currentTarget.checked      
+    })
+    html.find('#soutiens').change((event) => {
+      this.rollData.soutiens = Number(event.currentTarget.value)     
+    })
+    html.find('#feinte').change((event) => {
+      this.rollData.feinte = event.currentTarget.checked    
+    })
+    html.find('#contenir').change((event) => {
+      this.rollData.contenir = event.currentTarget.checked      
+    })
     html.find('#attaque-desarme').change((event) => {
       this.rollData.attaqueDesarme = event.currentTarget.checked      
     })

modules/hawkmoon-utility.js

@@ -140,7 +140,7 @@ export class HawkmoonUtility {
       let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       await actor.setPredilectionUsed(rollData.competence._id, predIdx)
       rollData.competence = duplicate(actor.getCompetence(rollData.competence._id))
       HawkmoonUtility.rollHawkmoon(rollData)
@@ -150,14 +150,14 @@ export class HawkmoonUtility {
       let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
     })
     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")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       rollData.applyCoupDevastateur = true
       actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
     })
@@ -411,6 +411,16 @@ export class HawkmoonUtility {
     if (rollData.bonusArmeNaturelle) {
       rollData.diceFormula += `+${rollData.bonusArmeNaturelle}`
     }
+    if (rollData.attaquantsMultiples) {
+      rollData.diceFormula += `+3`
+    }
+    if (rollData.hasAmbidextre) {
+      if ( rollData.attaqueAmbidextre1) {
+        rollData.diceFormula += `-3`
+      } else if ( rollData.attaqueAmbidextre2) {
+        rollData.diceFormula += `-5`
+      }
+    }
     if (rollData.defenseurAuSol) {
       rollData.diceFormula += `+3`
     }
@@ -426,6 +436,9 @@ export class HawkmoonUtility {
     if (rollData.defenseurImmobilise) {
       rollData.diceFormula += `+5`
     }
+    if (rollData.soutiens > 0) { // 1 soutien = +3, 2 soutiens = +4, 3 soutiens = +5
+      rollData.diceFormula += `+${rollData.soutiens+2}`
+    }
 
     if (rollData.arme?.system.isDistance) {
       rollData.difficulte = __distanceDifficulte[rollData.distanceTir]
@@ -434,6 +447,7 @@ 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
@@ -446,6 +460,9 @@ export class HawkmoonUtility {
       rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}`
     }
     
+    // Gestion de la feinte éventuelle
+    rollData.nbCombativitePerdu = 1 
+
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
     rollData.roll = duplicate(myRoll)
@@ -456,15 +473,26 @@ export class HawkmoonUtility {
     if (rollData.isInit) {
       actor.setFlag("world", "last-initiative", rollData.finalResult)
     }
+    if (rollData.feinte) {
+      actor.changeBonneAventure(-1)
+      if ( rollData.isHeroique) {
+        rollData.nbCombativitePerdu = "vaincu"
+      } else if  ( rollData.isSuccess) {
+        rollData.nbCombativitePerdu = 2
+      }
+    }
 
     this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
     }, rollData)
 
-    if (rollData.arme && rollData.isSuccess && rollData.defenderTokenId) {
+    if ( (rollData.coupBas || rollData.arme) && rollData.isSuccess && rollData.defenderTokenId) {
-      this.applyCombativite(rollData, 1)
+      this.applyCombativite(rollData, rollData.nbCombativitePerdu)
+    }
+    if (rollData.coupBas && rollData.isSuccess && rollData.defenderTokenId) {
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      defender.incDecAdversite("bleue", -2)
     }
-
   }
 
   /* -------------------------------------------- */
@@ -601,7 +629,12 @@ export class HawkmoonUtility {
       cibleCouvert: "aucun",
       distanceTir: "porteemoyenne",
       attaqueCharge: false,
-      attaqueDesarme: false
+      attaqueDesarme: false,
+      attaqueAmbidextre1 : false,
+      attaqueAmbidextre2 : false,
+      chargeCavalerie : false,
+      contenir : false,
+      soutiens : 0
     }
     return rollData
   }
@@ -615,9 +648,17 @@ export class HawkmoonUtility {
       rollData.armeDefense = defender.getBestDefenseValue()
       rollData.targetVigueur = defender.getVigueur()
       rollData.protectionDefenseur = defender.getProtection()
-      if (rollData.armeDefense) {
+      if (rollData.immobiliser || rollData.repousser) {
+        let combatValues = defender.getCombatValues()
+        rollData.difficulte = combatValues.defenseTotal + (rollData.armeDefense && rollData.cibleconsciente ? 5 : 0)
+      } else if (rollData.coupBas) {
+        let combatValues = defender.getCombatValues()
+        rollData.difficulte = combatValues.defenseTotal
+      }else if ( rollData.assomer) {
+        rollData.difficulte = 3 + (defender.system.attributs.tre.value * 2)
+      } else if (rollData.armeDefense) {
         rollData.difficulte = rollData.armeDefense.system.totalDefensif
-        if ( !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
           }
@@ -639,7 +680,7 @@ export class HawkmoonUtility {
     let msg = game.messages.get(msgId)
     if (msg) {
       let rollData = msg.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       actor.changeBonneAventure(changed)
       rollData.isReroll = true
       rollData.textBonus = "Bonus de Points d'Aventure"
@@ -658,7 +699,7 @@ export class HawkmoonUtility {
     let msg = game.messages.get(msgId)
     if (msg) {
       let rollData = msg.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       actor.changeEclat(changed)
       rollData.isReroll = true
       rollData.textBonus = "Bonus d'Eclat"
@@ -677,13 +718,13 @@ export class HawkmoonUtility {
     let canApplyBA = function (li) {
       let message = game.messages.get(li.attr("data-message-id"))
       let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      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 rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       return (!rollData.isReroll && actor.getEclat() > 0)
     }
     options.push(

packs/aides-de-jeu/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/aides-de-jeu/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:44.588303 7fcc654006c0 Recovering log #150
+2024/04/24-19:19:45.046737 7fcc654006c0 Delete type=3 #148
+2024/04/24-19:19:45.047257 7fcc654006c0 Delete type=0 #150
+2024/04/24-20:38:33.674583 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.674627 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.681197 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.681325 7fcc5e4006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.681347 7fcc5e4006c0 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

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.940864 7f38a3e006c0 Recovering log #146
+2024/04/07-18:44:43.951368 7f38a3e006c0 Delete type=3 #144
+2024/04/07-18:44:43.951425 7f38a3e006c0 Delete type=0 #146
+2024/04/07-18:53:15.757658 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.757696 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.765139 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.765299 7f38a10006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.765326 7f38a10006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)

packs/armes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/armes/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:43.144098 7fcc5fe006c0 Recovering log #150
+2024/04/24-19:19:43.367448 7fcc5fe006c0 Delete type=3 #148
+2024/04/24-19:19:43.367549 7fcc5fe006c0 Delete type=0 #150
+2024/04/24-20:38:33.619450 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.619488 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.626512 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.632878 7fcc5e4006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.639837 7fcc5e4006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)

packs/armes/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.841800 7f38a2a006c0 Recovering log #146
+2024/04/07-18:44:43.851587 7f38a2a006c0 Delete type=3 #144
+2024/04/07-18:44:43.851700 7f38a2a006c0 Delete type=0 #146
+2024/04/07-18:53:15.687706 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.687751 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.694223 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.709272 7f38a10006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.709352 7f38a10006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)

packs/competences-creatures/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/competences-creatures/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:43.017708 7fcc64a006c0 Recovering log #150
+2024/04/24-19:19:43.076452 7fcc64a006c0 Delete type=3 #148
+2024/04/24-19:19:43.076601 7fcc64a006c0 Delete type=0 #150
+2024/04/24-20:38:33.605428 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.605456 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.612661 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.619414 7fcc5e4006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.626638 7fcc5e4006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)

packs/competences-creatures/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.814328 7f38a2a006c0 Recovering log #146
+2024/04/07-18:44:43.824924 7f38a2a006c0 Delete type=3 #144
+2024/04/07-18:44:43.825056 7f38a2a006c0 Delete type=0 #146
+2024/04/07-18:53:15.694330 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.694352 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.702258 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.709293 7f38a10006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.709368 7f38a10006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)

packs/competences/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/competences/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:42.882823 7fcc64a006c0 Recovering log #150
+2024/04/24-19:19:42.947075 7fcc64a006c0 Delete type=3 #148
+2024/04/24-19:19:42.947209 7fcc64a006c0 Delete type=0 #150
+2024/04/24-20:38:33.592157 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.592206 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.598509 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.605418 7fcc5e4006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.612914 7fcc5e4006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)

packs/competences/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.786249 7f38a2a006c0 Recovering log #146
+2024/04/07-18:44:43.797379 7f38a2a006c0 Delete type=3 #144
+2024/04/07-18:44:43.797432 7f38a2a006c0 Delete type=0 #146
+2024/04/07-18:53:15.681177 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.681197 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.687480 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.709243 7f38a10006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.709312 7f38a10006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)

packs/equipement/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/equipement/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:43.562687 7fcc5fe006c0 Recovering log #150
+2024/04/24-19:19:43.720740 7fcc5fe006c0 Delete type=3 #148
+2024/04/24-19:19:43.720811 7fcc5fe006c0 Delete type=0 #150
+2024/04/24-20:38:33.632917 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.632957 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.639646 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.647315 7fcc5e4006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.653621 7fcc5e4006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)

packs/equipement/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.869311 7f38a2a006c0 Recovering log #146
+2024/04/07-18:44:43.880871 7f38a2a006c0 Delete type=3 #144
+2024/04/07-18:44:43.880923 7f38a2a006c0 Delete type=0 #146
+2024/04/07-18:53:15.709571 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.709616 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.716550 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.736946 7f38a10006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.736993 7f38a10006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)

packs/historiques/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/historiques/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:43.080280 7fcc5fe006c0 Recovering log #150
+2024/04/24-19:19:43.137577 7fcc5fe006c0 Delete type=3 #148
+2024/04/24-19:19:43.137905 7fcc5fe006c0 Delete type=0 #150
+2024/04/24-20:38:33.612932 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.613011 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.619236 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.626625 7fcc5e4006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.632899 7fcc5e4006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)

packs/historiques/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.827816 7f38a3e006c0 Recovering log #146
+2024/04/07-18:44:43.838730 7f38a3e006c0 Delete type=3 #144
+2024/04/07-18:44:43.838786 7f38a3e006c0 Delete type=0 #146
+2024/04/07-18:53:15.702497 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.702540 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.708964 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.709333 7f38a10006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.709410 7f38a10006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)

packs/mutations/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000062

packs/mutations/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:42.952046 7fcc5fe006c0 Recovering log #60
+2024/04/24-19:19:43.001963 7fcc5fe006c0 Delete type=3 #58
+2024/04/24-19:19:43.002046 7fcc5fe006c0 Delete type=0 #60
+2024/04/24-20:38:33.598679 7fcc5e4006c0 Level-0 table #65: started
+2024/04/24-20:38:33.598713 7fcc5e4006c0 Level-0 table #65: 0 bytes OK
+2024/04/24-20:38:33.605307 7fcc5e4006c0 Delete type=0 #63
+2024/04/24-20:38:33.612894 7fcc5e4006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.619433 7fcc5e4006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)

packs/mutations/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.800976 7f38a3e006c0 Recovering log #56
+2024/04/07-18:44:43.810946 7f38a3e006c0 Delete type=3 #54
+2024/04/07-18:44:43.811011 7f38a3e006c0 Delete type=0 #56
+2024/04/07-18:53:15.674292 7f38a10006c0 Level-0 table #61: started
+2024/04/07-18:53:15.674318 7f38a10006c0 Level-0 table #61: 0 bytes OK
+2024/04/07-18:53:15.680930 7f38a10006c0 Delete type=0 #59
+2024/04/07-18:53:15.681066 7f38a10006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.681085 7f38a10006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)

packs/profils/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/profils/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:43.730272 7fcc654006c0 Recovering log #150
+2024/04/24-19:19:43.889184 7fcc654006c0 Delete type=3 #148
+2024/04/24-19:19:43.889335 7fcc654006c0 Delete type=0 #150
+2024/04/24-20:38:33.639856 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.639921 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.647189 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.653608 7fcc5e4006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.660740 7fcc5e4006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)

packs/profils/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.885807 7f38a3e006c0 Recovering log #146
+2024/04/07-18:44:43.895718 7f38a3e006c0 Delete type=3 #144
+2024/04/07-18:44:43.895858 7f38a3e006c0 Delete type=0 #146
+2024/04/07-18:53:15.716770 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.716808 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.723524 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.736955 7f38a10006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.737004 7f38a10006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)

packs/protections/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/protections/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:43.378670 7fcc654006c0 Recovering log #150
+2024/04/24-19:19:43.554194 7fcc654006c0 Delete type=3 #148
+2024/04/24-19:19:43.554281 7fcc654006c0 Delete type=0 #150
+2024/04/24-20:38:33.626647 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.626669 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.632751 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.639816 7fcc5e4006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.647329 7fcc5e4006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)

packs/protections/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.856327 7f38a3e006c0 Recovering log #146
+2024/04/07-18:44:43.867226 7f38a3e006c0 Delete type=3 #144
+2024/04/07-18:44:43.867361 7f38a3e006c0 Delete type=0 #146
+2024/04/07-18:53:15.723744 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.723796 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.730185 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.736963 7f38a10006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.736999 7f38a10006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)

packs/tables/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/tables/LOG

@@ -0,0 +1,7 @@
+2024/04/24-19:19:44.361715 7fcc5fe006c0 Recovering log #150
+2024/04/24-19:19:44.586287 7fcc5fe006c0 Delete type=3 #148
+2024/04/24-19:19:44.586391 7fcc5fe006c0 Delete type=0 #150
+2024/04/24-20:38:33.660752 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.660779 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.667170 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.674538 7fcc5e4006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/tables/LOG.old

@@ -0,0 +1,7 @@
+2024/04/07-18:44:43.927559 7f38a2a006c0 Recovering log #146
+2024/04/07-18:44:43.937525 7f38a2a006c0 Delete type=3 #144
+2024/04/07-18:44:43.937610 7f38a2a006c0 Delete type=0 #146
+2024/04/07-18:53:15.737130 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.737157 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.743304 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.765257 7f38a10006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/talents-cellule/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/talents-cellule/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:44.119776 7fcc654006c0 Recovering log #150
+2024/04/24-19:19:44.337580 7fcc654006c0 Delete type=3 #148
+2024/04/24-19:19:44.337645 7fcc654006c0 Delete type=0 #150
+2024/04/24-20:38:33.653632 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.653654 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.660555 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.667354 7fcc5e4006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.674567 7fcc5e4006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end)

packs/talents-cellule/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.914538 7f38a3e006c0 Recovering log #146
+2024/04/07-18:44:43.925326 7f38a3e006c0 Delete type=3 #144
+2024/04/07-18:44:43.925381 7f38a3e006c0 Delete type=0 #146
+2024/04/07-18:53:15.743399 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.743418 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.750623 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.765268 7f38a10006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.765292 7f38a10006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end)

packs/talents/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000152

packs/talents/LOG

@@ -0,0 +1,8 @@
+2024/04/24-19:19:43.897208 7fcc5fe006c0 Recovering log #150
+2024/04/24-19:19:44.108234 7fcc5fe006c0 Delete type=3 #148
+2024/04/24-19:19:44.108303 7fcc5fe006c0 Delete type=0 #150
+2024/04/24-20:38:33.647346 7fcc5e4006c0 Level-0 table #155: started
+2024/04/24-20:38:33.647386 7fcc5e4006c0 Level-0 table #155: 0 bytes OK
+2024/04/24-20:38:33.653476 7fcc5e4006c0 Delete type=0 #153
+2024/04/24-20:38:33.660725 7fcc5e4006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end)
+2024/04/24-20:38:33.667392 7fcc5e4006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end)

packs/talents/LOG.old

@@ -0,0 +1,8 @@
+2024/04/07-18:44:43.899194 7f38a2a006c0 Recovering log #146
+2024/04/07-18:44:43.910211 7f38a2a006c0 Delete type=3 #144
+2024/04/07-18:44:43.910272 7f38a2a006c0 Delete type=0 #146
+2024/04/07-18:53:15.730328 7f38a10006c0 Level-0 table #151: started
+2024/04/07-18:53:15.730351 7f38a10006c0 Level-0 table #151: 0 bytes OK
+2024/04/07-18:53:15.736844 7f38a10006c0 Delete type=0 #149
+2024/04/07-18:53:15.736987 7f38a10006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end)
+2024/04/07-18:53:15.737010 7f38a10006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -285,6 +285,10 @@
     background-image: url("../assets/ui/hawkmoon_background_01.png");
   }
 
+  .sheet.journal-entry .journal-sidebar {
+    color: #000;
+  }
+  
   .background-sheet-header {
     background-image: url("../assets/ui/hawkmoon_background_01.png");
     background-blend-mode: soft-light;

system.json

@@ -1,7 +1,7 @@
 {
   "id": "fvtt-hawkmoon-cyd",
   "description": "Hawkmoon RPG for FoundryVTT (CYD system - French)",
-  "version": "11.1.2",
+  "version": "11.1.7",
   "authors": [
     {
       "name": "Uberwald/LeRatierBretonnien",
@@ -35,7 +35,7 @@
   "gridUnits": "m",
   "license": "LICENSE.txt",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.1.2.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.1.7.zip",
   "languages": [
     {
       "lang": "fr",

template.json

@@ -86,7 +86,9 @@
           "vitessebonus": 0,
           "bonusdegats": 0,
           "attaquebonus": 0,
-          "defensebonus": 0
+          "defensebonus": 0,
+          "defensetotale": false,
+          "monte": false
         }
       },
       "npccore": {

templates/actor-sheet.html

@@ -296,6 +296,19 @@
       <ul class="item-list alternate-list">
         <li class="item flexrow">
           <button class="chat-card-button roll-initiative">Initiative (actuelle : {{initiative}} )</button>
+          <label class="item-field-label-short">&nbsp</label>
+          <label class="item-field-label-short">Monté?</label>
+          <input type="checkbox" name="system.combat.monte" {{checked system.combat.monte}} />
+          <label class="item-field-label-short">&nbsp</label>
+          <label class="item-field-label-medium">Défense totale?</label>
+          <input type="checkbox" name="system.combat.defensetotale" {{checked system.combat.defensetotale}} />
+        </li>
+        <li class="item flexrow">
+          <button class="chat-card-button roll-assomer">Assomer</button>
+          <button class="chat-card-button roll-coup-bas">Coup bas</button>
+          <button class="chat-card-button roll-immobiliser">Immobiliser</button>
+          <button class="chat-card-button roll-repousser">Repousser</button>
+          <button class="chat-card-button roll-desengager">Se désengager</button>
         </li>
       </ul>
 

templates/chat-generic-result.html

@@ -78,12 +78,64 @@
     {{/if}}
 
     {{#if isSuccess}}
+      
+      {{#if immobiliser}}
+        {{#if isHeroique}}
+          <li>Votre cible est immobilisée, et vous pouvez faire une action complexe.</li>
+        {{else}}
+          <li>Votre cible est immobilisée.</li>
+        {{/if}}
+      {{/if}}
+
+      {{#if desengager}}
+        {{#if isSuccess}}
+          <li>Vous vous désengagez de votre adversaire.</li>
+        {{else}}
+          <li>Vous ne parvenez pas à vous désengager de votre adversaire, il a un bonus de +3 pour vous attaquer</li>
+        {{/if}}
+      {{/if}}
+
+      {{#if repousser}}
+        {{#if isHeroique}}
+        <li>Votre cible est repoussée de 3 mètres et tombe au sol.</li>
+        {{else}}
+        <li>Votre cible tombe au sol.</li>
+        {{/if}}
+      {{/if}}
+
+      {{#if assomer}}
+        {{#if isHeroique}}
+          <li>Votre cible est assomée pour [[/r 1d10+10]] minutes.</li>
+        {{else}}
+          <li>Votre cible est assomée pour [[/r 1d10]] minutes.</li>
+        {{/if}}
+      {{/if}}
+
+      {{#if coupBas}}
+      <li>La cible a reçu 2 adversités bleues et a perdu 1 niveau de combativité (auto).</li>
+        {{#if isHeroique}}
+        <li>Et votre cible perd sa prochaine action complexe.</li>
+        {{/if}}
+      {{/if}}
+
       {{#if arme}}
-        <li>Votre adversaire a perdu 1 Etat de Combativité (auto)</li>
+        {{#if contenir}}
-        {{#if (not arme.system.onlevelonly)}}
+          {{#if isHeroique}}
-          <button class="chat-card-button roll-chat-degat">Dégats de l'arme</button>
+            <li>Aucun dégât, mais tous les adversaires dont le Seuil de Défense + 10 est atteint ou dépassé par le résultat de la manœuvre ne peuvent déclarer d’attaque contre le  personnage lors de leur prochaine action complexe (à ce tour  de jeu ou au suivant).</li>
-          {{#if coupDevastateur}}
+          {{else}}
-          <button class="chat-card-button roll-chat-degat-devastateur">Dégats de l'arme avec Coup Dévastateur</button>
+            <li>Aucun dégât, mais  la cible de cette manœuvre ne peut pas déclarer d’attaque contre vous lors de sa prochaine action complexe (à ce tour de jeu ou au suivant).</li>
+          {{/if}}
+        {{else}}
+          {{#if (eq nbCombativitePerdu "vaincu")}}
+          <li>Votre adversaire est vaincu !</li>
+          {{else}}
+          <li>Votre adversaire a perdu {{nbCombativitePerdu}} Etat de Combativité (auto)</li>
+          {{#if (not arme.system.onlevelonly)}}
+            <button class="chat-card-button roll-chat-degat">Dégats de l'arme</button>
+            {{#if coupDevastateur}}
+            <button class="chat-card-button roll-chat-degat-devastateur">Dégats de l'arme avec Coup Dévastateur</button>
+            {{/if}}
+          {{/if}}
           {{/if}}
         {{/if}}
       {{/if}}

templates/roll-dialog-generic.html

@@ -74,6 +74,32 @@
     </div>
     {{/if}}
 
+    {{#if conditionsCommunes}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">En surplomb, défenseur au sol (+3)?</span>
+        <input type="checkbox" id="defenseur-au-sol" {{checked defenseurAuSol}} />
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Défenseur aveuglé (+10)?</span>
+        <input type="checkbox" id="defenseur-aveugle" {{checked defenseurAveugle}} />
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Défenseur de dos (+5)?</span>
+        <input type="checkbox" id="defenseur-de-dos" {{checked defenseurDeDos}} />
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Défenseur immobilisé (+5)?</span>
+        <input type="checkbox" id="defenseur-immobilise" {{checked defenseurImmobilise}} />
+      </div>
+    {{/if}}
+
+    {{#if (or immobiliser repousser)}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Cible consciente?</span>
+        <input type="checkbox" id="cibleconsciente" {{checked cibleconsciente}} />
+      </div>
+    {{/if}}
+
     {{#if arme}}
       {{#if arme.system.isMelee}}
         {{#if bonusArmeNaturelle}}
@@ -83,9 +109,38 @@
           </div>
         {{/if}}
         <div class="flexrow">
-          <span class="roll-dialog-label">En surplomb ou défenseur au sol (+3)?</span>
+          <span class="roll-dialog-label">En surplomb, défenseur au sol (+3)?</span>
           <input type="checkbox" id="defenseur-au-sol" {{checked defenseurAuSol}} />
         </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Attaquants multiples (après le premier) (+3)?</span>
+          <input type="checkbox" id="attaquants-multiple" {{checked attaquantsMultiples}} />
+        </div>
+        {{#if hasAmbidextre}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Première attaque avec deux armes?</span>
+          <input type="checkbox" id="ambidextre-1" {{checked attaqueAmbidextre1}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Seconde attaque avec deux armes?</span>
+          <input type="checkbox" id="ambidextre-2" {{checked attaqueAmbidextre2}} />
+        </div>
+        {{/if}}
+        {{#if hasFeinte}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Feinte (<strong>cout : 1 BA</strong>) ?</span>
+          <input type="checkbox" id="feinte" {{checked feinte}} />
+        </div>
+        {{/if}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Soutiens </span>
+          <select class="status-small-label color-class-common" name="soutiens" id="soutiens" data-type="Number">
+            <option value="0">Aucun </option>
+            <option value="1">Un soutien (+3) </option>
+            <option value="2">Deux soutiens (+4)</option>
+            <option value="3">Trois soutiens (+5) </option>
+          </select>
+        </div>
         <div class="flexrow">
           <span class="roll-dialog-label">Défenseur aveuglé (+10)?</span>
           <input type="checkbox" id="defenseur-aveugle" {{checked defenseurAveugle}} />
@@ -106,10 +161,20 @@
           <span class="roll-dialog-label">Charge ?</span>
           <input type="checkbox" id="attaque-charge" {{checked attaqueCharge}} />
         </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Contenir?</span>
+          <input type="checkbox" id="contenir" {{checked contenir}} />
+        </div>
         <div class="flexrow">
           <span class="roll-dialog-label">Désarmer (SD+10)?</span>
           <input type="checkbox" id="attaque-desarme" {{checked attaqueDesarme}} />
         </div>
+        {{#if isMonte}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Charge de cavalerie?</span>
+          <input type="checkbox" id="charge-cavalerie" {{checked chargeCavalerie}} />
+        </div>
+        {{/if}}
       {{else}}
       <div class="flexrow">
         <span class="roll-dialog-label">Tireur en déplacement ?</span>