MegaMek · SJuliez · Jun 6, 2024 · May 15, 2024 · May 16, 2024 · May 16, 2024
diff --git a/MekHQ/resources/mekhq/resources/AtBScenarioBuiltIn.properties b/MekHQ/resources/mekhq/resources/AtBScenarioBuiltIn.properties
@@ -1,5 +1,5 @@
 battleDetails.baseAttack.attacker.victory=Destroy all base forces and 50% of the other enemy units.\nKeep more than 50% of your+ally's units operational.
-battleDetails.baseAttack.attacker.observations=Winner controls the battlefield after the battle. If player wins the battle and the contract required lance type is fight or scout, it ends with an early victory. Otherwise the enemy morale level becomes rout.
+battleDetails.baseAttack.attacker.observations=Winner controls the battlefield after the battle. If player wins the battle and the contract required lance type is fight or scout, it ends with an early victory. Otherwise the enemy morale level becomes broken.
 battleDetails.baseAttack.defender.victory=Must keep at least three base units operational and destroy 50% of enemy forces.\nKeep more than 50% of your+ally's units operational.
 battleDetails.baseAttack.defender.observations=If player loses, the contract ends early with a contract defeat.
 
@@ -91,7 +91,7 @@ battleDetails.reconRaid.instructions.returnEdge=Return to %s map edge.
 battleDetails.reconRaid.instructions.reward=1d6-2 bonus rolls if victorious.
 
 battleDetails.baseAttack.attacker.details.winnerFightScout=Completing this objective will end the contract with an early victory.
-battleDetails.baseAttack.attacker.details.winnerDefendTraining=Completing this objective will set the enemy morale to "Rout".
+battleDetails.baseAttack.attacker.details.winnerDefendTraining=Completing this objective will set the enemy morale to "Broken".
 battleDetails.baseAttack.attacker.details.loser=Losing this battle will end the contract with an early defeat.
 
 battleDetails.starLeagueCache.Mek=Star League Mek

diff --git a/MekHQ/resources/mekhq/resources/Campaign.properties b/MekHQ/resources/mekhq/resources/Campaign.properties
@@ -38,7 +38,31 @@ LayeredForceIconLayer.FRAME.toolTipText=This tab contains frames, which are the
 LayeredForceIconLayer.LOGO.text=Logos
 LayeredForceIconLayer.LOGO.toolTipText=This tab contains canon faction logos that can be added to the center of a force icon.
 
+#### 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.
 
+turnoverEmployeeTurnoverDialog.text=Employee Turnover
+turnoverPayoutDialog.text=Show Payout Dialog
+turnoverNotNow.text=Not Now
+turnoverCancel.text=Cancel
+
+turnoverRollRequired.text=Employee Turnover Check Required
+turnoverDialogDescription.text=It has been a %s since the last Employee Turnover roll.
+
+turnoverWeekly.text=7 days
+turnoverMonthly.text=28 days
+turnoverAnnually.text=356 days
+
+turnoverFinalPayments.text=Unresolved Final Payments
+turnoverPersonnelKilled.text=<html><body style="max-width: 300px>You have personnel who have left the unit or been killed in action but have not received their final payout. You must deal with these payments before advancing the day.\
+  <br>\
+  <br>Here are some options:\
+  <ul><li>Sell off equipment to generate funds.\
+  <li>Pay one or more personnel in equipment.\
+  <li>Use GM mode to edit the settlement.</body></html>
 
 #### Unsorted Campaign Resources
 dependentLeavesForce.text=%s is no longer travelling with the force, and is thus no longer dependent on it.

diff --git a/MekHQ/resources/mekhq/resources/CampaignGUI.properties b/MekHQ/resources/mekhq/resources/CampaignGUI.properties
@@ -214,12 +214,15 @@ panInfo.title=Basic Unit Information
 panObjectives.title=Current Objectives
 lblRating.text=<html><nobr><b>Unit Rating:</b></nobr></html>;
 lblPersonnel.text=<html><nobr><b>Personnel:</b></nobr></html>;
+lblMorale.text=<html><nobr><b>Morale:</b></nobr></html>;
+lblAdministrativeCapacity.text=<html><nobr><b>Adminstrative Capacity:</b></nobr></html>;
 lblMissionSuccess.text=<html><nobr><b>Mission Success Rate:</b></nobr></html>;
 lblExperience.text=<html><nobr><b>Experience:</b></nobr></html>;
 lblComposition.text=<html><nobr><b>Unit Composition:</b></nobr></html>;
 lblRepairStatus.text=<html><nobr><b>Unit Damage Status:</b></nobr></html>;
 lblTransportCapacity.text=<html><nobr><b>Transport Capacity:</b></nobr></html>;
 lblCargoSummary.text=<html><nobr><b>Cargo Summary:</b></nobr></html>;
