Merge pull request #4105 from IllianiCBT/autoAwards_PrisonerScenarioAwardsFix

Updated Post-Scenario Logging for Prisoners

Author: HammerGS

MekHQ/resources/mekhq/resources/LogEntries.properties

@@ -17,6 +17,7 @@ spouseKia.text=Spouse, {0}, was killed in action
 promotedTo.text=Promoted to {0}
 demotedTo.text=Demoted to {0}
 participatedInScenarioDuringMission.text=Participated in {0} during mission {1}
+capturedInScenarioDuringMission.text=Taken captive in {0} during mission {1}
 gainedXpFromMedWork.text=Gained {0} XP from successful medical work
 successfullyTreatedWithXp.text=Successfully treated {0} for {1} injuries, gaining {2} XP
 successfullyTreatedForXInjuries.text=Successfully treated {0} for {1} injuries

MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java

@@ -1486,7 +1486,7 @@ public void resolveScenario(ScenarioStatus resolution, String report) {
                 person.setHits(status.getHits());
             }
 
-            ServiceLogger.participatedInScenarioDuringMission(person, campaign.getLocalDate(), scenario.getName(), mission.getName());
+            ServiceLogger.capturedInScenarioDuringMission(person, campaign.getLocalDate(), scenario.getName(), mission.getName());
 
             for (Kill k : status.getKills()) {
                 campaign.addKill(k);

MekHQ/src/mekhq/campaign/log/ServiceLogger.java

@@ -191,6 +191,13 @@ public static void participatedInScenarioDuringMission(Person person, LocalDate
                 MessageFormat.format(message, scenarioName, missionName)));
     }
 
+    public static void capturedInScenarioDuringMission(Person person, LocalDate date,
+                                                           String scenarioName, String missionName) {
+        String message = logEntriesResourceMap.getString("capturedInScenarioDuringMission.text");
+        person.addLogEntry(new ServiceLogEntry(date,
+                MessageFormat.format(message, scenarioName, missionName)));
+    }
+
     public static void gainedXpFromMedWork(Person doctor, LocalDate date, int taskXP) {
         String message = logEntriesResourceMap.getString("gainedXpFromMedWork.text");
         doctor.addLogEntry(new ServiceLogEntry(date, MessageFormat.format(message, taskXP)));