Merge pull request #4175 from IllianiCBT/turnover_flavorless

Removed Flavor Text from Breach of Contract Departure in Turnover and Retention Module

Author: SJuliez

MekHQ/resources/mekhq/resources/Campaign.properties

@@ -42,10 +42,8 @@ LayeredForceIconLayer.LOGO.toolTipText=This tab contains canon faction logos tha
 anniversaryBirthday.text=%s is %s today!
 
 #### Turnover and Retention
-turnoverBurnedOut.text=burnt out.
-turnoverPoached.text=was poached by another force.
 turnoverJointDeparture.text=departed with their spouse.
-turnoverJointDepartureChild.text=departed with their parent.
+turnoverJointDepartureChild.text=departed with a parent.
 
 turnoverEmployeeTurnoverDialog.text=Employee Turnover
 turnoverPayoutDialog.text=Show Payout Dialog

MekHQ/src/mekhq/campaign/Campaign.java

@@ -695,25 +695,14 @@ public boolean applyRetirement(Money totalPayout, Map<UUID, UUID> unitAssignment
 
                     if (!person.getStatus().isDead()) {
                         if (isBreakingContract(person, getLocalDate(), getCampaignOptions().getServiceContractDuration())) {
-                            int roll = Compute.d6(1);
-
-                            switch (roll) {
-                                case 1:
-                                    getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.RESIGNED);
-                                    break;
-                                case 2:
-                                case 3:
-                                    addReport(getPerson(pid).getHyperlinkedFullTitle() + ' ' + resources.getString("turnoverPoached.text"));
-                                    getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.RESIGNED);
-                                    break;
-                                case 4:
-                                case 5:
-                                case 6:
-                                    addReport(getPerson(pid).getHyperlinkedFullTitle() + ' ' + resources.getString("turnoverBurnedOut.text"));
-                                    getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.RESIGNED);
-                                    break;
-                                default:
-                                    throw new IllegalStateException("Unexpected value in applyRetirement: " + roll);
+                            if (!getActiveContracts().isEmpty()) {
+                                int roll = Compute.randomInt(20);
+
+                                if (roll == 0) {
+                                    getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.DEFECTED);
+                                }
+                            } else {
+                                getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.RESIGNED);
                             }
                         } else if (person.getAge(getLocalDate()) >= 50) {
                             getPerson(pid).changeStatus(this, getLocalDate(), PersonnelStatus.RETIRED);