+lblFacilityCapacities.text=<html><nobr><b>Facility Capacities:</b></nobr></html>;
 panLog.title=Daily Activity Log
 
 dialogCheckDueScenarios.text=You must complete scenarios with a date of today or earlier before advancing the day.

diff --git a/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
@@ -88,7 +88,7 @@ spnPenaltyClanPartsFromIS.toolTipText=<html>The penalty for acquiring clan parts
 lblTechBonus.text=<html><b>Tech<b></html>
 lblIndustryBonus.text=<html><b>Industry<b></html>
 lblOutputBonus.text=<html><b>Output<b></html>
-lblSocioIndustrialBonusPanel.text=Planet socio-industrial modifiers 
+lblSocioIndustrialBonusPanel.text=Planet socio-industrial modifiers
 ##end Supplies and Acquisition Tab
 
 ## Tech Limits Tab
@@ -122,6 +122,97 @@ lblTechLevel.text=Maximum Tech Level:
 ## Personnel Tab
 personnelPanel.title=Personnel
 
+## Turnover and Retention Tab
+turnoverAndRetentionPanel.title=Turnover and Retention
+
+## Header
+chkUseRetirementDateTracking.text=Track Departure Date
+chkUseRetirementDateTracking.toolTipText=Track the date of a person's departure from the unit.
+chkUseRandomRetirement.text=Enable Employee Turnover
+chkUseRandomRetirement.toolTipText=Determines whether personnel will randomly leave the unit.
+
+## Settings
+turnoverAndRetentionSettingsPanel.title=Settings
+lblTurnoverTargetNumberMethod.text=Turnover Target Number Method
+lblTurnoverTargetNumberMethod.toolTipText=This is the method used to determine the base target number for turnover checks.
+lblTurnoverFixedTargetNumber.text=Fixed Target Number
+lblTurnoverFixedTargetNumber.toolTipText=The base target number for turnover checks.
+lblTurnoverDifficulty.text=Turnover Difficulty
+lblTurnoverDifficulty.toolTipText=Increases or decreases the difficulty of turnover target numbers.
+lblTurnoverFrequency.text=Turnover Frequency
+lblTurnoverFrequency.toolTipText=How frequently should Turnover checks be prompted?
+chkUseContractCompletionRandomRetirement.text=Use Contract Completion Turnover Rolls
+chkUseContractCompletionRandomRetirement.toolTipText=Make a Turnover check for all active personnel at the end of a contract.
+chkUseRandomFounderTurnover.text=Use Random Founder Turnover
+chkUseRandomFounderTurnover.toolTipText=Allow Founders to randomly leave the unit (founders can still retire).
+chkUseFounderRetirement.text=Use Random Founder Retirement
+chkUseFounderRetirement.toolTipText=Allow Founders to randomly retire from the unit once they are aged 50 or older.
+chkUseSubContractSoldiers.text=Soldiers Use Commander's Turnover Roll
+chkUseSubContractSoldiers.toolTipText=Infantry commanders make Turnover rolls for all soldiers in their unit. This means they will defect, resign, and retire as a unit.
+lblServiceContractDuration.text=Service Contract Duration
+lblServiceContractDuration.toolTipText=Once recruited, this is the minimum amount of months personnel will remain with the unit (set to 0 to disable service contracts).
+lblServiceContractModifier.text=Service Contract Modifier
+lblServiceContractModifier.toolTipText=While personnel are under contract, their Turnover target number is reduced by this value.
+
+## Modifiers
+turnoverAndRetentionModifiersPanel.title=Modifiers
+chkUseCustomRetirementModifiers.text=Custom
+chkUseCustomRetirementModifiers.toolTipText=Allows you to manually provide additional modifiers to the Turnover check.
+chkUseSkillModifiers.text=Desirability
+chkUseSkillModifiers.toolTipText=If enabled, better skilled personnel have a higher turnover target number.
+chkUseFatigueModifiers.text=Fatigue
+chkUseFatigueModifiers.toolTipText=If enabled, fatigued personnel have a higher turnover target number.
+chkUseAgeModifiers.text=Age
+chkUseAgeModifiers.toolTipText=If enabled, the age of personnel will influence their turnover target number.
+chkUseUnitRatingModifiers.text=Unit Rating
+chkUseUnitRatingModifiers.toolTipText=If enabled, the rating of the unit will influence the turnover target number for all personnel.
+chkUseFactionModifiers.text=Faction
+chkUseFactionModifiers.toolTipText=If enabled, campaign and personnel factions may influence the turnover target number.
+chkUseMissionStatusModifiers.text=Mission Status
+chkUseMissionStatusModifiers.toolTipText=Allows mission failure; success; and contract breaches to influence the turnover target number.
+chkUseMarriageModifiers.text=Family
+chkUseMarriageModifiers.toolTipText=Marriage to active personnel influences the turnover target number, but couples leave together.
+chkUseLoyaltyModifiers.text=Use Loyalty
+chkUseLoyaltyModifiers.toolTipText=If enabled, personnel have a random loyalty rating ranging between -3 and 3.
+
+chkUseHideLoyalty.text=Hide Loyalty
+chkUseHideLoyalty.toolTipText=If enabled, loyalty modifiers will be hidden.
+
+## Payouts
+turnoverAndRetentionPayoutPanel.title=Payouts
+lblPayoutRateOfficer.text=Officer Payout Rate
+lblPayoutRateOfficer.toolTipText=The number of months' pay officers get when resigning from the unit.
+lblPayoutRateEnlisted.text=Enlisted Payout Rate
+lblPayoutRateEnlisted.toolTipText=The number of months' pay enlisted personnel get when resigning from the unit.
+lblPayoutRetirementMultiplier.text=Retirement Multiplier
+lblPayoutRetirementMultiplier.toolTipText=The number of months to multiply payout rate, when personnel retire.
+chkUsePayoutServiceBonus.text=Use Service Bonus
+chkUsePayoutServiceBonus.toolTipText=If enabled, personnel increase their payouts based on years of service.
+
+lblPayoutServiceBonusRate.text=Bonus %
+lblPayoutServiceBonusRate.toolTipText=This sets the payout percentage increase per year of service, applied when personnel resign or retire.
+
+## Unit Cohesion
+turnoverAndRetentionUnitCohesionPanel.title=Unit Cohesion
+chkUseAdministrativeStrain.text=Enable Administrative Strain
+chkUseAdministrativeStrain.toolTipText=This option limits the number of personnel that can be in the unit before incurring a Turnover penalty (based on the combined ranks of all Admin/HR personnel).
+chkUseManagementSkill.text=Enable Management Skill
+chkUseManagementSkill.toolTipText=This option applies a modifier to turnover checks based on the Leadership of commanding personnel.
+
+### Administrative Strain
+lblAdministrativeCapacity.text=Administrative Capacity
+lblAdministrativeCapacity.toolTipText=How many personnel can be supported per combined rank in Administration.
+lblMultiCrewStrainDivider.text=Multi-Crew Divider
+lblMultiCrewStrainDivider.toolTipText=For multi-crew units, or ProtoMech points, divide crew size by this value.
+
+### Management Skill
+chkUseCommanderLeadershipOnly.text=Only Use Commander's Leadership
+chkUseCommanderLeadershipOnly.toolTipText=Personnel only use the Leadership skill of whoever has the overall Commander flag. If disabled, personnel will use the Leadership of their profession group commander.
+lblManagementSkillPenalty.text=Unskilled Penalty
+lblManagementSkillPenalty.toolTipText=The unskilled modifier to turnover target numbers. Each rank in Leadership reduces this number by 1.
+
+
+
 # General Personnel
 chkUseTactics.text=Use Tactics Skill as Commander Initiative Bonus
 chkUseTactics.toolTipText=Give each pilot a tactics skill that can be added to initiative using the commander initiative option in MegaMek
