From 7beb5c5f98c2f1dd7ff41cac8692ea5b3bf99183 Mon Sep 17 00:00:00 2001
From: Christoph <christophkw@gmail.com>
Date: Fri, 12 Jun 2020 10:01:50 -0700
Subject: [PATCH] Template Tweaks

Fixed error where macro wouldn't set if rating didnt change but skill, tool, or specialty did
Added Advantage to template
Moved Charge lower in template
Tweaked display to be cleaner and more consistant
---
 FreeSpacer/FreeSpacer.css  | 205 +++++++++--------------
 FreeSpacer/FreeSpacer.html | 335 ++++++++++++-------------------------
 2 files changed, 187 insertions(+), 353 deletions(-)

diff --git a/FreeSpacer/FreeSpacer.css b/FreeSpacer/FreeSpacer.css
index 9676a071b0..ebda72647f 100644
--- a/FreeSpacer/FreeSpacer.css
+++ b/FreeSpacer/FreeSpacer.css
@@ -499,7 +499,7 @@ select.sheet-typeSelector
     {
         display: grid;
         grid-template-columns: repeat(12, 20px);
-        grid-template-rows: repeat(10,20px);
+        grid-template-rows: repeat(11,21px);
         background-color: #353635;
         border: none;
         font-family: 'Myriad Pro';
@@ -550,28 +550,26 @@ select.sheet-typeSelector
             background-color: #353635;
         }
         /*Subheaders*/
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-taskDiceSubheader
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateSubheader
         {
             grid-column: 1/-1;
-            grid-row: 4/6;
-            background-color: #414241;
             color: #d87d29;
             font-variant-caps: small-caps;
-            font-weight: 500;
+            font-weight: 600;
             padding-left: 2px;
             padding-top: 3px;
         }
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-taskDiceSubheader
+        {
+            grid-row: 4/6;
+            background-color: #414241;
+        }
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-threatDiceSubheader
         {
-            grid-column: 1/-1;
             grid-row: 6/8;
             background-color: #353635;
-            color: #d87d29;
-            font-variant-caps: small-caps;
-            font-weight: 500;
-            padding-left: 2px;
-            padding-top: 3px;
         }
+        
         /*Dice*/
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-dice
         {
@@ -579,7 +577,6 @@ select.sheet-typeSelector
             align-content: stretch;
             width: 20px;
             height: 20px;
-            margin-top: -3px;
         }
 
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .inlinerollresult
@@ -588,7 +585,6 @@ select.sheet-typeSelector
             border-color:transparent;
             font-size: 1em;
             text-align: center;
-            line-height: 24px;
         }
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-taskDice
         {
@@ -700,66 +696,83 @@ select.sheet-typeSelector
             grid-column: 11/12;
         }
         /*Excess Dice*/
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-excessDiceSubheader
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-excessDice
         {
-            grid-column: 1/-1;
             grid-row: 8/9;
             background-color: #414241;
-            color: #d87d29;
-            font-variant-caps: small-caps;
-            font-weight: 500;
-            padding-left: 2px;
-            padding-top: 3px;
         }
+            .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-excessDice .inlinerollresult
+            {
+                border: none;
+                font-weight: 400;
+                padding: 0;
+            }
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-autoHits
         {
-            padding-top: 3px;
             grid-column: 5/8;
-            grid-row: 8/9;
+            padding-top: 2px;
+            font-weight: 400;
         }
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-autoMisses
         {
-            padding-top: 3px;
             grid-column: 9/-1;
-            grid-row: 8/9;
+            padding-top: 2px;
+            font-weight: 400;
         }
