Add hotbar

modules/crucible-utility.js

@@ -285,6 +285,9 @@ export class CrucibleUtility {
     if ( rollData.save) {
       startFormula = String(rollData.save.value) + "d6cs>=5"
     }
+    if ( rollData.shield) {
+      startFormula = "1" + String(rollData.shield.data.shielddie) + "cs>=5"
+    }
     diceFormula = startFormula
 
     // skill => 2
@@ -344,7 +347,9 @@ export class CrucibleUtility {
     // armor => 12
     let skillArmorPenalty = 0
     for (let armor of rollData.armors) {
-      skillArmorPenalty += armor.data.skillpenalty
+      if (armor.data.equipped) {
+        skillArmorPenalty += armor.data.skillpenalty
+      }
     }
     if (rollData.skill && rollData.skill.data.armorpenalty && skillArmorPenalty > 0 ) {
       rollData.skillArmorPenalty = skillArmorPenalty