Merge pull request #5684 from IllianiCBT/stratCon_returnFromDeployment

Added Report for Returning StratCon Forces
MegaMek · Jan 9, 2025 · 38ab0a8 · 38ab0a8
2 parents 00cc051 + 47202b5
commit 38ab0a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/MekHQ/resources/mekhq/resources/AtBStratCon.properties b/MekHQ/resources/mekhq/resources/AtBStratCon.properties
@@ -55,6 +55,8 @@ btnAddSP.text=Add SP (GM)
 btnAddCVP.text=Add CVP (GM)
 btnRemoveCVP.text=Remove CVP (GM)
 
+force.undeployed=<b>%s</b> has returned from deployment.
+
 requestingResupply.title=Requesting Resupply
 supplyPointExpenditure.text=How many Support Points would you like to spend?
 btnConfirm.text=Confirm

diff --git a/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java b/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
@@ -2686,6 +2686,9 @@ public static void switchFacilityOwner(StratconFacility facility) {
      * return date is on or before the given date.
      */
     public static void processTrackForceReturnDates(StratconTrackState track, Campaign campaign) {
+        final ResourceBundle resources = ResourceBundle.getBundle("mekhq.resources.AtBStratCon",
+            MekHQ.getMHQOptions().getLocale());
+
         List<Integer> forcesToUndeploy = new ArrayList<>();
         LocalDate date = campaign.getLocalDate();
 
@@ -2700,6 +2703,9 @@ public static void processTrackForceReturnDates(StratconTrackState track, Campai
                     && (force != null) && !track.getBackingScenariosMap().containsKey(force.getScenarioId())
                     && !track.getStickyForces().contains(forceID)) {
                 forcesToUndeploy.add(forceID);
+
+                campaign.addReport(String.format(resources.getString("force.undeployed"),
+                    force.getName()));
             }
         }