Merge pull request #181 from toastygm/tom

Prepare for 1.0.3
toastygm · Dec 17, 2020 · 58704f9 · 58704f9
2 parents 87d2bdd + dd52f63
commit 58704f9
Show file tree

Hide file tree

Showing 8 changed files with 582 additions and 610 deletions.
diff --git a/module/actor/actor.js b/module/actor/actor.js
diff --git a/module/config.js b/module/config.js
@@ -50,6 +50,8 @@ HM3.defaultMagicIconName = 'pentacle';
 HM3.defaultRitualIconName = 'circle';
 HM3.defaultMiscItemIconName = 'miscgear';
 HM3.defaultPsionicsIconName = 'psionics';
+HM3.defaultArmorGearIconName = 'armor';
+HM3.defaultContainerIconName = 'sack';
 
 HM3.magicIcons = [
     ['pentacle', 'systems/hm3/images/icons/svg/pentacle.svg'],
@@ -245,6 +247,10 @@ HM3.craftSkillIcons = [
     ['woodcraft', 'systems/hm3/images/icons/svg/woodcraft.svg']
 ];
 
+HM3.armorGearIcons = [
+    ['armorgear', 'systems/hm3/images/icons/svg/armor.svg'],
+];
+
 HM3.miscGearIcons = [
     ['miscgear', 'systems/hm3/images/icons/svg/miscgear.svg'],
     ['coin', 'systems/hm3/images/icons/svg/coins.svg'],
@@ -281,6 +287,7 @@ HM3.defaultItemIcons = new Map(
     .concat(HM3.weaponSkillIcons)
     .concat(HM3.craftSkillIcons)
     .concat(HM3.miscGearIcons)
+    .concat(HM3.armorGearIcons)
     .concat(HM3.ritualIcons)
     .concat(HM3.magicIcons)
     .concat(HM3.psionicTalentIcons)

diff --git a/module/dice-hm3.js b/module/dice-hm3.js
@@ -530,7 +530,7 @@ export class DiceHM3 {
     static _calcInjury(location, impact, aspect, addToCharSheet, aim, dialogOptions) {
         const enableAmputate = game.settings.get('hm3', 'amputation');
         const enableBloodloss = game.settings.get('hm3', 'bloodloss');
-        const enableLimbInjury = game.settings.get('hm3', 'limbInjury');
+        const enableLimbInjuries = game.settings.get('hm3', 'limbInjuries');
 
         const result = {
             isRandom: location === 'Random',
@@ -646,14 +646,14 @@ export class DiceHM3 {
 
         // Optional Rule - Limb Injuries (Combat 14)
         if (armorLocation.data.isFumble) {
-            result.isFumble = enableLimbInjury && result.injuryLevel >= 4;
-            result.isFumbleRoll = enableLimbInjury || (!result.isFumble && result.injuryLevel >= 2);
+            result.isFumble = enableLimbInjuries && result.injuryLevel >= 4;
+            result.isFumbleRoll = enableLimbInjuries || (!result.isFumble && result.injuryLevel >= 2);
         }
 
         // Optional Rule - Limb Injuries (Combat 14)
         if (armorLocation.data.isStumble) {
-            result.isStumble = enableLimbInjury && result.injuryLevel >= 4;
-            result.isStumbleRoll = enableLimbInjury || (!result.isStumble && result.injuryLevel >= 2);
+            result.isStumble = enableLimbInjuries && result.injuryLevel >= 4;
+            result.isStumbleRoll = enableLimbInjuries || (!result.isStumble && result.injuryLevel >= 2);
         }
 
         return result;