+
+        /*Charge*/
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateCharge
+        {
+            grid-row: 9/10;
+            background-color: #353635;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateChargeTotal
+        {
+            grid-column: 4/5;
+            padding: 2px 0 0 5px;
+            font-weight: 400;
+            text-align: end;
+        }
+
         /*Results*/
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-resultsSubheader
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateResults
         {
-            grid-column: 1/-1;
-            grid-row: 9/10;
-            background-color: #353635;
-            color: #d87d29;
-            font-variant-caps: small-caps;
-            font-weight: 500;
-            padding-left: 2px;
-            padding-top: 3px;
+            grid-row: 10/11;
+            background-color: #414241;
         }
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-result
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateResultTotal
         {
-            grid-row: 9/10;
-            grid-column: 4/-1;
-            background-color: #353635;
+            grid-column: 4/5;
+            padding: 2px 0 0 5px;
+            text-align: end;
         }
+            .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateResultTotal > .inlinerollresult
+            {
+                border: none;
+                font-weight: 400;
+                padding: 0;
+            }
+
         /*Outcome*/
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-outcomeSubheader
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateOutcome
         {
-            grid-column: 1/-1;
-            grid-row: 10/11;
-            background-color: #414241;
-            color: #d87d29;
-            font-variant-caps: small-caps;
-            font-weight: 500;
-            padding-left: 2px;
-            padding-top: 3px;
+            grid-row: 11/12;
+            background-color: #353635;
         }
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-outcome
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateOutcomeDisplay
         {
-            grid-row: 10/11;
             grid-column: 4/-1;
-            background-color: #414241;
+            padding-left: 5px;
             padding-top: 3px;
+            font-weight: 400;
         }
+            .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-templateOutcomeDisplay .inlinerollresult
+            {
+                border: none;
+                font-weight: 400;
+                padding: 0;
+            }
 
 /* ************ */
 /* Salvo Mode  */
@@ -892,12 +905,6 @@ input.sheet-salvoRollButton + span.sheet-salvoRollButton, input.sheet-salvoRollB
     grid-column: 55;
 }
 
-.sheet-salvoToolTypeBox
-{
-    grid-row: 23;
-    grid-column: 55;
-}
-
 .sheet-salvoToolBox
 {
     grid-row: 34;
@@ -1154,10 +1161,8 @@ input.sheet-skillDeselect
     input.sheet-skillDeselect:checked ~ .sheet-specialtyFlow,
     input.sheet-skillDeselect:checked ~ .sheet-salvoSpecialtyBox,
     input.sheet-skillDeselect:checked ~ .sheet-specialtySelector,
-    input.sheet-skillDeselect:checked ~ .sheet-salvoToolTypeBox,
     input.sheet-skillDeselect:checked ~ .sheet-toolTypeDirection,
     input.sheet-skillDeselect:checked ~ .sheet-specialtyDeselect,
-    input.sheet-skillDeselect:checked ~ .sheet-scaleDeselect,
     input.sheet-skillDeselect:checked ~ .sheet-salvoToolBox,
     input.sheet-skillDeselect:checked ~ .sheet-salvoChargeBox,
     input.sheet-skillDeselect:checked ~ .sheet-overchargeHighlight,
@@ -1224,14 +1229,13 @@ input.sheet-specialtyDeselect
     input.sheet-specialtyDeselect:not(:checked) ~ .sheet-specialtySelector,
     input.sheet-specialtyDeselect:checked ~ .sheet-toolTypeDirection,
     input.sheet-specialtyDeselect:checked ~ .sheet-salvoSpecialtyBox,
-    input.sheet-specialtyDeselect:checked ~ .sheet-salvoToolTypeBox,
-    input.sheet-specialtyDeselect:checked ~ .sheet-scaleDeselect,
     input.sheet-specialtyDeselect:checked ~ .sheet-salvoToolBox,
     input.sheet-specialtyDeselect:checked ~ .sheet-salvoChargeBox,
     input.sheet-specialtyDeselect:checked ~ .sheet-overchargeHighlight,
     input.sheet-specialtyDeselect:checked ~ .sheet-chargeCrewKitDirection,
     input.sheet-specialtyDeselect:checked ~ .sheet-toolDeselect,
-    input.sheet-specialtyDeselect:checked ~ .sheet-crewKitMods
+    input.sheet-specialtyDeselect:checked ~ .sheet-crewKitMods,
+    input.sheet-specialtyDeselect:checked ~ .sheet-toolCrewKitDirection
     {
         display: none;
     }
@@ -1399,48 +1403,6 @@ span.sheet-specialtySelector
     grid-row: 56;
 }
 
