Merge pull request #4479 from IllianiCBT/personnelReportInjuredFix

Updated Personnel Report to Better Handle Bondsmen & Prisoners
MegaMek · Jul 31, 2024 · c3771cf · c3771cf
2 parents c216a0f + c0b9b81
commit c3771cf
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/MekHQ/src/mekhq/campaign/report/PersonnelReport.java b/MekHQ/src/mekhq/campaign/report/PersonnelReport.java
@@ -46,7 +46,7 @@ public String getCombatPersonnelDetails() {
         Money salary = Money.zero();
 
         for (Person p : getCampaign().getPersonnel()) {
-            if (!p.getPrimaryRole().isCombat() || !p.getPrisonerStatus().isFree()) {
+            if ((!p.getPrimaryRole().isCombat()) || (!p.getPrisonerStatus().isFreeOrBondsman())) {
                 continue;
             }
 
@@ -61,6 +61,10 @@ public String getCombatPersonnelDetails() {
                     countInjured++;
                 }
                 salary = salary.plus(p.getSalary(getCampaign()));
+            } else if ((p.getPrisonerStatus().isBondsman()) && (p.getStatus().isActive())) {
+                if (!p.getInjuries().isEmpty() || (p.getHits() > 0)) {
+                    countInjured++;
+                }
             } else if (p.getStatus().isRetired()) {
                 countRetired++;
             } else if (p.getStatus().isMIA()) {
@@ -84,7 +88,7 @@ public String getCombatPersonnelDetails() {
             }
         }
 
-        sb.append("\n")
+        sb.append('\n')
                 .append(String.format("%-30s        %4s\n", "Injured Combat Personnel", countInjured))
                 .append(String.format("%-30s        %4s\n", "MIA Combat Personnel", countMIA))
                 .append(String.format("%-30s        %4s\n", "KIA Combat Personnel", countKIA))
@@ -122,9 +126,6 @@ public String getSupportPersonnelDetails() {
                 salary = salary.plus(p.getSalary(getCampaign()));
             } else if (p.getPrisonerStatus().isCurrentPrisoner() && p.getStatus().isActive()) {
                 prisoners++;
-                if (!p.getInjuries().isEmpty() || (p.getHits() > 0)) {
-                    countInjured++;
-                }
             } else if (p.getPrisonerStatus().isBondsman() && p.getStatus().isActive()) {
                 bondsmen++;
                 if (!p.getInjuries().isEmpty() || (p.getHits() > 0)) {
@@ -157,15 +158,15 @@ public String getSupportPersonnelDetails() {
             }
         }
 
-        sb.append("\n")
+        sb.append('\n')
                 .append(String.format("%-30s        %4s\n", "Injured Support Personnel", countInjured))
                 .append(String.format("%-30s        %4s\n", "MIA Support Personnel", countMIA))
                 .append(String.format("%-30s        %4s\n", "KIA Support Personnel", countKIA))
                 .append(String.format("%-30s        %4s\n", "Retired Support Personnel", countRetired))
                 .append(String.format("%-30s        %4s\n", "Dead Support Personnel", countDead))
                 .append("\nMonthly Salary For Support Personnel: ").append(salary.toAmountAndSymbolString())
                 .append(String.format("\nYou have " + dependents + " %s", (dependents == 1) ? "dependent" : "dependents"))
-                .append(String.format("\nYou have " + prisoners + " prisoner%s", (prisoners == 1) ? "" : "s"))
+                .append(String.format("\nYou have " + prisoners + " prisoner%s", prisoners == 1 ? "" : "s"))
                 .append(String.format("\nYou have " + bondsmen + " %s", (bondsmen == 1) ? "bondsman" : "bondsmen"));
 
         return sb.toString();