From b1cd1e3aee18f1b03871b2d1950ab90ff916725a Mon Sep 17 00:00:00 2001
From: Cassie Levett <cassielevett@gmail.com>
Date: Mon, 23 Mar 2020 11:03:22 -0500
Subject: [PATCH] Shadowrun 5th Edition v4.13 (#5969)

* bug fixes

* fix versioning
---
 Shadowrun5thEdition/Shadowrun5thEdition.html  | 43 ++++++++++---------
 Shadowrun5thEdition/Shadowrun5thEdition.pug   |  4 +-
 Shadowrun5thEdition/src/js/newScripts.js      |  5 +--
 .../src/js/processingFunctions.js             |  2 +-
 Shadowrun5thEdition/src/js/versioning.js      | 32 ++++++++------
 5 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.html b/Shadowrun5thEdition/Shadowrun5thEdition.html
index a1970d26eb..a7cdc150a2 100644
--- a/Shadowrun5thEdition/Shadowrun5thEdition.html
+++ b/Shadowrun5thEdition/Shadowrun5thEdition.html
@@ -1,5 +1,5 @@
 
-<input name="attr_version" type="hidden" value="4.11"/>
+<input name="attr_version" type="hidden" value="4.13"/>
 <input class="sheet_type" name="attr_sheet_type" type="hidden" value="pc"/>
 <input class="character-type" name="attr_flag_special" type="hidden" value="mundane"/>
 <div class="pc">
@@ -1070,7 +1070,7 @@
                   <h3 data-i18n="skill">skill</h3>
                   <select name="attr_skill" title="@{repeating_melee_${x}_skill}" value="@{closecombat}">
                     <optgroup label="Combat Skills">Combat Skills
-                      <option data-i18n="closecombat" value="@{closecombat}" selected="selected">Close Combat Group</option>
+                      <option data-i18n="closecombatgroup" value="@{closecombat}" selected="selected">Close Combat Group</option>
                       <option data-i18n="blades" value="@{blades}">Blades</option>
                       <option data-i18n="clubs" value="@{clubs}">Clubs</option>
                       <option data-i18n="exoticmelee" value="0">Blades</option>
@@ -3581,7 +3581,7 @@ const processingFunctions = {
     },
     determineConditionBase: (type, drone) => drone ? 6 : type === 'vehicle' ? 12 : 8,
     determineConditionAttribute: attrs => attrs.willpower ? attrs.willpower : attrs.body ? attrs.body : attrs.device_rating ? attrs.device_rating : 0,
-    determineWeaponAttributesByType: weaponType =>  weaponType === 'range' ? sheetAttributes.rangeAttributes : sheetAttributes.meleeAttribute,
+    determineWeaponAttributesByType: weaponType =>  weaponType === 'range' ? sheetAttributes.rangeAttributes : sheetAttributes.meleeAttributes,
     findFlagInKeys: attrs => Object.keys(attrs).find(key => key.includes('_flag')),
     findModifierInKeys: attrs => Object.keys(attrs).find(key => key.includes('_modifier')),
     processTempFlags: attrs => {
@@ -3856,13 +3856,10 @@ const updateMovement = () => {
 const updateDerivedAttribute = derivedAttribute => {
   getAttrs(sheetAttributes[derivedAttribute], attrs => {
     attrs = processingFunctions.shadowrun.attributeFactory(attrs)
-    const sum = processingFunctions.sumIntegers(Object.values(attrs))
-    processingFunctions.setAttributes({[derivedAttribute]: sum})
+    processingFunctions.setAttributes({[derivedAttribute]: attrs.total})
   })
 }
 
-//for Mocha Unit Texting
-//module.exports = updateFunctions;
 
 
   <!--Old functions working to become obsolete-->
@@ -4210,26 +4207,30 @@ const fourpointone = () => {
     })
   })
 
