Gestion assommer/charge

modules/heritiers-utility.js

@@ -290,11 +290,11 @@ export class HeritiersUtility {
     if (isTricherieHeritage) {
       let resTab = [rollData.roll.terms[0].results[0].result, rollData.roll.terms[0].results[1].result, rollData.roll.terms[0].results[2].result]
       rollData.diceResult = resTab[0] + "," + resTab[1] + "," + resTab[2]
-      let subResult = Math.max(Math.max(resTab[0], resTab[1]), resTab[2])
+      let foundryTotal = resTab[0] + resTab[1] + resTab[2] 
       if (resTab[1] == 1) { resTab[1] -= 4 }
       if (resTab[2] == 1) { resTab[2] -= 6 }
       if (resTab[2] == 2) { resTab[2] -= 7 }
-      rollData.finalResult = rollData.roll.total - subResult + Math.max(Math.max(resTab[0], resTab[1]), resTab[2])
+      rollData.finalResult = rollData.roll.total - foundryTotal + Math.max(Math.max(resTab[0], resTab[1]), resTab[2])
 
       // Gestion des résultats spéciaux
       resTab = resTab.sort()
@@ -344,6 +344,9 @@ export class HeritiersUtility {
     if (rollData.arme.system.categorie == "blanche" || rollData.arme.system.categorie == "improvise") {
       rollData.degatsArme += Math.max(0, actor.system.caracteristiques.for.value - 2)
     }
+    if (rollData.mode == "attaquecharge") {
+      rollData.degatsArme += 3
+    }
   }
 
   /* -------------------------------------------- */
@@ -368,19 +371,24 @@ export class HeritiersUtility {
     this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-cc-result.html`, rollData)
     }, rollData, "selfroll")
-
   }
-
+  /* -------------------------------------------- */
+  static async displayAsssomer(rollData, actor, nomAttaque, etatAssomer, valeurDefense) {
+    rollData.defenderMode = nomAttaque
+    rollData.etatAssommer = etatAssomer
+    rollData.defenderValue = valeurDefense
+    rollData.marge = 0
+    this.computeMarge(rollData, valeurDefense)
+    rollData.dureeAssommer = (rollData.marge) ? rollData.marge*2 : 1 
+    this.createChatWithRollMode(rollData.alias, {
+      content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-assommer-result.html`, rollData)
+    }, rollData, "selfroll")
+  }
   /* -------------------------------------------- */
   static async rollHeritiers(rollData) {
 
     let actor = this.getActorFromRollData(rollData)
 
-    if (typeof (rollData.pvMalus) != "number") {
-      ui.notifications.warn("Votre personnage est Moribond(e). Aucun jet autorisé")
-      return
-    }
-
     //rollData.actionImg = "systems/fvtt-les-heritiers/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
     rollData.carac = duplicate(actor.system.caracteristiques[rollData.caracKey])
 
@@ -403,7 +411,11 @@ export class HeritiersUtility {
     } else {
       rollData.diceFormula += `+${rollData.carac.value}+${rangValue}+${rollData.bonusMalusContext}`
     }
-    rollData.diceFormula += `+${rollData.pvMalus}`
+    let ruleMalus = 0
+    for (let malus of rollData.rulesMalus) {
+      ruleMalus += malus.value
+    }
+    rollData.diceFormula += `+${ruleMalus}`
 
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
@@ -420,7 +432,9 @@ export class HeritiersUtility {
       content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-generic-result.html`, rollData)
     }, rollData)
 
-    if (rollData.defenderTokenId && rollData.arme) {
+    // Gestion attaque standard
+    if ( (rollData.mode == "arme" || rollData.mode == "attaquebrutale" || rollData.mode == "attaquecharge") && 
+          rollData.defenderTokenId && rollData.arme) {
       if (rollData.arme.system.categorie != "trait" && rollData.arme.system.categorie != "poing" && rollData.arme.system.categorie != "epaule" ) {
         await this.displayUneDefense(rollData, actor, "Parade", rollData.defenderParade)
         await this.displayUneDefense(rollData, actor, "Esquive", rollData.defenderEsquive)
@@ -430,6 +444,13 @@ export class HeritiersUtility {
         ui.notifications.warn("Pas de difficulté positionnée pour l'attaque à distance.")
       }
     }
+    // Gestion assomer
+    if (rollData.mode == "assommer" && rollData.defenderTokenId && rollData.arme) {
+      await this.displayAsssomer(rollData, actor, "Assommer", "Surprise", rollData.defenderResistancePhysique)
+      await this.displayAsssomer(rollData, actor, "Assommer", "Conscient, Résistance+6", rollData.defenderResistancePhysique+6) 
+      await this.displayAsssomer(rollData, actor, "Assommer", "Conscient, Parade", rollData.defenderParade) 
+      await this.displayAsssomer(rollData, actor, "Assommer", "Conscient, Esquive", rollData.defenderEsquive+6) 
+    }
 
   }
 
@@ -456,6 +477,10 @@ export class HeritiersUtility {
     return game.users.filter(filter).map(user => user._id);
   }
 
+  /* -------------------------------------------- */
+  static isArmeMelee(arme) {
+    return (arme.type == "arme" && (arme.system.categorie == "lourde" || arme.system.categorie == "blanche" || arme.system.categorie == "improvise")) ? true : false
+  }
   /* -------------------------------------------- */
   static getWhisperRecipients(rollMode, name) {
     switch (rollMode) {
@@ -541,7 +566,8 @@ export class HeritiersUtility {
       rollMode: game.settings.get("core", "rollMode"),
       sdList: game.system.lesheritiers.config.seuilsDifficulte,
       sdValue: -1,
-      bonusMalusContext: 0
+      bonusMalusContext: 0,
+      rulesMalus : []
     }
     return rollData
   }
@@ -555,6 +581,7 @@ export class HeritiersUtility {
       rollData.defenderName = defender.name
       rollData.defenderParade = defender.getCurrentParade()
       rollData.defenderEsquive = defender.getCurrentEsquive()
+      rollData.defenderResistancePhysique = defender.getCurrentResistancePhysique()
     }
   }