Merge pull request #5927 from IllianiCBT/soldierDisplay

Added Soldier Requirements Handling in `UnitTableModel`
MegaMek · Jan 31, 2025 · c2bd86f · c2bd86f
2 parents 0033302 + 0b115d0
commit c2bd86f
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/MekHQ/src/mekhq/gui/model/UnitTableModel.java b/MekHQ/src/mekhq/gui/model/UnitTableModel.java
@@ -163,6 +163,9 @@ static String getCrewTooltip(Unit unit) {
         int driversAssigned = unit.getDrivers().size();
 
         Entity entity = unit.getEntity();
+        int soldiersNeeded = entity instanceof Infantry ? gunnersNeeded : 0;
+        int soldiersAssigned = entity instanceof Infantry ? gunnersAssigned : 0;
+
         int navigatorsNeeded = entity instanceof Jumpship && !(entity instanceof SpaceStation) ? 1 : 0;
         int navigatorsAssigned = unit.getNavigator() == null ? 0 : 1;
 
@@ -171,15 +174,21 @@ static String getCrewTooltip(Unit unit) {
 
         StringBuilder report = new StringBuilder("<html>");
 
-        if (driversNeeded > 0) {
+
+        if (driversNeeded > 0 && soldiersNeeded == 0) {
             appendReport(report, "Drivers", driversAssigned, driversNeeded);
         }
 
-        if (gunnersNeeded > 0) {
+        if (gunnersNeeded > 0 && soldiersNeeded == 0) {
             report.append("<br>");
             appendReport(report, "Gunners", gunnersAssigned, gunnersNeeded);
         }
 
+        if (soldiersNeeded > 0) {
+            report.append("<br>");
+            appendReport(report, "Soldiers", soldiersAssigned, soldiersNeeded);
+        }
+
         if (crewNeeded > 0) {
             report.append("<br>");
             appendReport(report, "Crew", crewAssigned, crewNeeded);