@@ -215,10 +306,22 @@ chkAtBPrisonerDefection.toolTipText=<html>This adds a random roll to determine i
 chkAtBPrisonerRansom.text=Enable AtB Prisoner Ransom
 chkAtBPrisonerRansom.toolTipText=Prisoners can be ransomed back to their previous faction as per the AtB ruleset.
 
+# Fatigue
+turnoverAndRetentionFatiguePanel.title=CamOps Fatigue
+lblFatigueWarning.text=<html>Client must be reloaded whenever enabling or disabling Fatigue.<br>CamOps Fatigue has added functionality if Fatigue is enabled in the MegaMek client settings.<br>Non-combat modifiers are not implemented.</html>
+chkUseFatigue.text=Enable
+chkUseFatigue.toolTipText=If enabled, combat personnel will gain Fatigue whenever they are deployed to a Scenario or entering an unexplored StratCon hex.
+lblFatigueRate.text=Fatigue Rate
+lblFatigueRate.toolTipText=<html>How many fatigue points should be gained per Scenario or unexplored StratCon hex?<br>Forces with the Scout role only count the first unexplored hex.</html>
+lblFieldKitchenCapacity.text=Field Kitchen Capacity
+lblFieldKitchenCapacity.toolTipText=How many personnel can be served per Field Kitchen? Reduces effective Fatigue by 1.
+lblFatigueLeaveThreshold.text=Automatic Leave Threshold (unofficial)
+lblFatigueLeaveThreshold.toolTipText=<html>Automatically assign personnel to Leave status once fatigue (including modifiers) has reached this value.<br>Personnel heal fatigue twice as fast while on leave and will automatically return to active duty once their fatigue has returned to 0.<br>Set to 0 to disable.<html>
+
 # Dependent
 dependentPanel.title=Dependents (Unofficial)
 dependentPanel.toolTipText=Warning: This is a temporary setup, and is very much subject to changes including removing functionality if deemed necessary.
