Gestion/assistance aventure/eclat

modules/mournblade-actor.js

@@ -162,8 +162,8 @@ export class MournbladeActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  canEclatDoubleD20( ) {
-    return ( this.getAlignement() == "loyal" && this.data.data.eclat.value> 0)
+  canEclatDoubleD20() {
+    return (this.getAlignement() == "loyal" && this.data.data.eclat.value > 0)
   }
 
   /* -------------------------------------------- */
@@ -234,11 +234,14 @@ export class MournbladeActor extends Actor {
     rollData.img = this.img
     rollData.canEclatDoubleD20 = this.canEclatDoubleD20()
     rollData.doubleD20 = false
-    
+    rollData.attributs = MournbladeUtility.getAttributs()
+
     if (attrKey) {
       rollData.attrKey = attrKey
-      rollData.actionImg = "systems/fvtt-mournblade/assets/icons/" + this.data.data.attributs[attrKey].labelnorm + ".webp"
-      rollData.attr = duplicate(this.data.data.attributs[attrKey])
+      if (attrKey != "tochoose") {
+        rollData.actionImg = "systems/fvtt-mournblade/assets/icons/" + this.data.data.attributs[attrKey].labelnorm + ".webp"
+        rollData.attr = duplicate(this.data.data.attributs[attrKey])
+      }
     }
     if (compId) {
       rollData.competence = duplicate(this.data.items.get(compId) || {})

modules/mournblade-roll-dialog.js

@@ -63,6 +63,9 @@ export class MournbladeRollDialog extends Dialog {
     html.find('#difficulte').change(async (event) =>  {
       this.rollData.difficulte = Number(event.currentTarget.value)
     })
+    html.find('#attrKey').change(async (event) =>  {
+      this.rollData.attrKey = String(event.currentTarget.value)
+    })    
     html.find('#doubleD20').change(async (event) =>  {
       this.rollData.doubleD20 = event.currentTarget.checked
     })         

modules/mournblade-utility.js

@@ -288,11 +288,20 @@ export class MournbladeUtility {
   /* -------------------------------------------- */
   static async rollMournblade(rollData) {
 
+    let actor  = game.actors.get(rollData.actorId)
+    if (rollData.attrKey == "tochoose") { // No attr selected, force address
+      rollData.attrKey = "adr"
+    }
+    if ( !rollData.attr) {
+      console.log("ATTR!!!", rollData.attrKey)
+      rollData.actionImg = "systems/fvtt-mournblade/assets/icons/" + actor.data.data.attributs[rollData.attrKey].labelnorm + ".webp"
+      rollData.attr = duplicate(actor.data.data.attributs[rollData.attrKey])
+    }
+
     rollData.diceFormula = rollData.mainDice
     if ( rollData.doubleD20) { // Multiply result !
       rollData.diceFormula += "*2"
       if (!rollData.isReroll) {
-        let actor  = game.actors.get(rollData.actorId)
         actor.changeEclat(-1)
       }
     }