From fae1c53738937bd46ff8b42e6c4ea2d0ddde23a5 Mon Sep 17 00:00:00 2001
From: Christoph <christophkw@gmail.com>
Date: Tue, 16 Jun 2020 09:51:00 -0700
Subject: [PATCH] Salvo Mode Direction Update

Added directions to all Slavo Mode boxes
Removed directions from flow lines
Added functionality for directions in reactor box
Centred Salvo Title
---
 FreeSpacer/FreeSpacer.css  |   2 +-
 FreeSpacer/FreeSpacer.html | 543 ++++++++++++++++++++++++++++---------
 2 files changed, 415 insertions(+), 130 deletions(-)

diff --git a/FreeSpacer/FreeSpacer.css b/FreeSpacer/FreeSpacer.css
index eac517f7af..29e950837d 100644
--- a/FreeSpacer/FreeSpacer.css
+++ b/FreeSpacer/FreeSpacer.css
@@ -876,7 +876,7 @@ input.sheet-salvoRollButton + span.sheet-salvoRollButton, input.sheet-salvoRollB
 .sheet-salvoTitle
 {
     grid-row: 1;
-    grid-column: 39;
+    grid-column: 41;
     background-image: url(https://raw.githubusercontent.com/XophRA/FreeSpacerSheet/RollTemplate/FreeSpacer/img/terminal.png);
     background-repeat: no-repeat;
     background-position: center;
diff --git a/FreeSpacer/FreeSpacer.html b/FreeSpacer/FreeSpacer.html
index 3c221a96d1..70f0097035 100644
--- a/FreeSpacer/FreeSpacer.html
+++ b/FreeSpacer/FreeSpacer.html
@@ -54,10 +54,10 @@
             <!--Skill Input Box-->
             <div class="salvoSkillBox inputBox">
                 <input type="number" class="salvoRating" name="attr_salvoSkillRating" readonly />
-                <input type="text" class="salvoAttr" name="attr_salvoSkill" readonly />
+                <input type="text" class="salvoAttr" name="attr_salvoSkill" value="Choose a Skill" readonly />
             </div>
             <!--Skill Selection Buttons-->
-            <input type="radio" class="skillDeselect" name="attr_salvoSkill" value="" checked /><span class="skillDeselect"></span>
+            <input type="radio" class="skillDeselect" name="attr_salvoSkill" value="Choose a Skill" checked /><span class="skillDeselect"></span>
             <input type="radio" class="skillSelector communicationsSelect skill1Select cultureSkill" name="attr_salvoSkill" value="Culture" /><span class="communicationsSelect skill1Select skillSelector"></span>
             <input type="radio" class="skillSelector communicationsSelect skill2Select economySkill" name="attr_salvoSkill" value="Economy" /><span class="communicationsSelect skill2Select skillSelector"></span>
             <input type="radio" class="skillSelector communicationsSelect skill3Select interfaceSkill" name="attr_salvoSkill" value="Interface" /><span class="communicationsSelect skill3Select skillSelector"></span>
@@ -78,10 +78,10 @@
             <!--Specialty Input-->
             <div class="salvoSpecialtyBox inputBox">
                 <input type="number" class="salvoRating" name="attr_salvoSpecialtyRating" readonly />
-                <input type="text" class="salvoAttr" name="attr_salvoSpecialty" readonly />
+                <input type="text" class="salvoAttr" name="attr_salvoSpecialty" value="Choose a Specialty" readonly />
             </div>
             <!--Specialty Selection Buttons-->
-            <input type="radio" class="specialtyDeselect" name="attr_salvoSpecialty" value="" checked /><span class="specialtyDeselect"></span>
+            <input type="radio" class="specialtyDeselect" name="attr_salvoSpecialty" value="Choose a Specialty" checked /><span class="specialtyDeselect"></span>
             <!--Communications Department-->
             <!--Culture Specialies-->
             <input type="radio" class="specialtySelector communicationsSelect specialty1Select cultureSpecialties" name="attr_salvoSpecialty" value="Anthropology" /><span class="specialtySelector communicationsSelect specialty1Select cultureSpecialties"></span>
@@ -149,11 +149,11 @@
             <!--Tool Input Box-->
             <div class="salvoToolBox inputBox">
                 <input type="number" class="salvoRating" name="attr_salvoToolRating" readonly />
-                <input type="text" class="salvoAttr" name="attr_salvoTool" readonly />
+                <input type="text" class="salvoAttr" name="attr_salvoTool" value="Choose a Tool" readonly />
             </div>
 
             <!--Crew Kit Selection Buttions-->
-            <input type="radio" class="crewKitDeselect toolDeselect" name="attr_salvoTool" value="" checked /><span class="crewKitDeselect toolDeselect"></span>
+            <input type="radio" class="crewKitDeselect toolDeselect" name="attr_salvoTool" value="Choose a Tool" checked /><span class="crewKitDeselect toolDeselect"></span>
             <input type="radio" class="crewKitSelect crewKitScanner" name="attr_salvoTool" value="Scanner" /><span class="crewKitSelect crewKitScanner"></span>
             <input type="radio" class="crewKitSelect crewKitBioChemKit" name="attr_salvoTool" value="BioChem Kit" /><span class="crewKitSelect crewKitBioChemKit"></span>
             <input type="radio" class="crewKitSelect crewKitAugmentation" name="attr_salvoTool" value="Augmentation" /><span class="crewKitSelect crewKitAugmentation"></span>
@@ -222,7 +222,7 @@
             <!--Charge Process Box-->
             <div class="salvoChargeBox processBox">
                 <input type="number" class="salvoRating" name="attr_salvoCharge" readonly />
-                <input type="text" class="salvoAttr" name="attr_salvoResource" readonly />
+                <input type="text" class="salvoAttr" name="attr_salvoChargeDirection" value="Charged" readonly />
             </div>
 
             <!--Advantage Input Box-->
@@ -245,8 +245,8 @@
             </div>
 
             <!--Flow Lines-->
-            <div class="flowLine skillDirection">Choose a Skill</div><!--Skill Flow Line-->
-            <div class="flowLine specialtyFlow specialtyDirection">Choose a Specialty</div><!--Specialty Flow Line-->
+            <div class="flowLine skillDirection"></div><!--Skill Flow Line-->
+            <div class="flowLine specialtyFlow specialtyDirection"></div><!--Specialty Flow Line-->
             <div class="flowLine specialtyFlow communicationsSpecialtyFlow1 cultureSpecialties"></div><!--Culture Specialty Flow Line-->
             <div class="flowLine specialtyFlow communicationsSpecialtyFlow2 economySpecialties"></div><!--Economy Specialty Flow Line-->
             <div class="flowLine specialtyFlow communicationsSpecialtyFlow3 interfaceSpecialties"></div><!--Specialty Flow Line-->
@@ -262,10 +262,10 @@
             <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 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 class="flowLine toolCrewKitDirection"></div><!--Crew Kit Tool Flow Line-->
+            <div class="flowLine chargeCrewKitDirection"></div><!--Crew Kit Charge Flow Line-->
+            <div class="flowLine overchargeHighlight"></div><!--Crew Kit Charge Flow Line-->
         </div>
 
 
@@ -8138,13 +8138,13 @@
                 {
                     const setObj = {};
                     //Reset later set attr
-                    setObj.salvoSpecialty = "";
-                    setObj.salvoTool = "";
+                    setObj.salvoSpecialty = "Choose a Specialty";
+                    setObj.salvoTool = "Choose a Tool";
                     setObj.salvoAdvantage = 0;
 
                 if (values.salvoSkill == "Culture")
                 {
-                    setObj.salvoSkillRating = parseInt(values.Culture) || 0;                    
+                    setObj.salvoSkillRating = parseInt(values.Culture) || 0;
 
                     console.log(setObj);
                     setAttrs(setObj);
@@ -8152,105 +8152,105 @@
                 else if (values.salvoSkill == "Economy")
                 {
                     setObj.salvoSkillRating = parseInt(values.Economy) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Interface")
                 {
                     setObj.salvoSkillRating = parseInt(values.Interface) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Politic")
                 {
                     setObj.salvoSkillRating = parseInt(values.Politic) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Sophontolgy")
                 {
                     setObj.salvoSkillRating = parseInt(values.Sophontolgy) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Athletics")
                 {
                     setObj.salvoSkillRating = parseInt(values.Athletics) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Fitness")
                 {
                     setObj.salvoSkillRating = parseInt(values.Fitness) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Geosciences")
                 {
                     setObj.salvoSkillRating = parseInt(values.Geosciences) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Perception")
                 {
                     setObj.salvoSkillRating = parseInt(values.Perception) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Pilot")
                 {
                     setObj.salvoSkillRating = parseInt(values.Pilot) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Biosciences")
                 {
                     setObj.salvoSkillRating = parseInt(values.Biosciences) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Field Dynamics")
                 {
                     setObj.salvoSkillRating = parseInt(values.FieldDynamics) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Pulse Projection")
                 {
                     setObj.salvoSkillRating = parseInt(values.PulseProjection) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Inscription")
                 {
                     setObj.salvoSkillRating = parseInt(values.Inscription) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSkill == "Mechatronics")
                 {
                     setObj.salvoSkillRating = parseInt(values.Mechatronics) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else
                 {
                     setObj.salvoSkillRating = 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
@@ -8280,7 +8280,7 @@
                 {
                     const setObj = {};
                     //Reset later set attr
-                    setObj.salvoTool = "";
+                    setObj.salvoTool = "Choose a Tool";
                     setObj.salvoAdvantage = 0;
 
                 if (values.salvoSpecialty == "Anthropology")
@@ -8293,308 +8293,308 @@
                 else if (values.salvoSpecialty == "History")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.CultureHistory) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Lingustics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.CultureLingustics) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Accounting")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.EconomyAccounting) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Commerce")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.EconomyCommerce) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Trade")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.EconomyTrade) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Comms")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InterfaceComms) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Network Defence")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InterfaceNetworkDefence) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Research")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InterfaceResearch) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Administration")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PoliticAdministration) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Group Dynamics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PoliticGroupDynamics) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Oratory")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PoliticOratory) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Performance")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.SophontolgyPerformance) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Persuasion")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.SophontolgyPersuasion) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Sneak")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.AthleticsSneak) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Melee")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.AthleticsMelee) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Parkour")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.AthleticsParkour) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Martial Arts")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FitnessMartialArts) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Endurance")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FitnessEndurance) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Strength")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FitnessStrength) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Architecture")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.GeosciencesArchitecture) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Planetology")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.GeosciencesPlanetology) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Mining")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.GeosciencesMining) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Survey")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PerceptionSurvey) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Alertness")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PerceptionAlertness) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Analysis")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PerceptionAnalysis) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Grav Drive")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PilotGravDrive) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Pulse Drive")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PilotPulseDrive) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Archaic Vehicle")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PilotArchaicVehicle) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Medicine")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.BiosciencesMedicine) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Biomechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.BiosciencesBiomechanics) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Agriculture")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.BiosciencesAgriculture) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Holography")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FieldDynamicsHolography) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Shield Mechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FieldDynamicsShieldMechanics) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Astronavigation")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.FieldDynamicsAstronavigation) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Away Weaponry")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PulseProjectionAwayWeaponry) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Artillery")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PulseProjectionArtillery) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Tractor Mechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.PulseProjectionTractorMechanics) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Hack")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InscriptionHack) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Trace")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InscriptionTrace) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Code")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.InscriptionCode) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Mechanics")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.MechatronicsMechanics) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Material Science")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.MechatronicsMaterialScience) || 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else if (values.salvoSpecialty == "Archaic Technology")
                 {
                     setObj.salvoSpecialtyRating = parseInt(values.MechatronicsArchaicTechnology) || 0;
-                   
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
                 else
                 {
                     setObj.salvoSpecialtyRating = 0;
-                    
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }
@@ -8629,7 +8629,7 @@
             const setObj = {};
 
             setObj.salvoMode = 0;
-            setObj.salvoSkill = "";
+            setObj.salvoSkill = "Choose a Skill";
 
             setAttrs(setObj);
             console.log("Reset", setObj)
@@ -8638,15 +8638,28 @@
         //Reset Salvo Mode
         on("change:salvomode", (event) =>
         {
-            const setObj = {};
+            getAttrs(["ReactorCharge", "ReactorOvercharge"], function (values)
+            {
+                const setObj = {};
 
-            setObj.salvoSkill = "";
-            setObj.salvoSpecialty = "";
-            setObj.salvoTool = "";
-            setObj.salvoAdvantage = 0;
+                setObj.salvoSkill = "Choose a Skill";
+                setObj.salvoSpecialty = "Choose a Specialty";
+                setObj.salvoTool = "Choose a Tool";
+                setObj.salvoAdvantage = 0;
 
-            setAttrs(setObj);
+                setObj.salvoChargeDirection = "Charged";
 
+                if (values.ReactorOvercharge == "1")
+                {
+                    setObj.salvoChargeDirection = "Overcharged";
+                }
+                else if (values.ReactorCharge <= 0)
+                {
+                    setObj.salvoChargeDirection = "Uncharged";
+                }
+
+                setAttrs(setObj);
+            });
         });
 
         //Reset salvoMods
@@ -8674,7 +8687,7 @@
             setObj.salvoMod18 = 0;
             setObj.salvoMod19 = 0;
             setObj.salvoMod20 = 0;
-
+            setObj.salvoChargeDirection = "Charged";
             setAttrs(setObj);
         });
 
