From 35eafffdf1f72832b5f1d39313c25d103b35c84f Mon Sep 17 00:00:00 2001
From: Kurohyou <scaseydv@gmail.com>
Date: Mon, 18 Nov 2024 12:41:15 -0700
Subject: [PATCH] SWADE Official: Fixes calculation errors when dropping

---
 .../SavageWorldsCharSheet.html                | 104 +++++++++++-------
 1 file changed, 62 insertions(+), 42 deletions(-)

diff --git a/Official Savage Worlds/SavageWorldsCharSheet.html b/Official Savage Worlds/SavageWorldsCharSheet.html
index eeb01efd671..901eb4634af 100644
--- a/Official Savage Worlds/SavageWorldsCharSheet.html	
+++ b/Official Savage Worlds/SavageWorldsCharSheet.html	
@@ -1299,11 +1299,23 @@
     });
 });
 
-on("change:staticfighting change:staticpiloting", function(eventInfo) {
-    let modValue;
-    eventInfo.newValue === "on" ? (modValue = "0") : (modValue = "-2");
-    eventInfo.sourceAttribute === "staticfighting" ? setAttrs({ fightingmod: modValue }) : setAttrs({ pilotingmod: modValue });
-});
+static.forEach(attr => {
+    on(`change:${attr}`,(event) => {
+        const baseAttr = attr.replace(/^static/,'');
+        getAttrs([attr,`${baseAttr}mod`],values => {
+            const setObj = {};
+            if(event.newValue === 'on'){
+                setObj[`${baseAttr}mod`] = values[`${baseAttr}mod`] === -2 ?
+                0 :
+                values[`${baseAttr}mod`];
+            }else{
+                setObj[`${baseAttr}mod`] = -2;
+            }
+            
+            setAttrs(setObj);
+        })
+    })
+})
 
 on("change:showFightingByDefault", function(eventInfo) {
     let modValue;
@@ -3271,6 +3283,12 @@
             typeof lookupObj.pace !== 'undefined'
               ? (finalCharacterDetails['pace'] = lookupObj.pace)
               : log('Pace', 'Not found', r20color);
+            // set pace mod
+            // set parry mod
+            // set toughness mod
+            ['pace','parry','tufness'].forEach(attr => {
+              finalCharacterDetails[`${attr}mod`] = lookupObj[`${attr}mod`] || 0;
+            })
             //set Token  and Avatar URLs
             typeof lookupObj.Token !== 'undefined'
               ? (finalCharacterDetails['tokenURL'] = lookupObj.Token)
@@ -3292,6 +3310,8 @@
             //switch character sheet view to mini-view
             //run dice handling
             finalCharacterDetails = processAdditionalPHEGs(lookupObj,finalCharacterDetails,monster);
+            // set toughness armor to override any calculations
+            finalCharacterDetails.toughnessArmor = lookupObj.toughnessArmor || 0;
             if (lookupObj.runningDie) {
               finalCharacterDetails.runningDie = `1d${lookupObj.runningDie}`;
             }
@@ -7650,7 +7670,7 @@ <h3 class="groupHeading" data-i18n="skills">Skills</h3>&nbsp; &nbsp;
                         </div>
                       </div>+
                     </div>
-                    <input class="otraitmod" type="number" name="attr_knowledgeothermod" title="@{knowledgeothermod}" value="0"/>
+                    <input class="otraitmod" type="number" name="attr_knowledgeothermod" title="@{knowledgeothermod}" value="-2"/>
                     <details>
                       <summary class="config">y</summary>
                       <div class="traitmodplus">
@@ -8968,7 +8988,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_academicsmod" title="@{academicsmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_academicsmod" title="@{academicsmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9080,7 +9100,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_athleticsmod" title="@{athleticsmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_athleticsmod" title="@{athleticsmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9197,7 +9217,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_battlemod" title="@{battlemod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_battlemod" title="@{battlemod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9309,7 +9329,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_boatingmod" title="@{boatingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_boatingmod" title="@{boatingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9421,7 +9441,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_commonknowledgemod" title="@{commonknowledgemod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_commonknowledgemod" title="@{commonknowledgemod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9533,7 +9553,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_drivingmod" title="@{drivingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_drivingmod" title="@{drivingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9645,7 +9665,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_electronicsmod" title="@{electronicsmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_electronicsmod" title="@{electronicsmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9757,7 +9777,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_faithmod" title="@{faithmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_faithmod" title="@{faithmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9869,7 +9889,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_fightingmod" title="@{fightingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_fightingmod" title="@{fightingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -9981,7 +10001,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_focusmod" title="@{focusmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_focusmod" title="@{focusmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10093,7 +10113,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_gamblingmod" title="@{gamblingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_gamblingmod" title="@{gamblingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10205,7 +10225,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_hackingmod" title="@{hackingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_hackingmod" title="@{hackingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10317,7 +10337,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_healingmod" title="@{healingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_healingmod" title="@{healingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10429,7 +10449,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_intimidationmod" title="@{intimidationmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_intimidationmod" title="@{intimidationmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10541,7 +10561,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_languagemod" title="@{languagemod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_languagemod" title="@{languagemod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10653,7 +10673,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_noticemod" title="@{noticemod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_noticemod" title="@{noticemod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10765,7 +10785,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_occultmod" title="@{occultmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_occultmod" title="@{occultmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10877,7 +10897,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_performancemod" title="@{performancemod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_performancemod" title="@{performancemod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -10989,7 +11009,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_persuasionmod" title="@{persuasionmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_persuasionmod" title="@{persuasionmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11101,7 +11121,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_pilotingmod" title="@{pilotingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_pilotingmod" title="@{pilotingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11213,7 +11233,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_psionicsmod" title="@{psionicsmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_psionicsmod" title="@{psionicsmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11330,7 +11350,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_repairmod" title="@{repairmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_repairmod" title="@{repairmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11442,7 +11462,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_researchmod" title="@{researchmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_researchmod" title="@{researchmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11554,7 +11574,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_ridingmod" title="@{ridingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_ridingmod" title="@{ridingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11666,7 +11686,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_sciencemod" title="@{sciencemod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_sciencemod" title="@{sciencemod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11778,7 +11798,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_shootingmod" title="@{shootingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_shootingmod" title="@{shootingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -11890,7 +11910,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_spellcastingmod" title="@{spellcastingmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_spellcastingmod" title="@{spellcastingmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -12010,7 +12030,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_stealthmod" title="@{stealthmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_stealthmod" title="@{stealthmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -12122,7 +12142,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_survivalmod" title="@{survivalmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_survivalmod" title="@{survivalmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -12239,7 +12259,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_tauntmod" title="@{tauntmod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_tauntmod" title="@{tauntmod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -12351,7 +12371,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_thieverymod" title="@{thieverymod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_thieverymod" title="@{thieverymod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -12463,7 +12483,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_trademod" title="@{trademod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_trademod" title="@{trademod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -12575,7 +12595,7 @@ <h2 class="traitHeader">Skills</h2>
                       </div>
                     </div>+
                   </div>
-                  <input class="otraitmod" type="number" name="attr_weirdsciencemod" title="@{weirdsciencemod}" value="0"/>
+                  <input class="otraitmod" type="number" name="attr_weirdsciencemod" title="@{weirdsciencemod}" value="-2"/>
                   <details>
                     <summary class="config">y</summary>
                     <div class="traitmodplus">
@@ -12709,7 +12729,7 @@ <h2 class="traitHeader">Skills</h2>
                           </div>
                         </div>+
                       </div>
-                      <input class="otraitmod" type="number" name="attr_knowledgeothermod" title="@{knowledgeothermod}" value="0"/>
+                      <input class="otraitmod" type="number" name="attr_knowledgeothermod" title="@{knowledgeothermod}" value="-2"/>
                       <details>
                         <summary class="config">y</summary>
                         <div class="traitmodplus">
@@ -14835,7 +14855,7 @@ <h4 class="subsectionHeader panotesheader" data-i18n="additional-info">Additiona
                     </div>
                   </div>+
                 </div>
-                <input class="otraitmod" type="number" name="attr_pastrengthmod" title="@{pastrengthmod}" value="0"/>
+                <input class="otraitmod" type="number" name="attr_pastrengthmod" title="@{pastrengthmod}" value="-2"/>
                 <details>
                   <summary class="config">y</summary>
                   <div class="traitmodplus">
@@ -15272,7 +15292,7 @@ <h4 class="derivedStats-configHeader" data-i18n="parry-configuration">Parry Conf
                     </div>
                   </div>+
                 </div>
-                <input class="otraitmod" type="number" name="attr_rastrengthmod" title="@{rastrengthmod}" value="0"/>
+                <input class="otraitmod" type="number" name="attr_rastrengthmod" title="@{rastrengthmod}" value="-2"/>
                 <details>
                   <summary class="config">y</summary>
                   <div class="traitmodplus">