-  ['range', 'melee'].forEach(weaponType => {
-    getSectionIDs(weaponType, idarray => {
-      let attributes = [];
-      let update = {};
-
-      idarray.forEach(id => attributes.push(`repeating_${weaponType}_${id}_spec`))
-
-      getAttrs(attributes, value => {
-        idarray.forEach(id => update[`repeating_${weaponType}_${id}_specialization`] = value[`repeating_${weaponType}_${id}_spec`])
-        setAttrs(update);
-      });
+  getSectionIDs('range', idarray => {
+    let attributes = [];
+    let update = {};
+    idarray.forEach(id => attributes.push(`repeating_range_${id}_spec`))
+    getAttrs(attributes, value => {
+      idarray.forEach(id => update[`repeating_range_${id}_specialization`] = value[`repeating_range_${id}_spec`])
+      setAttrs(update);
     });
-  })
+  });
+
+  getSectionIDs('melee', idarray => {
+    let attributes = [];
+    let update = {};
+    idarray.forEach(id => attributes.push(`repeating_melee_${id}_spec`))
+    getAttrs(attributes, value => {
+      idarray.forEach(id => update[`repeating_melee_${id}_specialization`] = value[`repeating_melee_${id}_spec`])
+      setAttrs(update);
+    });
+  });
 
   getSectionIDs("active", idarray => {
     let attributes = [];
     let update = {};
-
     idarray.forEach(id => attributes.push(`repeating_active_${id}_skill`))
-
     getAttrs(attributes, value => {
         idarray.forEach(id => update[`repeating_active_${id}_display_skill`] = value[`repeating_active_${id}_skill`])
        setAttrs(update);
diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.pug b/Shadowrun5thEdition/Shadowrun5thEdition.pug
index ce1b2aa72e..64a0b1ab17 100644
--- a/Shadowrun5thEdition/Shadowrun5thEdition.pug
+++ b/Shadowrun5thEdition/Shadowrun5thEdition.pug
@@ -1,4 +1,4 @@
-input(name='attr_version' type='hidden' value='4.11')
+input(name='attr_version' type='hidden' value='4.13')
 
 //- CHARACTER SHEET PAGE
 input.sheet_type(name='attr_sheet_type' type='hidden' value='pc')
@@ -272,7 +272,7 @@ include src/pug/_variables.pug
 									h3(data-i18n='skill') skill
 									select(name=`attr_skill` title=`${meleeRepeatingSection}_skill}` value='@{closecombat}')
 										optgroup(label='Combat Skills' ) Combat Skills
-											option(data-i18n='closecombat' value='@{closecombat}' selected) Close Combat Group
+											option(data-i18n='closecombatgroup' value='@{closecombat}' selected) Close Combat Group
 											option(data-i18n='blades' value='@{blades}') Blades
 											option(data-i18n='clubs' value='@{clubs}') Clubs
 											option(data-i18n='exoticmelee' value='0') Blades
diff --git a/Shadowrun5thEdition/src/js/newScripts.js b/Shadowrun5thEdition/src/js/newScripts.js
index 46f61775f0..4aea4a87a6 100644
--- a/Shadowrun5thEdition/src/js/newScripts.js
+++ b/Shadowrun5thEdition/src/js/newScripts.js
@@ -215,11 +215,8 @@ const updateMovement = () => {
 const updateDerivedAttribute = derivedAttribute => {
   getAttrs(sheetAttributes[derivedAttribute], attrs => {
     attrs = processingFunctions.shadowrun.attributeFactory(attrs)
-    const sum = processingFunctions.sumIntegers(Object.values(attrs))
-    processingFunctions.setAttributes({[derivedAttribute]: sum})
+    processingFunctions.setAttributes({[derivedAttribute]: attrs.total})
   })
 }
 
-//for Mocha Unit Texting
-//module.exports = updateFunctions;
 
diff --git a/Shadowrun5thEdition/src/js/processingFunctions.js b/Shadowrun5thEdition/src/js/processingFunctions.js
index 8a1796bf61..b25db0e39c 100644
--- a/Shadowrun5thEdition/src/js/processingFunctions.js
+++ b/Shadowrun5thEdition/src/js/processingFunctions.js
@@ -93,7 +93,7 @@ const processingFunctions = {
     },
     determineConditionBase: (type, drone) => drone ? 6 : type === 'vehicle' ? 12 : 8,
     determineConditionAttribute: attrs => attrs.willpower ? attrs.willpower : attrs.body ? attrs.body : attrs.device_rating ? attrs.device_rating : 0,
-    determineWeaponAttributesByType: weaponType =>  weaponType === 'range' ? sheetAttributes.rangeAttributes : sheetAttributes.meleeAttribute,
+    determineWeaponAttributesByType: weaponType =>  weaponType === 'range' ? sheetAttributes.rangeAttributes : sheetAttributes.meleeAttributes,
     findFlagInKeys: attrs => Object.keys(attrs).find(key => key.includes('_flag')),
     findModifierInKeys: attrs => Object.keys(attrs).find(key => key.includes('_modifier')),
     processTempFlags: attrs => {
diff --git a/Shadowrun5thEdition/src/js/versioning.js b/Shadowrun5thEdition/src/js/versioning.js
index 48a622b571..d9465f7463 100644
--- a/Shadowrun5thEdition/src/js/versioning.js
+++ b/Shadowrun5thEdition/src/js/versioning.js
@@ -51,26 +51,30 @@ const fourpointone = () => {
     })
   })
 
-  ['range', 'melee'].forEach(weaponType => {
-    getSectionIDs(weaponType, idarray => {
-      let attributes = [];
-      let update = {};
-
-      idarray.forEach(id => attributes.push(`repeating_${weaponType}_${id}_spec`))
-
-      getAttrs(attributes, value => {
-        idarray.forEach(id => update[`repeating_${weaponType}_${id}_specialization`] = value[`repeating_${weaponType}_${id}_spec`])
-        setAttrs(update);
-      });
+  getSectionIDs('range', idarray => {
+    let attributes = [];
+    let update = {};
+    idarray.forEach(id => attributes.push(`repeating_range_${id}_spec`))
+    getAttrs(attributes, value => {
+      idarray.forEach(id => update[`repeating_range_${id}_specialization`] = value[`repeating_range_${id}_spec`])
+      setAttrs(update);
     });
-  })
+  });
+
+  getSectionIDs('melee', idarray => {
+    let attributes = [];
+    let update = {};
+    idarray.forEach(id => attributes.push(`repeating_melee_${id}_spec`))
+    getAttrs(attributes, value => {
+      idarray.forEach(id => update[`repeating_melee_${id}_specialization`] = value[`repeating_melee_${id}_spec`])
+      setAttrs(update);
+    });
+  });
 
   getSectionIDs("active", idarray => {
     let attributes = [];
     let update = {};
-
     idarray.forEach(id => attributes.push(`repeating_active_${id}_skill`))
-
     getAttrs(attributes, value => {
         idarray.forEach(id => update[`repeating_active_${id}_display_skill`] = value[`repeating_active_${id}_skill`])
        setAttrs(update);