From ea09ef4c4ab37f3948dc4231cd6551f5c8cff5cc Mon Sep 17 00:00:00 2001
From: George Blouin <GBlouin@us.ci.org>
Date: Tue, 31 Jan 2023 12:43:04 -0700
Subject: [PATCH] No Booster in Omni pods + Clear Use flags

Cannot add booster to an omni pod.
When you change tech it clears the flags so that you don't have to click, unclick, and re-click to add.
---
 saw/src/main/java/saw/gui/frmVee.java          | 6 ++++--
 saw/src/main/java/saw/gui/frmVeeWide.java      | 6 ++++--
 sswlib/src/main/java/components/CVLoadout.java | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/saw/src/main/java/saw/gui/frmVee.java b/saw/src/main/java/saw/gui/frmVee.java
index 9a47ed55..e87aaafc 100644
--- a/saw/src/main/java/saw/gui/frmVee.java
+++ b/saw/src/main/java/saw/gui/frmVee.java
@@ -7129,7 +7129,7 @@ private void RefreshEquipment() {
         } else {
             chkSupercharger.setEnabled( false );
         }
-        if( CurVee.IsVTOL() && CommonTools.IsAllowed( CurVee.GetLoadout().GetVTOLBooster().GetAvailability(), CurVee ) ) {
+        if( CurVee.IsVTOL() && CommonTools.IsAllowed( CurVee.GetLoadout().GetVTOLBooster().GetAvailability(), CurVee ) && !CurVee.IsOmni()) {
             chkJetBooster.setEnabled( true );
         } else {
             chkJetBooster.setEnabled( false );
@@ -7304,6 +7304,7 @@ private void UnlockGUIFromOmni() {
         chkYearRestrict.setEnabled( true );
         //chkBSPFD.setEnabled( true );
         chkSupercharger.setEnabled( true );
+        chkJetBooster.setEnabled(true);
         chkEnviroSealing.setEnabled( false );
         // now enable the Omni controls
         cmbOmniVariant.setSelectedItem("");
@@ -8576,7 +8577,7 @@ private void CheckEquipment() {
     }
 
     private void LockGUIForOmni() {
-        // this locks most of the GUI controls.  Used mainly by Omnimechs.
+        // this locks most of the GUI controls.  Used mainly by OmniVehicles.
         isLocked = true;
 
         chkOmniVee.setSelected( true );
@@ -8601,6 +8602,7 @@ private void LockGUIForOmni() {
         btnLockChassis.setEnabled( false );
         chkYearRestrict.setEnabled( false );
         chkTrailer.setEnabled( false );
+        chkJetBooster.setEnabled(false);
         if( CurVee.GetBaseLoadout().GetJumpJets().GetNumJJ() > 0 ) {
             //cmbJumpJetType.setEnabled( false );
         }
diff --git a/saw/src/main/java/saw/gui/frmVeeWide.java b/saw/src/main/java/saw/gui/frmVeeWide.java
index a59ad649..ec56bb07 100644
--- a/saw/src/main/java/saw/gui/frmVeeWide.java
+++ b/saw/src/main/java/saw/gui/frmVeeWide.java
@@ -6407,7 +6407,7 @@ private void RefreshEquipment() {
         } else {
             chkSupercharger.setEnabled( false );
         }
-        if( CurVee.IsVTOL() && CommonTools.IsAllowed( CurVee.GetLoadout().GetVTOLBooster().GetAvailability(), CurVee ) ) {
+        if( CurVee.IsVTOL() && CommonTools.IsAllowed( CurVee.GetLoadout().GetVTOLBooster().GetAvailability(), CurVee ) && !CurVee.isOmni() ) {
             chkJetBooster.setEnabled( true );
         } else {
             chkJetBooster.setEnabled( false );
@@ -6578,6 +6578,7 @@ private void UnlockGUIFromOmni() {
         chkYearRestrict.setEnabled( true );
         //chkBSPFD.setEnabled( true );
         chkSupercharger.setEnabled( true );
+        chkJetBooster.setEnabled(true);
         chkEnviroSealing.setEnabled( false );
         // now enable the Omni controls
         cmbOmniVariant.setEnabled( false );
@@ -6847,7 +6848,7 @@ private void CheckEquipment() {
     }
     
     private void LockGUIForOmni() {
-        // this locks most of the GUI controls.  Used mainly by Omnimechs.
+        // this locks most of the GUI controls.  Used mainly by OmniVehichles.
         isLocked = true;
         
         chkOmniVee.setSelected( true );
@@ -6888,6 +6889,7 @@ private void LockGUIForOmni() {
 
         chkFractional.setEnabled( false );
         chkEnviroSealing.setEnabled( false );
+        chkJetBooster.setEnabled(false);
         if( CurVee.GetBaseLoadout().HasSupercharger() ) {
             chkSupercharger.setEnabled( false );
         }
diff --git a/sswlib/src/main/java/components/CVLoadout.java b/sswlib/src/main/java/components/CVLoadout.java
index 0eeb3a37..e9481daf 100644
--- a/sswlib/src/main/java/components/CVLoadout.java
+++ b/sswlib/src/main/java/components/CVLoadout.java
@@ -260,6 +260,8 @@ public void FullUnallocate() {
 
     public void ClearLoadout() {
         FullUnallocate();
+        UsingSupercharger = false;
+        UsingVTOLBooster = false;
         Owner.SetChanged( true );
     }