-/*Tool Type deselect button*/
-.sheet-scaleDeselect
-{
-    position: absolute;
-    width: 12px;
-    height: 10px;
-    grid-row: 23;
-    grid-column: 75;
-}
-
-input.sheet-scaleDeselect
-{
-    opacity: 0;
-    z-index: 19;
-}
-
-    input.sheet-scaleDeselect:not(:checked) + span.sheet-scaleDeselect
-    {
-        background-image: url(https://raw.githubusercontent.com/XophRA/FreeSpacerSheet/RollTemplate/FreeSpacer/img/salvoDeactivate.png);
-        background-repeat: no-repeat;
-        background-position: center;
-        opacity: 1;
-        background-size: 12px 10px;
-        z-index: 18;
-    }
-
-    input.sheet-scaleDeselect:checked + span.sheet-scaleDeselect,
-    input.sheet-scaleDeselect:checked,
-    input.sheet-scaleDeselect:not(:checked) ~ .sheet-specialtySelector,
-    input.sheet-scaleDeselect:not(:checked) ~ .sheet-toolTypeDirection,
-    input.sheet-scaleDeselect:checked ~ .sheet-salvoSpecialtyBox,
-    input.sheet-scaleDeselect:checked ~ .sheet-salvoToolTypeBox,
-    input.sheet-scaleDeselect:checked ~ .sheet-salvoToolBox,
-    input.sheet-scaleDeselect:checked ~ .sheet-salvoChargeBox,
-    input.sheet-scaleDeselect:checked ~ .sheet-salvoAdvantageBox,
-    input.sheet-scaleDeselect:checked ~ .sheet-rollSalvoButton,
-    input.sheet-scaleDeselect:checked ~ .sheet-spendChargeCloseSalvoMode,
-    input.sheet-scaleDeselect:checked ~ .sheet-salvoThreatBox
-    {
-        display: none;
-    }
-
 /*Tool deselection buttons*/
 .sheet-toolDeselect
 {
@@ -1469,8 +1431,8 @@ input.sheet-crewKitDeselect:not(:checked) + span.sheet-crewKitDeselect
 
 input.sheet-crewKitDeselect:checked + span.sheet-crewKitDeselect,
 input.sheet-crewKitDeselect:checked,
-input.sheet-crewKitDeselect:not(:checked) ~ .sheet-crewKitSelect,
-input.sheet-crewKitDeselect:not(:checked) ~ .sheet-toolCrewKitDirection
+input.sheet-crewKitDeselect:not(:checked) ~ .sheet-toolCrewKitDirection,
+input.sheet-crewKitDeselect:not(:checked) ~ .sheet-crewKitSelect
 {
     display: none;
 }
@@ -1509,31 +1471,24 @@ span.sheet-crewKitSelect
     z-index: 18;
 }
 
-/*Tool Type Other Selected*/
-input.sheet-otherToolSelector:checked ~ .sheet-salvoToolBox,
-input.sheet-otherToolSelector:checked ~ .sheet-salvoChargeBox
+/*Other Tool Selected*/
+input.sheet-otherTool:checked ~ .sheet-salvoToolBox,
+input.sheet-otherTool:checked ~ .sheet-salvoChargeBox,
+input.sheet-otherTool:checked ~ .sheet-spendChargeCloseSalvoMode,
+input.sheet-otherTool:checked ~ .sheet-overchargeHighlight,
+input.sheet-otherTool:checked ~ .sheet-chargeCrewKitDirection
 {
     display: none;
 }
-input.sheet-otherToolSelector:checked ~ .sheet-salvoAdvantageBox,
-input.sheet-otherToolSelector:checked ~ .sheet-spendChargeCloseSalvoMode,
-input.sheet-otherToolSelector:checked ~ .sheet-rollSalvoButton,
-input.sheet-otherToolSelector:checked ~ .sheet-salvoThreatBox
+
+input.sheet-otherTool:checked ~ .sheet-salvoAdvantageBox,
+input.sheet-otherTool:checked ~ .sheet-spendChargeCloseSalvoMode,
+input.sheet-otherTool:checked ~ .sheet-rollSalvoButton,
+input.sheet-otherTool:checked ~ .sheet-salvoThreatBox
 {
     display: block;
 }
 
-    /*Tool Type Crew Kit Selected*/
-    input.sheet-crewKitSelector:not(:checked) ~ .sheet-crewKitSelect,
-    input.sheet-crewKitSelector:not(:checked) ~ .sheet-crewKitDeselect,
-    input.sheet-crewKitSelector:not(:checked) ~ .sheet-toolCrewKitDirection,
-    input.sheet-crewKitSelector:not(:checked) ~ .sheet-chargeCrewKitDirection,
-    input.sheet-crewKitSelector:not(:checked) ~ .sheet-overchargeHighlight,
-    input.sheet-crewKitSelector:not(:checked) ~ .sheet-crewKitMods
-    {
-        display: none;
-    }
-
 /*Crew Kit Tool Locations*/
 .sheet-crewKitScanner
 {
@@ -1577,6 +1532,12 @@ input.sheet-otherToolSelector:checked ~ .sheet-salvoThreatBox
     grid-column: 4;
 }
 
+.sheet-otherTool
+{
+    grid-row: 65;
+    grid-column: 75;
+}
+
 /*Crew Kit Tool Selected*/
 input.sheet-crewKitScanner:not(:checked) ~ .sheet-crewKitScannerMods,
 input.sheet-crewKitBioChemKit:not(:checked) ~ .sheet-crewKitBioChemKitMods,
diff --git a/FreeSpacer/FreeSpacer.html b/FreeSpacer/FreeSpacer.html
index e3e6b60d76..9dbdee3cce 100644
--- a/FreeSpacer/FreeSpacer.html
+++ b/FreeSpacer/FreeSpacer.html
@@ -146,24 +146,6 @@
             <input type="radio" class="specialtySelector engineeringSelect specialty14Select mechatronicsSpecialties" name="attr_salvoSpecialty" value="Material Science" /><span class="specialtySelector engineeringSelect specialty14Select mechatronicsSpecialties"></span>
             <input type="radio" class="specialtySelector engineeringSelect specialty15Select mechatronicsSpecialties" name="attr_salvoSpecialty" value="Archaic Technology" /><span class="specialtySelector engineeringSelect specialty15Select mechatronicsSpecialties"></span>
 
-            <!--Tool Type Selector-->
-            <div class="salvoToolTypeBox decisionBox">
-                <select name="attr_salvoScale" class="salvoToolType">
-                    <option value="0"></option>
-                    <option value="1">Crew Kit</option>
-                    <option value="2">Ship Systems</option>
-                    <option value="3">Ship Modules</option>
-                    <option value="4">Other Tools</option>
-                </select>
-            </div>
-
-            <!--Tool Type Functionality-->
-            <input type="radio" name="attr_salvoScale" class="scaleDeselect" value="0" checked><span class="scaleDeselect"></span>
-            <input type="radio" name="attr_salvoScale" class="hidden crewKitSelector" value="1">
-            <input type="radio" name="attr_salvoScale" class="hidden shipSystemSelector" value="2">
-            <input type="radio" name="attr_salvoScale" class="hidden shipModuleSelector" value="3">
-            <input type="radio" name="attr_salvoScale" class="hidden otherToolSelector" value="4">
-
             <!--Tool Input Box-->
             <div class="salvoToolBox inputBox">
                 <input type="number" class="salvoRating" name="attr_salvoToolRating" readonly />
@@ -179,6 +161,7 @@
             <input type="radio" class="crewKitSelect crewKitMultitool" name="attr_salvoTool" value="Multitool" /><span class="crewKitSelect crewKitMultitool"></span>
             <input type="radio" class="crewKitSelect crewKitShield" name="attr_salvoTool" value="Shield" /><span class="crewKitSelect crewKitShield"></span>
             <input type="radio" class="crewKitSelect crewKitAssociations" name="attr_salvoTool" value="Associations" /><span class="crewKitSelect crewKitAssociations"></span>
+            <input type="radio" class="crewKitSelect otherTool" name="attr_salvoTool" value="other" /><span class="crewKitSelect otherTool"></span>
 
             <!--Crew Kit Scanner Selection Buttons-->
             <input type="checkbox" class="crewKitMods crewKitScannerMods crewKitScannerSurveySensor" name="attr_salvoMod1" value="1" unchecked /><span class="crewKitMods crewKitScannerMods crewKitScannerSurveySensor"></span>
@@ -279,11 +262,8 @@
             <div class="flowLine specialtyFlow engineeringSpecialtyFlow3 pulseProjectionSpecialties"></div><!--Specialty Flow Line-->
             <div class="flowLine specialtyFlow engineeringSpecialtyFlow4 inscriptionSpecialties"></div><!--Specialty Flow Line-->
             <div class="flowLine specialtyFlow engineeringSpecialtyFlow5 mechatronicsSpecialties"></div><!--Specialty Flow Line-->
-
-
-
-            <div class="flowLine toolTypeDirection">Choose a Type of Tool</div><!--Tool Type Flow Line-->
-            <div class="flowLine toolCrewKitDirection">Choose a Crew Kit Tool</div><!--Crew Kit Tool Flow Line-->
+            <!--<div class="flowLine toolTypeDirection">Choose a Type of Tool</div>--><!--Tool Type Flow Line-->
+            <div class="flowLine toolCrewKitDirection">Choose a Tool</div><!--Crew Kit Tool Flow Line-->
             <div class="flowLine chargeCrewKitDirection">Spend 1 Charge per Mod or 2 for Mods with Rating 0</div><!--Crew Kit Charge Flow Line-->
             <div class="flowLine overchargeHighlight">Overcharged! Spend 1 Charge per Mod or 2 for Mods with Rating 0</div><!--Crew Kit Charge Flow Line-->
         </div>
@@ -1159,7 +1139,7 @@
                     <div class="associationRatingTitleA">Rating</div>
                     <!--Association 1-->
                     <div class="associationA association1 associationListItems">
-                        <input type="text" name="attr_SpeciesAssociation" value="@{Species}" disabled="true"/>
+                        <input type="text" name="attr_SpeciesAssociation" value="@{Species}" disabled="true" />
                     </div>
                     <div class="associationTypeA association1 associationListItems">
                         <input type="text" name="attr_SpeciesassociationTypeTitle" value="Species" disabled="true" />
@@ -1935,18 +1915,21 @@
                 <div class="basicModule module">
                     <div class="moduleTitle">Laboratories</div>
                     <div class="moduleDetail">Projects/Vignettes</div>
+                    <!--BioLab-->
                     <input type="checkbox" name="attr_BioLabFittings" class="hideCheckbox smallCheckbox moduleListLabCheckbox1" value="1" />
                     <span class="smallPips hexSelector moduleListLabCheckbox1"></span>
                     <div class="moduleListLabTitle1">BioLab Fittings</div>
                     <div class="moduleListCost1">1</div>
                     <div class="moduleListFitting1">BioTank</div>
                     <div class="moduleListPips1"><span class="inlinePips FittingD10"></span>&nbsp;&nbsp;&nbsp;<span class="inlinePips FittingD10"></span></div>
+                    <!--GravLab-->
                     <input type="checkbox" name="attr_advancedGravLab" class="hideCheckbox smallCheckbox moduleListLabCheckbox2" value="1" />
                     <span class="smallPips hexSelector moduleListLabCheckbox2"></span>
                     <div class="moduleListLabTitle2">GravLab Fittings</div>
                     <div class="moduleListCost3">1</div>
                     <div class="moduleListFitting3">Data core</div>
                     <div class="moduleListPips3"><span class="inlinePips FittingD10"></span>&nbsp;&nbsp;&nbsp;<span class="inlinePips FittingD10"></span></div>
+                    <!--MechLab-->
                     <input type="checkbox" name="attr_advancedMechLab" class="hideCheckbox smallCheckbox moduleListLabCheckbox3" value="1" />
                     <span class="smallPips hexSelector moduleListLabCheckbox3"></span>
                     <div class="moduleListLabTitle3">MechLab Fittings</div>
@@ -8050,10 +8033,10 @@
         <div class="rolltemplateTextRows rolltemplateCol1 rolltemplateRow1">{{salvoSkill}}<span>(</span>{{salvoSkillRating}}<span>)</span></div>
         <div class="rolltemplateTextRows rolltemplateCol2 rolltemplateRow1">{{salvoSpecialty}}<span>(</span>{{salvoSpecialtyRating}}<span>)</span></div>
         <div class="rolltemplateTextRows rolltemplateCol1 rolltemplateRow2">{{salvoTool}}<span>(</span>{{salvoToolRating}}<span>)</span></div>
-        <div class="rolltemplateTextRows rolltemplateCol2 rolltemplateRow2"><span>Charge(</span>{{salvoCharge}}<span>)</span></div>
+        <div class="rolltemplateTextRows rolltemplateCol2 rolltemplateRow2"><span>Advantage(</span>{{salvoAdvantage}}<span>)</span></div>
 
         <!--Task Dice-->
-        <div class="taskDiceSubheader">Task Dice//</div>
+        <div class="taskDiceSubheader templateSubheader">Task Dice//</div>
         <div class="taskDice dice die0">{{task0}}</div>
         <div class="taskDice dice die1">{{task1}}</div>
         <div class="taskDice dice die2">{{task2}}</div>
@@ -8066,7 +8049,7 @@
         <div class="taskDice dice die9">{{task9}}</div>
 
         <!--Threat Dice-->
-        <div class="threatDiceSubheader">Threat Dice//</div>
+        <div class="threatDiceSubheader templateSubheader">Threat Dice//</div>
         <div class="threatDice dice die0">{{threat0}}</div>
         <div class="threatDice dice die1">{{threat1}}</div>
         <div class="threatDice dice die2">{{threat2}}</div>
@@ -8079,24 +8062,27 @@
         <div class="threatDice dice die9">{{threat9}}</div>
 
         <!--Excess Dice-->
-        <div class="excessDiceSubheader">Excess Dice//</div>
-        <div class="autoHits">
+        <div class="templateSubheader excessDice">Excess Dice//</div>
+        <div class="autoHits excessDice">
             {{#rollGreater() autoHits 0}}
             <span>add {{autoHits}} Hits</span>
             {{/rollGreater() autoHits 0}}
         </div>
-        <div class="autoMisses">
+        <div class="autoMisses excessDice">
             {{#rollGreater() autoMisses 0}}
             <span>add {{autoMisses}} Misses</span>
             {{/rollGreater() autoMisses 0}}
         </div>
 
+        <!--Charge-->
+        <div class="templateSubheader templateCharge"> Charge//</div> <div class="templateChargeTotal templateCharge">{{salvoCharge}}</div>
+
         <!--Results-->
-        <div class="resultsSubheader">Result//</div> <div class="result">{{total}} </div>
+        <div class="templateSubheader templateResults">Result//</div> <div class="templateResultTotal templateResults">{{total}} </div>
 
         <!--Outcome-->
-        <div class="outcomeSubheader">Outcome//</div>
-        <div class="outcome">
+        <div class="templateSubheader templateOutcome">Outcome//</div>
+        <div class="templateOutcome templateOutcomeDisplay">
             <!--Double Critical Roll Outcome-->
             {{#rollGreater() total 4 }}
             <span>Critical(5+)</span>
@@ -8145,8 +8131,8 @@
 <!-- ------- -->
 <script type="text/worker">
     <!--<script type="text/javascript">-->
-        /*Global variables*/
-
+        /*Global Attributes*/
+        var globalAttributes = {};//Store all crewmember attributes for use in the Ship's Salvo Mode'
 
 
         /*Salvo Mode*/
@@ -8159,10 +8145,14 @@
                 "Biosciences", "FieldDynamics", "PulseProjection", "Inscription", "Mechatronics"], function (values)
                 {
                     const setObj = {};
+                    //Reset later set attr
+                    setObj.salvoSpecialty = "";
+                    setObj.salvoTool = "";
+                    setObj.salvoAdvantage = 0;
+
                 if (values.salvoSkill == "Culture")
                 {
-                    setObj.salvoSkillRating = parseInt(values.Culture) || 0;
-                    setObj.salvoSpecialty = "";
+                    setObj.salvoSkillRating = parseInt(values.Culture) || 0;                    
 
                     console.log(setObj);
                     setAttrs(setObj);
@@ -8170,120 +8160,105 @@
                 else if (values.salvoSkill == "Economy")
                 {
                     setObj.salvoSkillRating = parseInt(values.Economy) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Interface")
                 {
                     setObj.salvoSkillRating = parseInt(values.Interface) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Politic")
                 {
                     setObj.salvoSkillRating = parseInt(values.Politic) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Sophontolgy")
                 {
                     setObj.salvoSkillRating = parseInt(values.Sophontolgy) || 0;
-                    setObj.salvoSpecialty = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Athletics")
                 {
                     setObj.salvoSkillRating = parseInt(values.Athletics) || 0;
-                    setObj.salvoSpecialty = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Fitness")
                 {
                     setObj.salvoSkillRating = parseInt(values.Fitness) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Geosciences")
                 {
                     setObj.salvoSkillRating = parseInt(values.Geosciences) || 0;
-                    setObj.salvoSpecialty = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Perception")
                 {
                     setObj.salvoSkillRating = parseInt(values.Perception) || 0;
-                    setObj.salvoSpecialty = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Pilot")
                 {
                     setObj.salvoSkillRating = parseInt(values.Pilot) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Biosciences")
                 {
                     setObj.salvoSkillRating = parseInt(values.Biosciences) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Field Dynamics")
                 {
                     setObj.salvoSkillRating = parseInt(values.FieldDynamics) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Pulse Projection")
                 {
                     setObj.salvoSkillRating = parseInt(values.PulseProjection) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Inscription")
                 {
                     setObj.salvoSkillRating = parseInt(values.Inscription) || 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Mechatronics")
                 {
                     setObj.salvoSkillRating = parseInt(values.Mechatronics) || 0;
-                    setObj.salvoSpecialty = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else
                 {
                     setObj.salvoSkillRating = 0;
-                    setObj.salvoSpecialty = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
@@ -8312,12 +8287,13 @@
                 "MechatronicsMechanics", "MechatronicsMaterialScience", "MechatronicsArchaicTechnology"], function (values)
                 {
                     const setObj = {};
+                    //Reset later set attr
+                    setObj.salvoTool = "";
+                    setObj.salvoAdvantage = 0;
 
                 if (values.salvoSpecialty == "Anthropology")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.CultureAnthropology) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
 
                     console.log(setObj);
                     setAttrs(setObj);
@@ -8325,396 +8301,308 @@
                 else if (values.salvoSpecialty == "History")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.CultureHistory) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Lingustics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.CultureLingustics) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Accounting")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.EconomyAccounting) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Commerce")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.EconomyCommerce) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Trade")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.EconomyTrade) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Comms")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InterfaceComms) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Network Defence")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InterfaceNetworkDefence) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Research")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InterfaceResearch) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Administration")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PoliticAdministration) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Group Dynamics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PoliticGroupDynamics) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Oratory")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PoliticOratory) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Performance")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.SophontolgyPerformance) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Persuasion")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.SophontolgyPersuasion) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Sneak")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.AthleticsSneak) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Melee")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.AthleticsMelee) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Parkour")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.AthleticsParkour) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Martial Arts")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FitnessMartialArts) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Endurance")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FitnessEndurance) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Strength")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FitnessStrength) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Architecture")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.GeosciencesArchitecture) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Planetology")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.GeosciencesPlanetology) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Mining")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.GeosciencesMining) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Survey")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PerceptionSurvey) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Alertness")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PerceptionAlertness) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Analysis")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PerceptionAnalysis) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Grav Drive")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PilotGravDrive) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Pulse Drive")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PilotPulseDrive) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Archaic Vehicle")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PilotArchaicVehicle) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Medicine")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.BiosciencesMedicine) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Biomechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.BiosciencesBiomechanics) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Agriculture")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.BiosciencesAgriculture) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Holography")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FieldDynamicsHolography) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Shield Mechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FieldDynamicsShieldMechanics) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Astronavigation")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FieldDynamicsAstronavigation) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Away Weaponry")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PulseProjectionAwayWeaponry) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Artillery")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PulseProjectionArtillery) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Tractor Mechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PulseProjectionTractorMechanics) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Hack")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InscriptionHack) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Trace")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InscriptionTrace) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Code")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InscriptionCode) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Mechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.MechatronicsMechanics) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Material Science")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.MechatronicsMaterialScience) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Archaic Technology")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.MechatronicsArchaicTechnology) || 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                   
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else
                 {
                     setObj.salvoSpecialtyRating = 0;
-                    setObj.salvoScale = "";
-                    setObj.salvoTool = "";
-
+                    
                     console.log(setObj);
                     setAttrs(setObj);
                 }
