Merge pull request #6212 from IllianiCBT/forceAssignmentFatigue

IllianiBird · web-flow · commit e61300f4ce6e · 2025-03-10T17:16:33.000-05:00
Added Fatigue Display when Assigning Forces to Scenarios
diff --git a/MekHQ/resources/mekhq/resources/ScenarioWizardLanceRenderer.properties b/MekHQ/resources/mekhq/resources/ScenarioWizardLanceRenderer.properties
@@ -0,0 +1,3 @@
+report.string=<html>{0}<b>{1}</b>{2} {3} - BV {4} {5}\
+  <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>{6}</i></html>
+fatigueReport.string=Fatigue {0}
diff --git a/MekHQ/src/mekhq/gui/stratcon/ScenarioWizardLanceRenderer.java b/MekHQ/src/mekhq/gui/stratcon/ScenarioWizardLanceRenderer.java
@@ -32,8 +32,15 @@
 import mekhq.campaign.force.CombatTeam;
 import mekhq.campaign.force.Force;
 import mekhq.campaign.icons.enums.OperationalStatus;
+import mekhq.campaign.personnel.Person;
+import mekhq.campaign.unit.Unit;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.UUID;
 
 import static mekhq.campaign.icons.enums.OperationalStatus.NOT_OPERATIONAL;
+import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
 import static mekhq.utilities.ReportingUtilities.spanOpeningWithCustomColor;
 
@@ -49,6 +56,8 @@
  * @author NickAragua
  */
 public class ScenarioWizardLanceRenderer extends JLabel implements ListCellRenderer<Force> {
+    final private String RESOURCE_BUNDLE = "mekhq.resources." + getClass().getSimpleName();
+
     private final Campaign campaign;
 
     public ScenarioWizardLanceRenderer(Campaign campaign) {
@@ -96,10 +105,29 @@ public Component getListCellRendererComponent(final JList<? extends Force> list,
         String originNodeName = ", " + campaign.getForce(0).getName();
         forceName = forceName.replaceAll(originNodeName, "");
 
+        String fatigueReport = "";
+        if (campaign.getCampaignOptions().isUseFatigue()) {
+            int highestFatigue = 0;
+            for (UUID unitId : force.getAllUnits(false)) {
+                Unit unit = campaign.getUnit(unitId);
+
+                if (unit == null) {
+                    continue;
+                }
+
+                for (Person person : unit.getCrew()) {
+                    if (person.getFatigue() > highestFatigue) {
+                        highestFatigue = person.getEffectiveFatigue(campaign);
+                    }
+                }
+            }
+            fatigueReport = getFormattedTextAt(RESOURCE_BUNDLE, "fatigueReport.string", highestFatigue);
+        }
+
         // Format string
-        setText(String.format("<html>%s<b>%s%s, %s</b> - BV %s<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>%s</i></html>",
-            statusOpenFormat, force.getName(), statusCloseFormat, roleString,
-            force.getTotalBV(campaign, true), forceName));
+        setText(getFormattedTextAt(RESOURCE_BUNDLE, "report.string", statusOpenFormat, force.getName(),
+              statusCloseFormat, roleString, force.getTotalBV(campaign, true),
+              fatigueReport, forceName));
 
         return this;
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+report.string=<html>{0}<b>{1}</b>{2} {3} - BV {4} {5}\`
	`2`	`+ <br>     <i>{6}</i></html>`
	`3`	`+fatigueReport.string=Fatigue {0}`