@@ -8693,15 +8706,27 @@
                 "MultitoolDisruptorTargeter", "MultitoolTractorLifter", "MultitoolUtilityManipulator",
                 "ShieldKineticDeflector", "ShieldEnergyDissipater", "ShieldHolographMode", "ShieldMultifield",
                 "AssociationsSpecies", "AssociationsWartimeFaction", "AssociationsFactionRating", "AssociationsFactionRatingA4", "AssociationsFactionRatingA5", "AssociationsFactionRatingA6", "AssociationsFactionRatingA7", "AssociationsFactionRatingA8", "AssociationsFactionRatingA9", "AssociationsFactionRatingA0", "AssociationsFactionRatingB1", "AssociationsFactionRatingB2", "AssociationsFactionRatingB3", "AssociationsFactionRatingB4", "AssociationsFactionRatingB5", "AssociationsFactionRatingB6", "AssociationsFactionRatingB7", "AssociationsFactionRatingB8", "AssociationsFactionRatingB9", "AssociationsFactionRatingB0"], function (values)
-            {
-                console.log("Tool: ", values.salvoTool);
-                let charge = 0;
-                let rating = 0;
-                let maxCharge = parseInt(values.ReactorCharge) || 0;
-                maxCharge += parseInt(values.ReactorOvercharge) || 0;
-                const setObj = {};
+                {
+                    const setObj = {};
 
-                console.log("Max Charge: ", maxCharge);
+                    //console.log("Tool: ", values.salvoTool);
+
+                    let charge = 0;
+                    let rating = 0;
+                    let maxCharge = parseInt(values.ReactorCharge) || 0;
+                    maxCharge += parseInt(values.ReactorOvercharge) || 0;
+                    //console.log("Max Charge: ", maxCharge);
+
+                    //Set the status of the Reactor
+                    setObj.salvoChargeDirection = "Charged";
+                    if (values.ReactorOvercharge == "1" && charge <= 0)
+                    {
+                        setObj.salvoChargeDirection = "Overcharged";
+                    }
+                    else if (values.ReactorCharge <= 0)
+                    {
+                        setObj.salvoChargeDirection = "Uncharged";
+                    }
 
                 if (values.salvoTool == "Scanner")
                 {
@@ -8717,17 +8742,24 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
 
                         }
                         else
                         {
                             rating += mod1;
                             charge++;
+                            setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod1 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8738,16 +8770,23 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod2;
                             charge++;
+                            setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod2 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8758,16 +8797,23 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod3;
                             charge++;
+                            setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod3 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8778,16 +8824,23 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod4;
                             charge++;
+                            setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod4 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8809,16 +8862,23 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod1;
                             charge++;
+                            setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod1 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8829,16 +8889,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod2;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod2 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8849,16 +8915,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod3;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod3 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8882,16 +8954,22 @@
                         {
                             charge += 2;
                             rating += 2;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod1;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod1 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8902,16 +8980,22 @@
                         {
                             charge += 2;
                             rating += 2;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod2;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod2 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8922,16 +9006,22 @@
                         {
                             charge += 2;
                             rating += 2;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod3;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod3 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8942,16 +9032,22 @@
                         {
                             charge += 2;
                             rating += 2;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod4;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod4 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8962,16 +9058,22 @@
                         {
                             charge += 2;
                             rating += 2;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod5;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod5 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -8993,16 +9095,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod1;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod1 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9013,16 +9121,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod2;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod2 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9033,16 +9147,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod3;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod3 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9064,16 +9184,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod1;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod1 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9084,16 +9210,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod2;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod2 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9104,16 +9236,23 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
+
                         }
                         else
                         {
                             rating += mod3;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod3 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9136,16 +9275,23 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
+
                         }
                         else
                         {
                             rating += mod1;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod1 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9156,16 +9302,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod2;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod2 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9176,16 +9328,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod3;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod3 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9196,16 +9354,22 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod4;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         //Unclick the Mod if insuficient charge
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod4 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9244,15 +9408,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod1;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod1 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9263,15 +9433,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod2;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod2 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9282,15 +9458,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod3;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod3 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9301,15 +9483,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod4;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod4 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9320,15 +9508,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod5;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod5 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9339,15 +9533,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod6;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod6 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9358,15 +9558,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod7;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod7 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9377,15 +9583,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod8;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod8 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9396,15 +9608,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod9;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod9 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9415,15 +9633,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod10;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod10 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9434,15 +9658,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod11;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod11 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9453,15 +9683,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod12;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod12 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9472,15 +9708,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod13;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod13 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9491,15 +9733,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod14;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod14 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9510,15 +9758,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod15;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod15 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9529,15 +9783,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod16;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod16 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9548,15 +9808,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod17;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod17 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9567,15 +9833,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod18;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod18 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9586,15 +9858,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod19;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod19 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9605,15 +9883,21 @@
                         {
                             charge += 2;
                             rating += 1;
+                            setObj.salvoChargeDirection = "NF 2 Charge";
                         }
                         else
                         {
                             rating += mod20;
-                            charge++;
+                            charge++; setObj.salvoChargeDirection = "Charged";
                         }
                         if (charge > maxCharge)
                         {
                             setObj.salvoMod20 = 0;
+                            setObj.salvoChargeDirection = "Insufficient Charge";
+                        }
+                        else if (charge == maxCharge)
+                        {
+                            setObj.salvoChargeDirection = "Expended";
                         }
                     }
 
@@ -9627,6 +9911,7 @@
                     let rating = 0;
                     setObj.salvoToolRating = rating;
                     setObj.salvoCharge = charge;
+
                     console.log(setObj);
                     setAttrs(setObj);
                 }