Merge pull request #8484 from IllianiBird/bayRentalFix

Fix #8481: Fixed Multiple Bay Rental Dialog Bugs

Author: HammerGS

MekHQ/resources/mekhq/resources/FacilityRentals.properties

@@ -55,6 +55,11 @@ ContractStartRentalDialog.inCharacter={0}, {1} is offering us access to several
 ContractStartRentalDialog.inCharacter.bay={0}, I''ve reached out to the relevant parties. We''re looking at a surcharge\
   \ of {1} C-Bills per week if we want to go ahead with this bay rental.\
   <p>Let me know if you still want to go ahead.</p>
+UnitBayRental.wrongContractType=You cannot rent Maintenance Bays or Factory Condition bays \
+  unless you are off-contract, or on a garrison-type contract.\
+  <p>Only Temporary Retainers and contracts ending in 'duty' (except Relief Duty) are classified as garrison \
+  contracts.</p>
+UnitBayRental.inSpace=You cannot rent Maintenance Bays or Factory Condition bays unless you are planetside.
 ContractStartRentalDialog.button.cancel=Cancel
 ContractStartRentalDialog.button.confirm=Confirm
 ContractStartRentalDialog.outOfCharacter.bay=Better bays allow you to perform more complex refits (as per Campaign \

MekHQ/src/mekhq/campaign/mission/rentals/FacilityRentals.java

@@ -44,16 +44,20 @@
 
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 
+import megamek.common.units.Entity;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.events.RepairStatusChangedEvent;
 import mekhq.campaign.finances.Finances;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.finances.enums.TransactionType;
+import mekhq.campaign.mission.AtBContract;
 import mekhq.campaign.mission.Contract;
 import mekhq.campaign.mission.Mission;
 import mekhq.campaign.unit.Unit;
@@ -455,4 +459,72 @@ private static boolean performRentalTransaction(Finances finances, LocalDate tod
         return finances.debit(TransactionType.RENT, today, rentalCost,
               getFormattedTextAt(RESOURCE_BUNDLE, "FacilityRentals.rental." + rentalType, rentalCost.toAmountString()));
     }
+
+    /**
+     * Processes a request to change bay assignments for the specified units, offering bay rental opportunities
+     * if allowed by the current campaign state.
+     * <p>
+     * Bay rentals are only permitted if the campaign is either off-contract or on a garrison-type contract,
+     * and the campaign's location is planetside. If these conditions are not met, a dialog is shown to the user
+     * indicating that no facilities are available.
+     * </p>
+     *
+     * @param campaign      the current campaign context
+     * @param selectedUnits the units for which bay changes are requested
+     * @param bayType       the type of bay being requested (e.g., {@link Unit#SITE_FACILITY_MAINTENANCE}, {@link Unit#SITE_FACTORY_CONDITIONS})
+     * @return {@code true} if the bay change process can proceed; {@code false} if not allowed (e.g., due to contract or location restrictions)
+     */
+    public static boolean processBayChangeRequest(Campaign campaign, Unit[] selectedUnits, int bayType) {
+        List<AtBContract> activeAtBContracts = campaign.getActiveAtBContracts();
+        boolean isBayRentalAllowed = activeAtBContracts.isEmpty();
+
+        for (AtBContract atBContract : activeAtBContracts) {
+            if (atBContract.getContractType().isGarrisonType()) {
+                isBayRentalAllowed = true;
+                break;
+            }
+        }
+
+        if (!isBayRentalAllowed || !campaign.getLocation().isOnPlanet()) {
+            BayRentalDialog.showNoFacilitiesAvailableDialog(campaign);
+            return false;
+        }
+
+        // This counts how many units are eligible and how many are eligible and a large craft. We handle
+        // it this way to allow us to fetch the counts in a single pass
+        Predicate<Unit> eligibleForBayRental =
+              unit -> !FacilityRentals.shouldBeIgnoredByBayRentals(unit);
+        long[] counts = Arrays.stream(selectedUnits)
+                              .filter(eligibleForBayRental)
+                              .collect(() -> new long[2], (results, unit) -> {
+                                  if (!unit.isDeployed()) {
+                                      results[0]++; // eligible
+                                      Entity entity = unit.getEntity();
+                                      if (entity != null && entity.isLargeCraft()) {
+                                          results[1]++; // large vessel
+                                      }
+                                  }
+                              }, (a, b) -> {
+                                  a[0] += b[0];
+                                  a[1] += b[1];
+                              });
+
+        int eligibleUnitCount = (int) counts[0];
+        int eligibleLargeVesselCount = (int) counts[1];
+
+        ContractRentalType rentalType = switch (bayType) {
+            case Unit.SITE_FACILITY_MAINTENANCE -> ContractRentalType.MAINTENANCE_BAYS;
+            case Unit.SITE_FACTORY_CONDITIONS -> ContractRentalType.FACTORY_CONDITIONS;
+            default -> null; // Should never happen as we're already filtering out invalid sites
+        };
+
+        if (rentalType == null) {
+            return true; // We don't want a bug preventing bay changes.
+        }
+
+        return FacilityRentals.offerBayRentalOpportunity(campaign,
+              eligibleUnitCount,
+              eligibleLargeVesselCount,
+              rentalType);
+    }
 }

