From fc927e03373a13e4f8aaf59c6a24ea996b65e9da Mon Sep 17 00:00:00 2001
From: Christoph <christophkw@gmail.com>
Date: Tue, 2 Jun 2020 23:28:59 -0700
Subject: [PATCH] Salvo Mode Updates

Added on/off  functionality for advantageBox, salvoButton, and ThreatBox
Added Reset for salvoTool when changing salvoScale
---
 FreeSpacer/FreeSpacer.css  | 23 ++++++++++++++--------
 FreeSpacer/FreeSpacer.html | 39 +++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/FreeSpacer/FreeSpacer.css b/FreeSpacer/FreeSpacer.css
index 2d92df8200..e725db28a1 100644
--- a/FreeSpacer/FreeSpacer.css
+++ b/FreeSpacer/FreeSpacer.css
@@ -108,10 +108,6 @@ hr
 {
     display: none;
 }
-.sheet-invisible
-{
-    visibility:hidden;
-}
 
 /*select & text boxes*/
 select, textarea, input[type="text"], input[type="number"]
@@ -492,9 +488,9 @@ select.sheet-typeSelector
     font-size: 11px;
 }
 
-/* ****************** */
-/* Salvo Mode Button */
-/* **************** */
+/* ************ */
+/* Salvo Mode  */
+/* *********** */
 .sheet-salvoRollButton
 {
     position: absolute;
@@ -1131,7 +1127,10 @@ input.sheet-scaleDeselect
     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-salvoChargeBox,
+    input.sheet-scaleDeselect:checked ~ .sheet-salvoAdvantageBox,
+    input.sheet-scaleDeselect:checked ~ .sheet-rollSalvoButton,
+    input.sheet-scaleDeselect:checked ~ .sheet-salvoThreatBox
     {
         display: none;
     }
@@ -1170,6 +1169,14 @@ input.sheet-crewKitDeselect:not(:checked) ~ .sheet-toolCrewKitDirection
     display: none;
 }
 
+input.sheet-toolDeselect:checked ~ .sheet-salvoAdvantageBox,
+input.sheet-toolDeselect:checked ~ .sheet-rollSalvoButton,
+input.sheet-toolDeselect:checked ~ .sheet-salvoThreatBox
+{
+    display: none;
+}
+
+
 /*Crew Kit Selectors*/
 .sheet-crewKitSelect
 {
diff --git a/FreeSpacer/FreeSpacer.html b/FreeSpacer/FreeSpacer.html
index acfbe70922..1876a13df6 100644
--- a/FreeSpacer/FreeSpacer.html
+++ b/FreeSpacer/FreeSpacer.html
@@ -4070,8 +4070,7 @@
         </div>
     </div>
 
-    
-    
+       
     <!-- ------------------- -->
     <!--    Sophont Log      -->
     <!-- ------------------- -->
@@ -4269,8 +4268,7 @@
         </div>
     </div>
 
-    
-    
+        
     <!-- --------------------- -->
     <!-- Composite Sophont Log -->
     <!-- --------------------- -->
@@ -4594,8 +4592,7 @@
             </div>
         </div>
     </div>
-
-    
+        
     
     <!-- --------------------- -->
     <!--	  Swarm Log        -->
@@ -5060,8 +5057,7 @@
             </div>
         </div>
     </div>
-
-    
+        
     
     <!-- ----------------------- -->
     <!--	  Creature Log   	 -->
@@ -5394,8 +5390,7 @@
             </div>
         </div>
     </div>
-
-    
+        
     
     <!-- --------------------- -->
     <!--	  Behemoth Log        -->
@@ -5827,8 +5822,7 @@
             </div>
         </div>
     </div>
-
-    
+        
     
     <!-- --------------------- -->
     <!--	  Drone Log        -->
@@ -6303,8 +6297,7 @@
         </div>
     </div>
 
-    
-    
+        
     <!-- ----------------------- -->
     <!--	  Shuttle Log        -->
     <!-- ----------------------- -->
@@ -6817,8 +6810,7 @@
             </div>
         </div>
     </div>
-
-    
+        
     
     <!-- ----------------------- -->
     <!--	Small Craft Log      -->
@@ -7088,8 +7080,7 @@
             </div>
         </div>
     </div>
-
-    
+        
     
     <!-- ----------------------- -->
     <!--		Ship Log         -->
@@ -7416,8 +7407,7 @@
             </div>
         </div>
     </div>
-
-    
+        
     
     <!-- ----------------------- -->
     <!--    Capital Ship Log     -->
@@ -8533,6 +8523,12 @@
             });
         });
 
+        //Reset salvo Tool
+        on("change:salvoscale", () =>
+        {
+            setAttrs({ "salvoTool": "" });
+        });
+
         //Reset salvoMods
         on("change:salvotool", (event) =>
         {
@@ -8546,8 +8542,7 @@
 
         //Set the Salvo Tool Rating, track Charge spent, and limit spending to current ReactorCharge
         on("change:salvomod1 change:salvomod2 change:salvomod3 change:salvomod4 change:salvomod5 change:salvomod6 change:salvomod7 change:salvomod8 change:salvomod9 change:salvomod10 change:salvomod11 change:salvomod12 change:salvomod13 change:salvomod14 change:salvomod15 change:salvomod16 change:salvomod17 change:salvomod18 change:salvomod19 change:salvomod20", (event) =>
-        {
-            //console.log("Salvo Tool Changed");
+        {            
             getAttrs(["salvoTool", "ReactorCharge", "ReactorOvercharge",
                 "salvoMod1", "salvoMod2", "salvoMod3", "salvoMod4", "salvoMod5",
                 "salvoMod6", "salvoMod7", "salvoMod8", "salvoMod9", "salvoMod10",