Merge pull request #4344 from IllianiCBT/turnover_deathInService

Update Payout Calculation for KIA Personnel
MegaMek · Jul 7, 2024 · f1281a6 · f1281a6
2 parents 696c960 + 40f3897
commit f1281a6
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/MekHQ/src/mekhq/campaign/personnel/turnoverAndRetention/RetirementDefectionTracker.java b/MekHQ/src/mekhq/campaign/personnel/turnoverAndRetention/RetirementDefectionTracker.java
@@ -456,27 +456,17 @@ private static int getManagementSkillModifier(Person person) {
      * @return the management skill modifier for the commander
      */
     private static int getCommanderManagementSkill(PersonnelRole role) {
-        switch (Profession.getProfessionFromPersonnelRole(role)) {
-            case AEROSPACE:
-                return asfCommanderModifier;
-            case VEHICLE:
-                return vehicleCrewCommanderModifier;
-            case INFANTRY:
-                return infantryCommanderModifier;
-            case NAVAL:
-                return navalCommanderModifier;
-            case TECH:
-                return techCommanderModifier;
-            case MEDICAL:
-                return medicalCommanderModifier;
-            case ADMINISTRATOR:
-                return administrationCommanderModifier;
-            case MECHWARRIOR:
-                return mechWarriorCommanderModifier;
-            case CIVILIAN:
-                return 0;
-        }
-        return 0;
+        return switch (Profession.getProfessionFromPersonnelRole(role)) {
+            case AEROSPACE -> asfCommanderModifier;
+            case VEHICLE -> vehicleCrewCommanderModifier;
+            case INFANTRY -> infantryCommanderModifier;
+            case NAVAL -> navalCommanderModifier;
+            case TECH -> techCommanderModifier;
+            case MEDICAL -> medicalCommanderModifier;
+            case ADMINISTRATOR -> administrationCommanderModifier;
+            case MECHWARRIOR -> mechWarriorCommanderModifier;
+            case CIVILIAN -> 0;
+        };
     }
 
     /**
@@ -1062,7 +1052,7 @@ private void calculatePayout(final Campaign campaign, final Person person, final
 
             // person was killed
             if (killed) {
-                payoutAmount = getPayoutOrBonusValue(campaign, person);
+                payoutAmount = getPayoutOrBonusValue(campaign, person).multipliedBy(campaign.getCampaignOptions().getPayoutRetirementMultiplier());
             // person was sacked
             } else if (sacked) {
                 payoutAmount = Money.of(0);