From f35709d1278c76d1ea7c10485071e0097b1aebf0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 May 2022 08:39:19 -0400 Subject: [PATCH] Switching to a single retirement report --- MekHQ/resources/mekhq/resources/Personnel.properties | 1 - MekHQ/src/mekhq/campaign/Campaign.java | 1 - MekHQ/src/mekhq/campaign/personnel/Person.java | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/MekHQ/resources/mekhq/resources/Personnel.properties b/MekHQ/resources/mekhq/resources/Personnel.properties index d2e2f992fe..32f54ff744 100644 --- a/MekHQ/resources/mekhq/resources/Personnel.properties +++ b/MekHQ/resources/mekhq/resources/Personnel.properties @@ -569,4 +569,3 @@ recoveredPoW.report=%s has been rescued from the enemy after being captured returnedFromLeave.report=%s has returned from leave returnedFromAWOL.report=%s has returned from their unauthorized leave rehired.report=%s has returned to active duty -retired.report=Retired from active duty diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java index 631f029728..884bdba560 100644 --- a/MekHQ/src/mekhq/campaign/Campaign.java +++ b/MekHQ/src/mekhq/campaign/Campaign.java @@ -685,7 +685,6 @@ public boolean applyRetirement(Money totalPayout, Map unitAssignment for (UUID pid : getRetirementDefectionTracker().getRetirees()) { if (getPerson(pid).getStatus().isActive()) { getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.RETIRED); - addReport(getPerson(pid).getFullName() + " has retired."); } if (getRetirementDefectionTracker().getPayout(pid).getRecruitRole().isCivilian()) { diff --git a/MekHQ/src/mekhq/campaign/personnel/Person.java b/MekHQ/src/mekhq/campaign/personnel/Person.java index eecd6d7cfc..7770ccf959 100644 --- a/MekHQ/src/mekhq/campaign/personnel/Person.java +++ b/MekHQ/src/mekhq/campaign/personnel/Person.java @@ -954,8 +954,7 @@ public void changeStatus(final Campaign campaign, final LocalDate today, setRetirement(null); break; case RETIRED: - campaign.addReport(String.format(resources.getString("retired.report"), - getHyperlinkedFullTitle())); + campaign.addReport(String.format(status.getReportText(), getHyperlinkedFullTitle())); ServiceLogger.retired(this, today); if (campaign.getCampaignOptions().isUseRetirementDateTracking()) { setRetirement(today);