Merge pull request #8178 from IllianiBird/camOpsSalvageHardLock

Fix #8177: Prevent Hard Lock When Over Salvage % in Salvage Picker

Author: IllianiBird

MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java

@@ -88,7 +88,7 @@
 import mekhq.campaign.unit.actions.AdjustLargeCraftAmmoAction;
 import mekhq.campaign.universe.Faction;
 import mekhq.gui.FileDialogs;
-import mekhq.gui.dialog.SalvagePostScenarioPicker;
+import mekhq.gui.dialog.camOpsSalvage.SalvagePostScenarioPicker;
 import mekhq.utilities.ReportingUtilities;
 
 /**

MekHQ/src/mekhq/gui/BriefingTab.java

@@ -130,7 +130,16 @@
 import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogSimple;
 import mekhq.gui.baseComponents.roundedComponents.RoundedJButton;
 import mekhq.gui.baseComponents.roundedComponents.RoundedLineBorder;
-import mekhq.gui.dialog.*;
+import mekhq.gui.dialog.CompleteMissionDialog;
+import mekhq.gui.dialog.CustomizeAtBContractDialog;
+import mekhq.gui.dialog.CustomizeMissionDialog;
+import mekhq.gui.dialog.CustomizeScenarioDialog;
+import mekhq.gui.dialog.MissionTypeDialog;
+import mekhq.gui.dialog.NewAtBContractDialog;
+import mekhq.gui.dialog.NewContractDialog;
+import mekhq.gui.dialog.RetirementDefectionDialog;
+import mekhq.gui.dialog.camOpsSalvage.SalvageForcePicker;
+import mekhq.gui.dialog.camOpsSalvage.SalvageTechPicker;
 import mekhq.gui.dialog.factionStanding.manualMissionDialogs.ManualMissionDialog;
 import mekhq.gui.dialog.factionStanding.manualMissionDialogs.SimulateMissionDialog;
 import mekhq.gui.enums.MHQTabType;

…mekhq/gui/dialog/SalvageForcePicker.java …og/camOpsSalvage/SalvageForcePicker.javaMekHQ/src/mekhq/gui/dialog/SalvageForcePicker.java renamed to MekHQ/src/mekhq/gui/dialog/camOpsSalvage/SalvageForcePicker.java MekHQ/src/mekhq/gui/dialog/SalvageForcePicker.java renamed to MekHQ/src/mekhq/gui/dialog/camOpsSalvage/SalvageForcePicker.java

@@ -30,7 +30,7 @@
  * <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
  * affiliated with Microsoft.
  */
-package mekhq.gui.dialog;
+package mekhq.gui.dialog.camOpsSalvage;
 
 import static megamek.client.ui.WrapLayout.wordWrap;
 import static megamek.client.ui.util.UIUtil.scaleForGUI;

…ui/dialog/SalvagePostScenarioPicker.java …psSalvage/SalvagePostScenarioPicker.javaMekHQ/src/mekhq/gui/dialog/SalvagePostScenarioPicker.java renamed to MekHQ/src/mekhq/gui/dialog/camOpsSalvage/SalvagePostScenarioPicker.java MekHQ/src/mekhq/gui/dialog/SalvagePostScenarioPicker.java renamed to MekHQ/src/mekhq/gui/dialog/camOpsSalvage/SalvagePostScenarioPicker.java

@@ -30,7 +30,7 @@
  * <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
  * affiliated with Microsoft.
  */
-package mekhq.gui.dialog;
+package mekhq.gui.dialog.camOpsSalvage;
 
 import static megamek.client.ui.WrapLayout.wordWrap;
 import static megamek.client.ui.util.UIUtil.scaleForGUI;
@@ -785,7 +785,9 @@ private void updateConfirmButtonState(List<SalvageComboBoxGroup> salvageComboBox
 
                 if (currentPercent.compareTo(BigDecimal.valueOf(salvagePercent)) > 0 && !isExchangeRights) {
                     disableConfirmAndColorName(confirmButton, unitSalvageLabel);
-                    shouldEnable = false;
+
+                    // If we've gone over our %, we only block progression if the player is trying to salvage even more.
+                    shouldEnable = !unitSalvageMoneyCurrent.equals(unitSalvageMoneyInitial);
                 }
             }
         }

…/mekhq/gui/dialog/SalvageTechPicker.java …log/camOpsSalvage/SalvageTechPicker.javaMekHQ/src/mekhq/gui/dialog/SalvageTechPicker.java renamed to MekHQ/src/mekhq/gui/dialog/camOpsSalvage/SalvageTechPicker.java MekHQ/src/mekhq/gui/dialog/SalvageTechPicker.java renamed to MekHQ/src/mekhq/gui/dialog/camOpsSalvage/SalvageTechPicker.java

@@ -30,7 +30,7 @@
  * <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
  * affiliated with Microsoft.
  */
-package mekhq.gui.dialog;
+package mekhq.gui.dialog.camOpsSalvage;
 
 import static megamek.client.ui.util.UIUtil.scaleForGUI;
 import static mekhq.utilities.MHQInternationalization.getText;