Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swapping to a Single Retirement Campaign Report #3306

Merged
merged 1 commit into from
May 29, 2022
Merged

Swapping to a Single Retirement Campaign Report #3306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion MekHQ/resources/mekhq/resources/Personnel.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion MekHQ/src/mekhq/campaign/Campaign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,6 @@ public boolean applyRetirement(Money totalPayout, Map<UUID, UUID> 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()) {
Expand Down
3 changes: 1 addition & 2 deletions MekHQ/src/mekhq/campaign/personnel/Person.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down