MekHQ/src/mekhq/gui/adapter/ServicedUnitsTableMouseAdapter.java

@@ -32,6 +32,8 @@
  */
 package mekhq.gui.adapter;
 
+import static mekhq.campaign.unit.Unit.SITE_FIELD_WORKSHOP;
+
 import java.awt.event.ActionEvent;
 import java.util.Optional;
 import javax.swing.JCheckBoxMenuItem;
@@ -41,11 +43,14 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
 
+import megamek.codeUtilities.MathUtility;
 import megamek.common.equipment.AmmoType;
 import mekhq.MekHQ;
 import mekhq.Utilities;
+import mekhq.campaign.Campaign;
 import mekhq.campaign.events.RepairStatusChangedEvent;
 import mekhq.campaign.events.units.UnitChangedEvent;
+import mekhq.campaign.mission.rentals.FacilityRentals;
 import mekhq.campaign.parts.equipment.AmmoBin;
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.unit.actions.IUnitAction;
@@ -93,11 +98,22 @@ public void actionPerformed(ActionEvent action) {
                 MekHQ.triggerEvent(new UnitChangedEvent(selectedUnit));
             }
         } else if (command.contains("CHANGE_SITE")) {
-            for (Unit unit : units) {
-                if (!unit.isDeployed()) {
-                    String sel = command.split(":")[1];
-                    int selected = Integer.parseInt(sel);
-                    if ((selected > -1) && (selected < Unit.SITE_UNKNOWN)) {
+            int selected = MathUtility.parseInt(command.split(":")[1], SITE_FIELD_WORKSHOP);
+            boolean selectedIsValid = selected > -1 && selected < Unit.SITE_UNKNOWN;
+            if (!selectedIsValid) {
+                return;
+            }
+
+            boolean wasSiteChangeSuccessful = true;
+            Campaign campaign = gui.getCampaign();
+            if (selected >= Unit.SITE_FACILITY_MAINTENANCE &&
+                      campaign.getCampaignOptions().getRentedFacilitiesCostRepairBays() > 0) {
+                wasSiteChangeSuccessful = FacilityRentals.processBayChangeRequest(campaign, units, selected);
+            }
+
+            if (wasSiteChangeSuccessful) {
+                for (Unit unit : units) {
+                    if (!unit.isDeployed()) {
                         unit.setSite(selected);
                         MekHQ.triggerEvent(new RepairStatusChangedEvent(unit));
                     }
@@ -157,7 +173,7 @@ protected Optional<JPopupMenu> createPopupMenu() {
         JCheckBoxMenuItem cbMenuItem;
         // **let's fill the pop-up menu**//
         // change the location
-        JMenu menu = new JMenu("Change site");
+        JMenu menu = new JMenu("Change Site");
         int i;
         for (i = 0; i < Unit.SITE_UNKNOWN; i++) {
             cbMenuItem = new JCheckBoxMenuItem(Unit.getSiteName(i));

MekHQ/src/mekhq/gui/adapter/UnitTableMouseAdapter.java

@@ -41,6 +41,7 @@
 import static mekhq.campaign.enums.DailyReportType.TECHNICAL;
 import static mekhq.campaign.market.personnelMarket.enums.PersonnelMarketStyle.MEKHQ;
 import static mekhq.campaign.personnel.PersonUtility.overrideSkills;
+import static mekhq.campaign.unit.Unit.SITE_FIELD_WORKSHOP;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
@@ -49,13 +50,11 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.UUID;
 import java.util.Vector;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenu;
@@ -68,6 +67,7 @@
 import megamek.client.ui.dialogs.UnitEditorDialog;
 import megamek.client.ui.dialogs.abstractDialogs.BVDisplayDialog;
 import megamek.client.ui.dialogs.iconChooser.CamoChooserDialog;
+import megamek.codeUtilities.MathUtility;
 import megamek.common.annotations.Nullable;
 import megamek.common.enums.SkillLevel;
 import megamek.common.equipment.AmmoType;
@@ -99,7 +99,6 @@
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.finances.enums.TransactionType;
 import mekhq.campaign.mission.Scenario;
-import mekhq.campaign.mission.rentals.ContractRentalType;
 import mekhq.campaign.mission.rentals.FacilityRentals;
 import mekhq.campaign.parts.Part;
 import mekhq.campaign.parts.Refit;
@@ -321,59 +320,26 @@ public void actionPerformed(ActionEvent action) {
                 MekHQ.triggerEvent(new UnitChangedEvent(selectedUnit));
             }
         } else if (command.contains(COMMAND_CHANGE_SITE)) {
-            try {
-                int selected = Integer.parseInt(command.split(":")[1]);
-                boolean selectedIsValid = selected > -1 && selected < Unit.SITE_UNKNOWN;
-                if (!selectedIsValid) {
-                    return;
-                }
+            int selected = MathUtility.parseInt(command.split(":")[1], SITE_FIELD_WORKSHOP);
+            boolean selectedIsValid = selected > -1 && selected < Unit.SITE_UNKNOWN;
+            if (!selectedIsValid) {
+                return;
+            }
 
-                boolean wasSiteChangeSuccessful = true;
-
-                if (selected >= Unit.SITE_FACILITY_MAINTENANCE) {
-                    Campaign campaign = gui.getCampaign();
-
-                    // This counts how many units are eligible and how many are eligible and a large craft. We handle
-                    // it this way to allow us to fetch the counts in a single pass
-                    Predicate<Unit> eligibleForBayRental =
-                          u -> !FacilityRentals.shouldBeIgnoredByBayRentals(u);
-                    long[] counts = Arrays.stream(units)
-                                          .filter(eligibleForBayRental)
-                                          .collect(() -> new long[2], (arr, u) -> {
-                                              arr[0]++; // eligible
-                                              if (u.getEntity().isLargeCraft()) {
-                                                  arr[1]++; // large vessel
-                                              }
-                                          }, (a, b) -> {
-                                              a[0] += b[0];
-                                              a[1] += b[1];
-                                          });
-
-                    int eligibleUnitCount = (int) counts[0];
-                    int eligibleLargeVesselCount = (int) counts[1];
-
-                    ContractRentalType rentalType = switch (selected) {
-                        case Unit.SITE_FACILITY_MAINTENANCE -> ContractRentalType.MAINTENANCE_BAYS;
-                        case Unit.SITE_FACTORY_CONDITIONS -> ContractRentalType.FACTORY_CONDITIONS;
-                        default -> null; // Should never happen as we're already filtering out invalid sites
-                    };
-
-                    wasSiteChangeSuccessful = FacilityRentals.offerBayRentalOpportunity(campaign,
-                          eligibleUnitCount,
-                          eligibleLargeVesselCount,
-                          rentalType);
-                }
+            boolean wasSiteChangeSuccessful = true;
+            Campaign campaign = gui.getCampaign();
+            if (selected >= Unit.SITE_FACILITY_MAINTENANCE &&
+                      campaign.getCampaignOptions().getRentedFacilitiesCostRepairBays() > 0) {
+                wasSiteChangeSuccessful = FacilityRentals.processBayChangeRequest(campaign, units, selected);
+            }
 
-                if (wasSiteChangeSuccessful) {
-                    for (Unit unit : units) {
-                        if (!unit.isDeployed()) {
-                            unit.setSite(selected);
-                            MekHQ.triggerEvent(new RepairStatusChangedEvent(unit));
-                        }
+            if (wasSiteChangeSuccessful) {
+                for (Unit unit : units) {
+                    if (!unit.isDeployed()) {
+                        unit.setSite(selected);
+                        MekHQ.triggerEvent(new RepairStatusChangedEvent(unit));
                     }
                 }
-            } catch (Exception e) {
-                LOGGER.error("", e);
             }
         } else if (command.equals(COMMAND_SALVAGE)) {
             for (Unit unit : units) {
@@ -852,7 +818,7 @@ protected Optional<JPopupMenu> createPopupMenu() {
             // endregion Determine if to Display
 
             // change the location
-            menu = new JMenu("Change site");
+            menu = new JMenu("Change Site");
             boolean allSameSite = StaticChecks.areAllSameSite(units);
 
             for (int i = 0; i < Unit.SITE_UNKNOWN; i++) {

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

@@ -39,6 +39,7 @@
 
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
+import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogNotification;
 import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogSimple;
 import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogWidth;
 
@@ -91,4 +92,17 @@ private static List<String> getButtons() {
     private static String getOutOfCharacterMessage() {
         return getFormattedTextAt(RESOURCE_BUNDLE, "ContractStartRentalDialog.outOfCharacter.bay");
     }
+
+    public static void showNoFacilitiesAvailableDialog(Campaign campaign) {
+        boolean isInSpace = !campaign.getLocation().isOnPlanet();
+
+        String message;
+        if (isInSpace) {
+            message = getTextAt(RESOURCE_BUNDLE, "UnitBayRental.inSpace");
+        } else {
+            message = getTextAt(RESOURCE_BUNDLE, "UnitBayRental.wrongContractType");
+        }
+
+        new ImmersiveDialogNotification(campaign, message, true);
+    }
 }