-randomDependentPanel.title=Random Dependents (Currently AtB Only)
+randomDependentPanel.title=Random Dependents (AtB Only)
 randomDependentPanel.toolTipText=Warning: This is a temporary setup, and is very much subject to changes including removing functionality if deemed necessary.
 lblRandomDependentMethod.text=Random Dependents Method
 lblRandomDependentMethod.toolTipText=This is the method used to determine if a dependent is randomly added or removed from the force.
@@ -290,26 +393,6 @@ personnelRandomizationPanel.title=Personnel Randomization
 chkUseDylansRandomXP.text=Use Dylan's Random XP (Unofficial)
 chkUseDylansRandomXP.toolTipText=Use Dylan's optional random XP on creation of a new person (20% chance each of 0, 1, 2, 3, and randomized between 1 and 8 XP)
 
-# Employee Turnover
-retirementPanel.title=Employee Turnover (Unofficial)
-retirementPanel.toolTipText=Warning: This is a temporary setup, and is very much subject to changes including removing functionality if deemed necessary.
-chkUseRetirementDateTracking.text=Track Retirement Date
-chkUseRetirementDateTracking.toolTipText=Track the date of a person's retirement.
-randomRetirementPanel.title=Random Employee Turnover (Currently AtB Only)
-randomRetirementPanel.toolTipText=Warning: This is a temporary setup, and is very much subject to changes including removing functionality if deemed necessary.
-lblRandomRetirementMethod.text=Random Employee Turnover Method
-lblRandomRetirementMethod.toolTipText=This is the method used to determine if a person will randomly retire at a given point.
-chkUseYearEndRandomRetirement.text=Use Year End Random Employee Turnover Rolls
-chkUseYearEndRandomRetirement.toolTipText=Make an Employee Turnover roll for each of the personnel in the unit at the end of every year.
-chkUseContractCompletionRandomRetirement.text=Use Contract Completion Employee Turnover Rolls
-chkUseContractCompletionRandomRetirement.toolTipText=Make an Employee Turnover roll for each of the personnel in the unit at the end of every contract.
-chkUseCustomRetirementModifiers.text=Customize Employee Turnover Rolls
-chkUseCustomRetirementModifiers.toolTipText=Allows you to manually provide additional modifiers to the Employee Turnover roll.
-chkUseRandomFounderRetirement.text=Use Random Founder Retirement
-chkUseRandomFounderRetirement.toolTipText=Allow Founders to randomly retire.
-chkTrackUnitFatigue.text=Track Unit Fatigue
-chkTrackUnitFatigue.toolTipText=Continuous deployments without a break increase the rate of retirements and defections.
-
 # Family
 familyPanel.title=Family (Unofficial)
 lblFamilyDisplayLevel.text=The Level of Relation to be Displayed in the Personnel Panel
@@ -574,6 +657,15 @@ lblUnrepairablePartsValueMultiplier.text=Unrepairable Damaged Parts Value Multip
 lblUnrepairablePartsValueMultiplier.toolTipText=Multiplies the value and thus the sell price of unrepairable damaged parts by the specified number.
 lblCancelledOrderRefundMultiplier.text=Cancelled Order Refund Percentage
 lblCancelledOrderRefundMultiplier.toolTipText=The decimal percentage of the original purchase price that is refunded when an order is cancelled.
