Merge pull request #13141 from 0dr/Splittermond_2.2.1

[Splittermond] [Bugfix] Adding missing variables #13140
Roll20 · Aug 1, 2024 · 41dca93 · 41dca93
2 parents ecd0ca0 + e718cba
commit 41dca93
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/Splittermond/Sheet.html b/Splittermond/Sheet.html
@@ -6,7 +6,7 @@
         src="https://imgsrv.roll20.net?src=https%3A//raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Splittermond/Splittermond_w.png"
         style="display: inline;">-->
     <div style="display: inline-block; vertical-align: text-top;">
-        <span style="display: block;">Splittermond Charakterbogen f&uuml;r <b>Roll20</b> (v. 2.2.0)</span>
+        <span style="display: block;">Splittermond Charakterbogen f&uuml;r <b>Roll20</b> (v. 2.2.1)</span>
         <span style="display: block;">Original Idee und Umsetzung von <b>Loki</b>, Design von <b>Andernath</b></span>
         <span style="display: block;">Weiterentwickelt von <b>0dr</b> </span>
     </div>
@@ -7788,27 +7788,29 @@ <h2 style="color: white;">21.10.2021</h2>
 
                 getAttrs(["repeating_nahkampfwaffen_" + currentID +"_waffenname", "repeating_nahkampfwaffen_" + currentID +"_waffenskill", "repeating_nahkampfwaffen_" + currentID +"_waffenattr1", "repeating_nahkampfwaffen_" + currentID +"_waffenattr2"], async function(v) { 
 
-                    let lol = await Promise.all([baseAttr, nhkAttr, nhkMastery]);
+
+                    let promiseAwait = await Promise.all([baseAttr, nhkAttr, nhkMastery]);
                     //debugger; Promise.allSettled()
-                    [baseAttr, nhkAttr, nhkMastery] = lol;
+                    [baseAttr, nhkAttr, nhkMastery] = promiseAwait;
 
                     var name = v["repeating_nahkampfwaffen_" + currentID +"_waffenname"];
+
                     var skill = v["repeating_nahkampfwaffen_" + currentID +"_waffenskill"];
                     var attr1 = v["repeating_nahkampfwaffen_" + currentID +"_waffenattr1"];
                     var attr2 = v["repeating_nahkampfwaffen_" + currentID +"_waffenattr2"];
                     var update = {};
-
-
-
-
-                    let index = nhkMastery[skill].names.findIndex(word => ~name.split(" ").indexOf(word));
-
-                    temp4 = (index>=0) ? nhkMastery[skill].values[index] : 0;
-
 
-
+                    var index = 0;
+
+
+                    try {
+                        index = nhkMastery[skill].names.findIndex(word => ~name.split(" ").indexOf(word));
+                        temp4 = (index>=0) ? nhkMastery[skill].values[index] : 0;
+                    } catch (e) {
+
+                    }
+
 
-
                     switch (skill) {
                         case "hiebwaffen":
                             temp1 = +nhkAttr.hiebwaffenpunkte + +nhkAttr.hiebwaffenbonus;
@@ -7914,7 +7916,10 @@ <h2 style="color: white;">21.10.2021</h2>
                 let attrmod = 0;
                 getAttrs(["repeating_fernkampfwaffen_" + currentID +"_waffenskillfern", "repeating_fernkampfwaffen_" + currentID +"_waffenattr1fern", "repeating_fernkampfwaffen_" + currentID +"_waffenattr2fern"], async function(v) { 
 
-                    await Promise.all([baseAttr, fnkAttr]);
+                    let promiseAwait = await Promise.all([baseAttr, fnkAttr]);
+                    [baseAttr, fnkAttr] = promiseAwait;
+
+
 
                     var skill = v["repeating_fernkampfwaffen_" + currentID +"_waffenskillfern"];
                     var attr1 = v["repeating_fernkampfwaffen_" + currentID +"_waffenattr1fern"];