@@ -8722,21 +8610,18 @@
         });
 
         //Close Salvo Mode and spend Charge after roll
-        on("change:spendChargeCloseSalvo", (event) =>
+        on("change:spendchargeclosesalvo", (event) =>
         {
-            getAttrs(["salvoScale", "ReactorCharge", "ReactorOvercharge", "salvoCharge"], function (values)
+            getAttrs(["ReactorCharge", "ReactorOvercharge", "salvoCharge"], function (values)
             {
                 const setObj = {};
 
                 //Spend Charge from Personal Reactor
-                if (values.salvoScale == 1)
-                {
-                    let adjustedReactorCharge = parseInt(values.ReactorCharge) || 0;
-                    adjustedReactorCharge += parseInt(values.ReactorOvercharge) || 0;
-                    adjustedReactorCharge -= parseInt(values.salvoCharge) || 0;
-                    setObj.ReactorCharge = adjustedReactorCharge;
-                    setObj.ReactorOvercharge = 0;
-                };
+                let adjustedReactorCharge = parseInt(values.ReactorCharge) || 0;
+                adjustedReactorCharge += parseInt(values.ReactorOvercharge) || 0;
+                adjustedReactorCharge -= parseInt(values.salvoCharge) || 0;
+                setObj.ReactorCharge = adjustedReactorCharge;
+                setObj.ReactorOvercharge = 0;
 
                 //Close Salvo Mode
                 setObj.salvoMode = 0;
@@ -8755,27 +8640,21 @@
             setObj.salvoSkill = "";
 
             setAttrs(setObj);
+            console.log("Reset", setObj)
         });
 
         //Reset Salvo Mode
-        on("change:salvoMode", (event) =>
+        on("change:salvomode", (event) =>
         {
             const setObj = {};
 
             setObj.salvoSkill = "";
-
-            setAttrs(setObj);
-
-        });
-
-        //Reset salvo Tool
-        on("change:salvoscale", (event) =>
-        {
-            const setObj = {};
-
+            setObj.salvoSpecialty = "";
             setObj.salvoTool = "";
- 
+            setObj.salvoAdvantage = 0;
+
             setAttrs(setObj);
+
         });
 
         //Reset salvoMods
@@ -9763,16 +9642,10 @@
         });
 
         //Generate Salvo Macro
-        on("change:salvoSkillRating change:salvoSpecialtyRating change:salvoToolRating change:salvoAdvantage change:salvoThreat change:salvoscale", (event) =>
+        on("change:salvoskill change:salvoskillrating change:salvospecialty change:salvospecialtyrating change:salvotool change:salvotoolrating change:salvoadvantage change:salvothreat", (event) =>
         {
             getAttrs(["salvoSkill", "salvoSkillRating", "salvoSpecialty", "salvoSpecialtyRating", "salvoTool", "salvoToolRating", "salvoAdvantage", "salvoThreat", "salvoCharge"], function (values)
             {
-                let tool = values.salvoTool;
-                if (values.salvoTool == "")
-                {
-                    tool = "other";
-                }
-
                 //Sum the task dice
                 let taskDice = 0;
                 ["salvoSkillRating", "salvoSpecialtyRating", "salvoToolRating", "salvoAdvantage"].forEach((asset) =>
@@ -9829,7 +9702,7 @@
                     return `{{threat${num}=$[[${(num + taskDice) * 2}]]}}`;
                 }).join(' ');
 
-                setObj.salvoMacro = `&{template:FS} {{salvoSkill=${values.salvoSkill}}} {{salvoSkillRating=${values.salvoSkillRating}}} {{salvoSpecialty=${values.salvoSpecialty}}} {{salvoSpecialtyRating=${values.salvoSpecialtyRating}}}  {{salvoTool=${tool}}} {{salvoToolRating=${values.salvoToolRating}}} {{salvoCharge=${values.salvoCharge}}} {{total=${wholeRoll}}} ${taskFields} ${threatFields} ${autoHits} ${autoMisses}`;
+                setObj.salvoMacro = `&{template:FS} {{salvoSkill=${values.salvoSkill}}} {{salvoSkillRating=${values.salvoSkillRating}}} {{salvoSpecialty=${values.salvoSpecialty}}} {{salvoSpecialtyRating=${values.salvoSpecialtyRating}}}  {{salvoTool=${values.salvoTool}}} {{salvoToolRating=${values.salvoToolRating}}} {{salvoCharge=${values.salvoCharge}}} {{salvoAdvantage=${values.salvoAdvantage}}} {{total=${wholeRoll}}} ${taskFields} ${threatFields} ${autoHits} ${autoMisses}`;
 
                 console.log(setObj);
                 setAttrs(setObj);