Merge pull request #8103 from IllianiBird/hrStrainFix

Fix: Fixed HR Strain Penalizing Complete Usage

Author: IllianiBird

MekHQ/resources/mekhq/resources/AltAdvancedMedicalCampaignOptionsChangedConfirmationDialog.properties

@@ -28,7 +28,7 @@
 # Microsoft's "Game Content Usage Rules"
 # <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
 # affiliated with Microsoft.
-AdvancedScoutingCampaignOptionsChangedConfirmationDialog.description=<h1 style="text-align:center">Alternate \
+AltAdvancedMedicalCampaignOptionsChangedConfirmationDialog.description=<h1 style="text-align:center">Alternate \
   Advanced Medical (AAM)</h1>\
   You have just enabled <b>AAM</b> in a campaign that previously had it disabled. AAM uses the expanded hit \
   locations and injuries from ATOW:Companion to offer a more dynamic medical experience. It allows for prosthetics, \
@@ -39,5 +39,5 @@ AdvancedScoutingCampaignOptionsChangedConfirmationDialog.description=<h1 style="
   Would you like to gift any ProtoMek Pilots in your campaign the EI Neural Implant for free? This has no effect on \
   non-ProtoMek Pilots or in campaigns where Implants are disabled.\
   <p>For more information on Advanced Scouting, please see the Glossary.</p>
-AdvancedScoutingCampaignOptionsChangedConfirmationDialog.cancel=Decline
-AdvancedScoutingCampaignOptionsChangedConfirmationDialog.confirm=Accept
+AltAdvancedMedicalCampaignOptionsChangedConfirmationDialog.cancel=Decline
+AltAdvancedMedicalCampaignOptionsChangedConfirmationDialog.confirm=Accept

MekHQ/resources/mekhq/resources/CamOpsSalvage.properties

@@ -74,3 +74,6 @@ SalvagePostScenarioPicker.validation.valid=Valid
 SalvagePostScenarioPicker.validation.noTug=No Naval Tug
 SalvagePostScenarioPicker.validation.noCapacity.tow=Needs More Towage
 SalvagePostScenarioPicker.validation.noCapacity.cargo=Needs More Cargo
+SalvagePostScenarioPicker.confirmation.text=<h2 style="text-align:center;">Are You Sure?</h2>Please make sure that \
+  you have ticked either the salvage or sell boxes for any unit you wish to keep (or sell). Otherwise, you are gifting\
+  \ anything you salvage to Allied Command.

MekHQ/resources/mekhq/resources/FatigueTrackingCampaignOptionsChangedConfirmationDialog.properties

@@ -30,7 +30,7 @@
 # affiliated with Microsoft.
 FatigueTrackingCampaignOptionsChangedConfirmationDialog.description=<h1 style="text-align:center">Fatigue</h1>\
   You have just enabled the tracking of <b>Fatigue</b> in a campaign that previously had it disabled.\
-  <p>Would you like a complementary Field Kitchen-enabled unit? This unit will be fully crewed. However, if your \
+  <p>Would you like a complementary Field Kitchen-equipped unit? This unit will be fully crewed. However, if your \
   campaign is particularly large, this may not be sufficient to cover all your needs.</p>\
   <p>Additional Field Kitchen-equipped units can be purchased from the <b>Unit Market</b>, or <b>Purchase Unit</b> \
   dialog.</p>

MekHQ/resources/mekhq/resources/PrisonerTrackingCampaignOptionsChangedConfirmationDialog.properties

@@ -30,7 +30,7 @@
 # affiliated with Microsoft.
 PrisonerTrackingCampaignOptionsChangedConfirmationDialog.description=<h1 style="text-align:center">Prisoner \
   Tracking</h1>\
-  You have just enabled the tracking of Prisoner Capacity in a campaign that previously had it disabled.\
+  You have just enabled the tracking of <b>Prisoner Capacity</b> in a campaign that previously had it disabled.\
   <p>Would you like a complementary infantry unit to guard your prisoners? This unit will be fully crewed. However, \
   if your campaign is particularly large, this may not be sufficient to cover all your needs.</p>\
   <p>Additional infantry units can be purchased from the <b>Unit Market</b>, or <b>Purchase Unit</b> dialog.</p>