+
+# Shares
+sharesPanel.title=Shares System
+chkUseShareSystem.text=Use Shares
+chkUseShareSystem.toolTipText=Gives personnel a stake in the unit. This system lowers profits but can increase retention.
+chkSharesExcludeLargeCraft.text=Large Craft Exemption
+chkSharesExcludeLargeCraft.toolTipText=Exclude large craft from net worth when calculating share value.
+chkSharesForAll.text=All Personnel Have Shares
+chkSharesForAll.toolTipText=All combat and support personnel have shares rather than just MechWarriors
 ##end Finances Tab
 
 ## Mercenary Tab
@@ -691,7 +783,7 @@ chkUnitMarketReportRefresh.text=Unit Market Refresh Report
 chkUnitMarketReportRefresh.toolTipText=Adds a report to the daily log when the unit market refreshes.
 
 # Contract Market
-contractMarketPanel.title=Contract Market (Currently AtB Only)
+contractMarketPanel.title=Contract Market (AtB Only)
 lblContractMarketMethod.text=Contract Market Method
 lblContractMarketMethod.toolTipText=This is the method of contract market used to generate new contracts to select.
 lblContractSearchRadius.text=Contract Search Radius (Light Years):
@@ -737,16 +829,8 @@ chkUseStratCon.text=Use StratCon campaign rules
 chkUseStratCon.toolTipText=An update of the AtB ruleset. Highly experimental.
 lblSkillLevel.text=Skill Level
 lblSkillLevel.toolTipText=<html>This is the difficulty level for generated scenarios. <br>Values above Elite are not recommended.</html>
-chkUseShareSystem.text=Use share system
-chkUseShareSystem.toolTipText=All personnel have a stake in the unit. This system lowers profits but can increase retention.
-chkSharesExcludeLargeCraft.text=Exclude large craft from share value
-chkSharesExcludeLargeCraft.toolTipText=When calculating payout to retirees, exclude DropShips and JumpShips from net worth when calculating share value.
-chkSharesForAll.text=All personnel have shares
-chkSharesForAll.toolTipText=All combat and support personnel have shares rather than just MechWarriors
-chkTrackOriginalUnit.text=Track original unit
-chkTrackOriginalUnit.toolTipText=MechWarriors who have their own unit when recruited will take the same unit when they go, if it is still available.
-chkUseLeadership.text=Use leadership skill
-chkUseLeadership.toolTipText=The commander's leadership skill limits the number of personnel that can be in the unit before incurring a penalty on Employee Turnover rolls.
+chkTrackOriginalUnit.text=Track Original Unit
+chkTrackOriginalUnit.toolTipText=MechWarriors, who have their own unit when recruited, will take the same unit when they go if it is still available.
 chkLimitLanceWeight.text=Limit lance deployment by weight
 chkLimitLanceWeight.toolTipText=Lances which exceed the maximum weight for an Assault lance (390 tons for IS) cannot be deployed.
 chkLimitLanceNumUnits.text=Limit lance deployment by size
@@ -811,8 +895,8 @@ lblFixedMapChance.text=Fixed Map Chance
 lblFixedMapChance.toolTipText=The likelihood, in percent, that a fixed user-made map will be used in place of a generated map.
 lblSPAUpgradeIntensity.text=SPA Upgrade Intensity
 lblSPAUpgradeIntensity.toolTipText=How likely it is that regular+ OpFor pilots will receive SPAs. -1 indicates never, 3 indicates always.
-chkAeroRecruitsHaveUnits.text=Treat Aerospace pilots like MechWarriors
-chkAeroRecruitsHaveUnits.toolTipText=Aerospace pilot recruits can have fighters, and those that do will take a fighter with them when retiring/defecting.
+chkAeroRecruitsHaveUnits.text=Pilots Have Units
+chkAeroRecruitsHaveUnits.toolTipText=Aerospace pilot recruits can have fighters, and those that do will take a fighter with them when leaving the unit.
 ##end Against the Bot Tab
 
 ## Button Panel

diff --git a/MekHQ/resources/mekhq/resources/CreateCharacterDialog.properties b/MekHQ/resources/mekhq/resources/CreateCharacterDialog.properties
@@ -9,11 +9,12 @@ lblGunnery.text=Gunnery:
 lblInitB.text=Initiative Bonus:
 lblCommandB.text=Tactics:
 lblToughness.text=Toughness:
+lblFatigue.text=Fatigue:
 lblArtillery.text=Artillery:
 lblBday.text=Birthdate:
 lblRecruitment.text=Recruited:
 lblLastRankChangeDate.text=Last Rank Change:
-lblRetirement.text=Retired:
+lblRetirement.text=Departed Unit:
 Form.title=Create Character
 btnClose.text=Close
 btnRandomName.text=Random Name