From 3f73c6fec86b91d2a5bd50e324800599f50ca97a Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Mon, 23 Nov 2020 21:59:35 +0100
Subject: [PATCH] #38 - Gestion des armes 1/2mains

---
 module/actor.js           | 26 ++++++++++++++------------
 module/rdd-roll-dialog.js | 10 +++++-----
 system.json               |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 25baa247..e171b65a 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -1070,18 +1070,20 @@ export class RdDActor extends Actor {
       rollData.carac = { carac_creature: { label: name, value: competence.data.carac_value } };
     } else { // Usual competence
       rollData.competence = competence;
-      armeItem.data.dommagesReels = armeItem.data.dommages; // Per default
-      if ( !armeItem.data.unemain && !armeItem.data.deuxmains) // Force default
-        armeItem.data.unemain = true;
-      if (armeItem.data.unemain && armeItem.data.deuxmains) {  // manage 1/2 main 
-        //console.log("Weapon", armeItem.data.dommages);
-        if ( armeItem.data.dommages.includes("/") ) { // Sanity check
-          if ( name.toLowerCase().includes("1 main")  )
-            armeItem.data.dommagesReels = Number(armeItem.data.dommages.split("/")[0]);
-          else // 2 mains
-            armeItem.data.dommagesReels = Number(armeItem.data.dommages.split("/")[1]);
-        } else {
-          ui.notifications.info("Les dommages de l'arme à 1/2 mains " + name + " ne sont pas corrects (ie sous la forme X/Y)");
+      if (armeItem ) {
+        armeItem.data.dommagesReels = armeItem.data.dommages; // Per default
+        if ( !armeItem.data.unemain && !armeItem.data.deuxmains) // Force default
+          armeItem.data.unemain = true;
+        if (armeItem.data.unemain && armeItem.data.deuxmains) {  // manage 1/2 main 
+          //console.log("Weapon", armeItem.data.dommages);
+          if ( armeItem.data.dommages.includes("/") ) { // Sanity check
+            if ( name.toLowerCase().includes("1 main")  )
+              armeItem.data.dommagesReels = Number(armeItem.data.dommages.split("/")[0]);
+            else // 2 mains
+              armeItem.data.dommagesReels = Number(armeItem.data.dommages.split("/")[1]);
+          } else {
+            ui.notifications.info("Les dommages de l'arme à 1/2 mains " + name + " ne sont pas corrects (ie sous la forme X/Y)");
+          }
         }
       }
       rollData.arme  = armeItem;
diff --git a/module/rdd-roll-dialog.js b/module/rdd-roll-dialog.js
index 6e09abb7..60cb82a3 100644
--- a/module/rdd-roll-dialog.js
+++ b/module/rdd-roll-dialog.js
@@ -25,21 +25,21 @@ export class RdDRollDialog extends Dialog {
 
     // Common conf
     let dialogConf = { content: html, title: "Test", buttons: myButtons, default: "rollButton" }
-    let dialogOptions = { classes: ["rdddialog"], width: 600, height: 400, 'z-index': 99999 }
+    let dialogOptions = { classes: ["rdddialog"], width: 600, height: 460, 'z-index': 99999 }
   
     // Select proper roll dialog template and stuff
     if (mode == "competence") {
       dialogConf.title = "Test de compétence"
-      dialogConf.height = 400
+      dialogOptions.height = 420
     } else if (mode == "arme") {
       dialogConf.title = "Test de combat/arme"
-      dialogConf.height = 430
+      dialogOptions.height = 440
     } else if (mode == "carac") {
       dialogConf.title = "Test de caractéristique"
-      dialogOptions.height = 350
+      dialogOptions.height = 400
     } else if (mode == "sort") {
       dialogConf.title = "Lancer un sort"
-      dialogConf.height = 490
+      dialogOptions.height = 460
     }
     super(dialogConf, dialogOptions)
 
diff --git a/system.json b/system.json
index 6cbe2087..033a0e77 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "0.9.79",
+  "version": "0.9.80",
   "minimumCoreVersion": "0.7.5",
   "compatibleCoreVersion": "0.7.6",
   "templateVersion": 48,