MekHQ/resources/mekhq/resources/VeterancyAwardsCampaignOptionsChangedConfirmationDialog.properties

@@ -1,8 +1,38 @@
+# Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
+#
+# This file is part of MekHQ.
+#
+# MekHQ is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (GPL),
+# version 3 or (at your option) any later version,
+# as published by the Free Software Foundation.
+#
+# MekHQ is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# A copy of the GPL should have been included with this project;
+# if not, see <https://www.gnu.org/licenses/>.
+#
+# NOTICE: The MegaMek organization is a non-profit group of volunteers
+# creating free software for the BattleTech community.
+#
+# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks
+# of The Topps Company, Inc. All Rights Reserved.
+#
+# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of
+# InMediaRes Productions, LLC.
+#
+# MechWarrior Copyright Microsoft Corporation. MegaMek was created under
+# Microsoft's "Game Content Usage Rules"
+# <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
+# affiliated with Microsoft.
 VeterancyAwards.title=++ACCESSING TERMINAL++
 VeterancyAwards.description=<h1 style="text-align:center">Veterancy Awards</h1>\
   You have just enabled <b>Veterancy Awards</b> in a campaign that previously had it disabled. Veterancy Awards \
   represent unique talents or flaws that emerge naturally as the character grows. They are not always positive, and \
-  they are not always directly relevant to the character's professions. They are, however, free and create \
+  they are not always directly relevant to the character''s professions. They are, however, free and create \
   interesting narrative opportunities. Such as the tech that develops Natural Aptitude/Gunnery or the MekWarrior who \
   turns out to be a bit of a Slow Learner after too many knocks on the head.\
   <p>Would you like to update all personnel to account for missed awards? If you confirm this action, any character \

MekHQ/src/mekhq/campaign/personnel/Person.java

@@ -5995,7 +5995,7 @@ public void resetMinutesLeft(boolean isTechsUseAdministration) {
         }
 
         // Personnel without tech or doctor roles have no available time
-        if (!isTech() && !isDoctor()) {
+        if (!isTechExpanded() && !isDoctor()) {
             this.minutesLeft = 0;
             this.overtimeLeft = 0;
             return;

MekHQ/src/mekhq/campaign/personnel/turnoverAndRetention/RetirementDefectionTracker.java

@@ -33,6 +33,7 @@
  */
 package mekhq.campaign.personnel.turnoverAndRetention;
 
+import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.Math.round;
 import static mekhq.campaign.personnel.Person.getLoyaltyName;
@@ -268,7 +269,7 @@ public Map<UUID, TargetRoll> getTargetNumbers(final @Nullable Mission mission, f
                 }
 
                 if (contract != null) {
-                    targetNumber.addModifier(-Math.max(0, ((contract.getSharesPercent() / 10) - 2)),
+                    targetNumber.addModifier(-max(0, ((contract.getSharesPercent() / 10) - 2)),
                           resources.getString("shares.text"));
                 }
             }
@@ -659,7 +660,7 @@ public static int getHRStrainModifier(Campaign campaign) {
                                   getCombinedSkillValues(campaign, SkillType.S_ADMIN);
 
         if (maximumStrain != 0) {
-            return personnel / maximumStrain;
+            return 1 - (personnel / maximumStrain);
         } else {
             return personnel;
         }

MekHQ/src/mekhq/gui/BriefingTab.java

@@ -875,10 +875,6 @@ private void startScenario() {
     private boolean handleSalvageAssignments(Scenario scenario) {
         boolean hasSalvageOpportunity = isHasSalvageOpportunity(scenario.getMissionId());
         if (hasSalvageOpportunity) {
-            // Reset old information
-            scenario.clearSalvageForces();
-            scenario.clearSalvageTechs();
-
             if (!displaySalvageForcePicker(scenario)) {
                 return true;
             }
@@ -1016,16 +1012,15 @@ private boolean displaySalvageTechPicker(Scenario scenario) {
             techData.add(data);
         }
 
-            SalvageTechPicker techPicker = new SalvageTechPicker(techData,
-                  priorSelectedTechs,
-                  getCampaign().isClanCampaign());
-            boolean wasConfirmed = techPicker.wasConfirmed();
-            if (wasConfirmed) {
-                List<UUID> selectedTechs = techPicker.getSelectedTechs();
-                for (UUID techId : selectedTechs) {
-                    scenario.addSalvageTech(techId);
-                }
+        SalvageTechPicker techPicker = new SalvageTechPicker(techData, priorSelectedTechs,
+              getCampaign().isClanCampaign());
+        boolean wasConfirmed = techPicker.wasConfirmed();
+        if (wasConfirmed) {
+            List<UUID> selectedTechs = techPicker.getSelectedTechs();
+            for (UUID techId : selectedTechs) {
+                scenario.addSalvageTech(techId);
             }
+        }
 
         return techPicker.wasConfirmed();
     }

MekHQ/src/mekhq/gui/dialog/SalvagePostScenarioPicker.java

@@ -80,6 +80,7 @@
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.unit.TestUnit;
 import mekhq.campaign.unit.Unit;
+import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogSimple;
 import mekhq.gui.baseComponents.roundedComponents.RoundedJButton;
 import mekhq.gui.baseComponents.roundedComponents.RoundedLineBorder;
 
@@ -258,7 +259,7 @@ public SalvagePostScenarioPicker(Campaign campaign, Mission mission, Scenario sc
             isExchangeRights = ((Contract) mission).isSalvageExchange();
         }
 
-        List<SalvageComboBoxGroup> selectedGroups = showSalvageDialog(isContract);
+        List<SalvageComboBoxGroup> selectedGroups = showSalvageDialog(campaign, isContract);
         if (selectedGroups != null) {
             processSalvageAssignments(selectedGroups);
         }
@@ -428,14 +429,15 @@ private void processSalvageAssignments(List<SalvageComboBoxGroup> salvageComboBo
      * For contract missions, also displays salvage percentage information and enforces salvage limits. The dialog
      * validates all assignments and prevents confirmation if any assignments are invalid.</p>
      *
+     * @param campaign   the current campaign
      * @param isContract whether this is a contract mission (affects displayed information and validation)
      *
      * @return list of combo box groups with user selections, or null if the dialog was canceled
      *
      * @author Illiani
      * @since 0.50.10
      */
-    private List<SalvageComboBoxGroup> showSalvageDialog(boolean isContract) {
+    private List<SalvageComboBoxGroup> showSalvageDialog(Campaign campaign, boolean isContract) {
         JDialog dialog = new JDialog((Frame) null, getText("accessingTerminal.title"), true);
         dialog.setLayout(new BorderLayout());
         dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); // We don't want the player to cancel out
@@ -628,11 +630,11 @@ private List<SalvageComboBoxGroup> showSalvageDialog(boolean isContract) {
 
         dialog.add(mainPanel, BorderLayout.CENTER);
 
-        confirmButton.addActionListener(e -> {
-            confirmed[0] = true;
-            resultHolder.groups = salvageComboBoxGroups;
-            dialog.dispose();
-        });
+        confirmButton.addActionListener(e -> confirmationAction(campaign,
+              dialog,
+              confirmed,
+              resultHolder,
+              salvageComboBoxGroups));
 
         buttonPanel.add(confirmButton);
 
@@ -651,6 +653,23 @@ private List<SalvageComboBoxGroup> showSalvageDialog(boolean isContract) {
         return confirmed[0] ? resultHolder.groups : null;
     }
 
+    private static void confirmationAction(Campaign campaign, JDialog dialog, boolean[] confirmed,
+          ResultHolder resultHolder,
+          List<SalvageComboBoxGroup> salvageComboBoxGroups) {
+        dialog.setVisible(false);
+        ImmersiveDialogSimple confirmationDialog = new ImmersiveDialogSimple(campaign, null, null,
+              getTextAt(RESOURCE_BUNDLE, "SalvagePostScenarioPicker.confirmation.text"),
+              List.of(getText("Cancel.text"), getText("Confirm.text")), null, null, false);
+        if (confirmationDialog.getDialogChoice() == 0) { // Cancelled
+            dialog.setVisible(true);
+            return;
+        }
+
+        confirmed[0] = true;
+        resultHolder.groups = salvageComboBoxGroups;
+        dialog.dispose();
+    }
+
     /**
      * This is not currently implemented. The purpose of this method is to allow future developers and easy access point
      * to implement field stripping, without needing to grok where it should fit in the class (and gui).