Merge branch 'master' into agingUpdate

# Conflicts:
#	MekHQ/src/mekhq/campaign/personnel/Person.java

Author: IllianiBird

MekHQ/data/images/misc/skill_check_default.png

@@ -7,7 +7,7 @@ primarySlot: 1
 planet:
   - name:
       source: canon
-      value: Marius's Tears
+      value: Herculaneum
     type: TERRESTRIAL
     orbitalDist: 0.28
     sysPos: 1
@@ -55,6 +55,9 @@ planet:
         population: 2985363.0
       - date: '3043-01-01'
         socioIndustrial: D-C-B-C-D
+      - date: '3048-01-01'
+        name: Marius's Tears
+        message: Herculaneum renamed to Marius's Tears in honor of the late Imperator Marius O'Reilly
       - date: '3050-01-01'
         population: 3139003.0
       - date: '3060-01-01'

MekHQ/data/images/misc/skill_check_fail.png

@@ -162,6 +162,7 @@ MEKHQ VERSION HISTORY:
 + Fix #2359, #6085: Updated Refitting Status Display To Show Time Left
 + Fix #2968, #2996, #3758, #5332, #6469: Fixed Missing Part Resets when Failing or Cancelling Work Job
 + PR #6598: Fixed Refitting Units With Bays
++ PR #6863: Fixed Princess Not Acting of Their Rounds
 
 0.50.04 (2025-03-22 1600 UTC)
 + PR #5852: RAW CamOps Delivery Times
@@ -367,6 +368,7 @@ MEKHQ VERSION HISTORY:
 + PR #6319: Added Early Exit for Objective Determination Self-Correction Loop
 + PR #6323: Added MekHQ New Player Guide
 + PR #6325: Updated New Player Guide PDF
++ Fix #6596: Added Off-Board Deployment Validation and Improved Generation Safety
 
 
 0.50.03 (2025-02-02 2030 UTC)
@@ -532,6 +534,7 @@ MEKHQ VERSION HISTORY:
 + Fix #5932: Added check for injuries that are not permanent before going on leave
 + PR #5946: Implemented Linked Scenarios for Interceptions
 + Fix #5951: Fixed Cargo Capacity Calculation in For Cargo Items in Body
++ PR #6601: When restoring techs time, Large Vessel Crews should be considered techs.
 
 0.50.02 (2024-12-30 2130 UTC)
 + Fix #846, #5185: Fix BattleArmor customization/refit overweight check.

MekHQ/data/images/misc/skill_check_pass.png

@@ -1,23 +1,15 @@
 # This is used to store any mekhq/campaign Resources
-
 #### General Campaign Resources
-
 ## Classes
 # CampaignPreset Class
 CampaignPresetSaveFailure.title=Campaign Preset Creation Failure
 CampaignPresetSaveFailure.text=Oh no! The program was unable to correctly export your campaign options. We know this \nis annoying and apologize. Please help us out and submit a bug with the \nmekhq.log file from this game so we can prevent this from happening in the future.
-
-
-
 ## Enums
 # PlanetaryAcquisitionFactionLimit Enum
 PlanetaryAcquisitionFactionLimit.ALL.text=All Factions
 PlanetaryAcquisitionFactionLimit.NEUTRAL.text=Neutral or Allied Factions
 PlanetaryAcquisitionFactionLimit.ALLIED.text=Allied Factions
 PlanetaryAcquisitionFactionLimit.SELF.text=Own Faction Only
-
-
-
 #### Icons
 ### Enums
 ## LayeredForceIconLayer Enum
@@ -37,38 +29,31 @@ LayeredForceIconLayer.FRAME.text=Frames
 LayeredForceIconLayer.FRAME.toolTipText=This tab contains frames, which are the outer layer of the force icon.
 LayeredForceIconLayer.LOGO.text=Logos
 LayeredForceIconLayer.LOGO.toolTipText=This tab contains canon faction logos that can be added to the center of a force icon.
-
 #### Anniversaries
 anniversaryBirthday.text=%s is <b>%s%s%s</b> today!
 anniversaryRecruitment.text=%s celebrates <b>%s%s%s</b> years with %s!
-
 #### Personnel Removal
 personnelRemoval.text=Old personnel records have been tidied away.
-
 #### Personnel Recruitment
 personnelRecruitmentFinancesReason.text=Recruitment of %s
 personnelRecruitmentInsufficientFunds.text=<font color='%s'><b>Insufficient funds to recruit %s</b></font>
 personnelRecruitmentFormerSurname.text=(Formerly %s)
 personnelRecruitmentBondsman.text=as a bondsman
 personnelRecruitmentPrisoner.text=as a prisoner
 personnelRecruitmentAddedToRoster.text=%s%s has been added to the personnel roster%s.
-
 #### Turnover and Retention
 turnoverJointDeparture.text=departed with their spouse.
 turnoverJointDepartureChild.text=departed with a parent.
 orphaned.text=has been orphaned.
-
 turnoverEmployeeTurnoverDialog.text=Continue
 turnoverAdvanceRegardless=Ignore Check
 turnoverCancel.text=Cancel
-
 turnoverRollRequired.text=Employee Turnover Check Required
 turnoverDialogDescription.text=<html>It is time for an Employee Turnover Check.\
   <br>\
   <br>If this is your first time using this screen, please read the documentation in <i>docs/personnel modules</i>.\
   <br>\
   <br>Seeing high target numbers? Select individual personnel to see how the target number was calculated!</html>
-
 turnoverFinalPayments.text=Unresolved Final Payments
 turnoverPersonnelKilled.text=<html>You have personnel who have left the unit or been killed in action and have not received their final payout.\
   <br>\
@@ -78,10 +63,9 @@ turnoverPersonnelKilled.text=<html>You have personnel who have left the unit or
   <ul><li>Sell off equipment to generate funds.</li>\
   <li>Pay one or more personnel in equipment.</li>\
   <li>Use GM mode to edit the settlement.</li></ul></html>
-
 divorce.text=%s has divorced %s.
-
 #### Unsorted Campaign Resources
+maintenanceNotAvailable.text=Unable to perform maintenance on %s as its assigned tech did not have sufficient minutes remaining.
 dependentJoinsForce.text=%s has started traveling with the force.
 relativeJoinsForce.text=%s has started traveling with the force. They are %s's %s.
 relativeJoinsForceSpouse.text=spouse
@@ -108,4 +92,4 @@ contractBreach.text=Failure to meet the requirements of contract %s resulted in
 gainedExperience.text=%s<b>%s</b>%s personnel <a href='PERSONNEL_ADVANCEMENT|'>gained vocational</a>\
   \ XP.
 becomeBondsman.text=%s has finally %s<b>passed</b>%s all necessary security vetting and loyalty\
-  \ tests. They are now a full <b>Bondsman</b> and can be transitioned to their assigned role.
+  \ tests. They are now a full <b>Bondsman</b> and can be transitioned to their assigned role.

MekHQ/data/universe/defaultspa.xml

@@ -186,6 +186,9 @@ btnCalculateJumpPath.toolTipText=<html>Calculate the jump path between the curre
 btnCalculateJumpPath.text=Calculate Jump Path
 btnBeginTransit.toolTipText=Begin transit along the selected jump path
 btnBeginTransit.text=Begin Transit
+chkAvoidAbandonedSystems.text=Avoid Empty Systems
+chkAvoidAbandonedSystems.toolTipText=Pathfinding will avoid abandoned systems. In-universe travelling in empty systems\
+  \ was avoided whenever possible.
 lblFindPlanet.text=Find Planet:
 panAssignedPatient.title=Assigned Patients
 panUnassignedPatient.title=Unassigned Patients

MekHQ/data/universe/planetary_systems/canon_systems/MariussTears.yml

@@ -54,6 +54,10 @@ lblReputation.tooltip=Which reputation method should your campaign be graded aga
   <br><b>Recommended:</b> Campaign Operations
 lblManualUnitRatingModifier.text=Manual Modifier
 lblManualUnitRatingModifier.tooltip=This allows you to manually adjust your reputation rating.
+lblResetCriminalRecord.text=Reset Criminal Record \u26A0 \uD83C\uDF1F
+lblResetCriminalRecord.tooltip=Reset date of last crime and all penalties to Reputation from crime.\
+  <br>\
+  <br><b>Warning:</b> The Reputation report won't update to reflect this change until the next Monday.
 lblClampReputationPayMultiplier.text=Clamp Reputation Pay Multiplier \u26A0 \u2714 \u2728
 lblClampReputationPayMultiplier.tooltip=When using CamOps Reputation your unit's reputation score\
   \ affects contract pay. This option clamps the reputation-based multiplier between 50 and 200%.\
@@ -551,6 +555,9 @@ lblPrisonersPanel.text=Prisoners
 lblPrisonerCaptureStyle.text=Capture Style \u2728
 lblPrisonerCaptureStyle.tooltip=This is the ruleset to use when determining if a person has been\
   \ captured by the force following a scenario.
+lblResetTemporaryPrisonerCapacity.text=Reset Prisoner Capacity Reductions \uD83C\uDF1F
+lblResetTemporaryPrisonerCapacity.tooltip=This option removes any penalties to Prisoner Capacity that might have been\
+  \ added by Prisoner Events.
 # createDependentsPanel
 lblDependentsPanel.text=Dependents
 lblUseRandomDependentAddition.text=Random Addition
@@ -1298,6 +1305,11 @@ lblNewFinancialYearFinancesToCSVExportBox.tooltip=This writes the finance table
   \ the first day of a new financial term, right before the table is carried over to the next period.
 lblSimulateGrayMonday.text=Simulate Gray Monday \u2728
 lblSimulateGrayMonday.tooltip=Simulate the economic and social upheaval of Gray Monday.
+lblAllowMonthlyReinvestment.text=Allow Monthly Reinvestment of Wealth \u2728
+lblAllowMonthlyReinvestment.tooltip=Each month the campaign commander will use their Wealth trait to\
+  \ reinvest money back into the campaign.\
+  <br>\
+  <br>This is based on the Wealth Trait Check rules from the A Time of War:Companion.
 # createSalesPanel
 lblSalesPanel.text=Sales
 lblSellUnitsBox.text=Enable the Sale of Units
@@ -1796,6 +1808,23 @@ lblExtraRandomness.tooltip=If checked, an additional 1d6 will be rolled per skil
   <br>\
   <br><b>Warning:</b> Due to the way experience levels are calculated, enabling this option will\
   \ more frequently have characters created with slightly lower than normal experience levels.
+lblRandomizeTraits.text=Randomize Traits \u26A0 \uD83C\uDF1F
+lblRandomizeTraits.tooltip=If checked, a newly created character's Connections, Wealth, Reputation, and Unlucky scores\
+  \ are randomized.\
+  <br>\
+  <br>For <b>Connections</b> a d6 is rolled, on a roll of 6 the character's Connections score becomes 1.\
+  <br>\
+  <br>For <b>Wealth</b> and <b>Reputation</b> a d6 is rolled (for each), on a roll of 6 the character's score becomes 1.\
+  \ While a roll of 1 causes their score to become -1.\
+  <br>\
+  <br>For <b>Unlucky</b> a d20 is rolled, on a roll of 1 the character's score becomes 1. A high Unlucky score is a bad\
+  \ thing.
+lblComingOfAgeAbilities.text=Award Coming of Age SPAs \u2714 \uD83C\uDF1F
+lblComingOfAgeAbilities.tooltip=If checked, all characters will be awarded a single SPA when they turn 16.\
+  <br>\
+  <br><b>Recommendation:</b> This was balanced around the pool of SPAs being rather large, due to the addition of ATOW\
+  \ SPAs. If you are working with a smaller SPA pool, perhaps due to disabling those SPAs, you might want to leave\
+  \ this off.
 lblPhenotypesPanel.text=Clan Trueborn Percentages
 lblMekWarrior.text=MekWarrior
 lblMekWarrior.tooltip=What percentage of Clan MekWarriors should have a Trueborn phenotype?

MekHQ/docs/history.txt

@@ -0,0 +1,7 @@
+# suppress inspection "UnusedProperty" for the whole file
+report.format.monthly={0} has used {1}<b>Wealth {2}</b>{3} to transfer {4} C-Bills into the\
+  \ unit''s coffers. The funds have cleared and are available for spending.
+report.format.extreme={0} has {1}<b>exhausted</b>{2} their Wealth to transfer {3} C-Bills into the unit''s coffers. The\
+  \ funds have cleared and are available for spending. {4} has <b>{5}</b> Wealth remaining.
+report.format.exhausted={0} has already {1}<b>exhausted</b>{2} their Wealth for this month and cannot reinvest into the unit.
+finance.format=Transfer from {0}

MekHQ/resources/mekhq/resources/Campaign.properties

@@ -1,7 +1,6 @@
 # This is used to store any Finances Resources
 ## Generic Finances Resources
 Error.text=Error
-
 ## Finances Enums
 # FinancialTerm Enum
 FinancialTerm.BIWEEKLY.text=Biweekly
@@ -14,7 +13,6 @@ FinancialTerm.SEMIANNUALLY.text=Semiannually
 FinancialTerm.SEMIANNUALLY.toolTipText=The financial term is once every six months.
 FinancialTerm.ANNUALLY.text=Annually
 FinancialTerm.ANNUALLY.toolTipText=The financial term is one per year.
-
 # FinancialYearDuration Enum
 FinancialYearDuration.SEMIANNUAL.text=Semiannual
 FinancialYearDuration.SEMIANNUAL.toolTipText=The financial term lasts six months
@@ -28,7 +26,6 @@ FinancialYearDuration.DECENNIAL.text=Decennial
 FinancialYearDuration.DECENNIAL.toolTipText=The financial term lasts ten years
 FinancialYearDuration.FOREVER.text=Forever (Not Recommended)
 FinancialYearDuration.FOREVER.toolTipText=The financial term lasts forever. This option is not recommended and can cause issues in lengthy campaigns.
-
 # TransactionType Enum
 TransactionType.BATTLE_LOSS_COMPENSATION.text=Battle Loss Compensation
 TransactionType.BATTLE_LOSS_COMPENSATION.toolTipText=A financial transaction where battle losses are partially to completely paid back by the employer, as per the current negotiated contract.
@@ -88,7 +85,8 @@ TransactionType.UNIT_SALE.text=Unit Sale(s)
 TransactionType.UNIT_SALE.toolTipText=A financial transaction where a unit was or multiple units were sold.
 TransactionType.BONUS_EXCHANGE.text=Bonus Exchange
 TransactionType.BONUS_EXCHANGE.toolTipText=A financial transaction where Bonus Parts were exchanged for money.
-
+TransactionType.WEALTH.text=Reinvestment
+TransactionType.WEALTH.toolTipText=A financial transaction where the commander reinvested funds back into the unit.
 ## Finances Files
 # Peacetime Operating Costs
 PeacetimeCosts.title=Monthly Peacetime Operating Costs
@@ -99,24 +97,18 @@ PeacetimeCostsAmmunition.title=Monthly Ammunition
 PeacetimeCostsAmmunition.text=Your account has been debited %s for training munitions
 PeacetimeCostsFuel.title=Monthly Fuel bill
 PeacetimeCostsFuel.text=Your account has been debited %s for fuel
-
 # Salaries and other Overhead
 Salaries.title=Monthly salaries
 Salaries.text=Payday! Your account has been debited for %s in personnel salaries
 Overhead.title=Monthly overhead
 Overhead.text=Your account has been debited for %s in overhead expenses
-
 # Loans
 Loan.title=loan payment to %s
 Loan.text=Your account has been debited for %s in loan payment to %s
 Loan.insufficient.report=<b>You have insufficient funds to service the debt on loan %s!</b>%s Funds required: %s
 Loan.paid.report=You have fully paid off loan %s
-
 # File Export
 FinanceExport.format=%s financial transactions written to file.
-
-
-
 ## Unsorted General Finances
 FinancialTermEndCarryover.finances=Carryover from previous financial term
 Taxes.finances=Taxes
@@ -135,4 +127,4 @@ OverheadCosts.text=overhead costs
 Shares.text=shares
 AssetPayment.finances=Income from %s
 AssetPayment.report=Your account has been credited for %s from %s
-loyaltyChangeGroup.text=Loyalty has changed across the unit.
+loyaltyChangeGroup.text=Loyalty has changed across the unit.

MekHQ/resources/mekhq/resources/CampaignGUI.properties

@@ -87,6 +87,7 @@ setAsCommander.format=%s has been set as the overall unit commander.
 enterNewCallsign.text=Enter new callsign
 editCallsign.text=Edit Callsign
 changeSalary.text=Change Salary (-1 to remove custom salary)
+makeSkillCheck.text=Perform Skill Check
 changeRank.text=Change Rank
 changeRankSystem.text=Change Rank System
 useCampaignRankSystem.text=Use Campaign Rank System
@@ -154,7 +155,8 @@ spendOnReputation.tooltip=If this character is the campaign commander unit Reput
   \ modifies all Negotiation, Protocols, and Streetwise skills by %s.
 spendOnWealth.text=Wealth -> %s (%s xp)
 spendOnWealth.tooltip=Raising this trait to at least rank 7 will improve unit Reputation by 1 if this character is the\
-  \ campaign commander.
+  \ campaign commander. If this character is the campaign commander, they will reinvest funds back into the unit at the\
+  \ beginning of each month.
 spendOnUnlucky.text=Unlucky -> %s (%s xp)
 spendOnUnlucky.tooltip=Decreases the character's available Edge by %s.
 spendOnAttributes.increase=Increase Attribute Scores
@@ -197,6 +199,8 @@ addScenarioEntry.text=Add Single Scenario Entry
 assignKill.text=Add Single Kill Entry
 exportPersonnel.text=Export Personnel
 sack.text=Sack
+wealth.extreme.single=Perform Extreme Expenditure (+%s C-Bills, -1 Wealth)
+wealth.extreme.multiple=Perform Extreme Expenditure (-1 Wealth)
 eduEducation.text=Education
 eduCivilian.text=Civilian
 eduMilitary.text=Military
@@ -282,6 +286,7 @@ regenerateLoyalty.text=Regenerate Loyalty
 regeneratePersonality.text=Regenerate Personality
 addRandomSPA.text=Add Random SPA
 generateRoleplaySkills.text=Generate Roleplay Skills
+generateRoleplayTraits.text=Reset Roleplay Traits
 addMinimumComplement.text=Add minimum complement
 addMinimumComplementRandom.text=Random
 addMinimumComplementElite.text=Elite
@@ -308,6 +313,10 @@ deleteUnitsCount.text=%d units
 removeQ.title=Remove?
 confirmRemove.text=Do you really want to remove %s?
 hireMinimumComplement.text=Hire minimum complement
+maintenanceExtraTime.text=Set Maintenance Extra Time
+maintenanceAdHoc.text=Immediately Perform Maintenance
+maintenanceAdHoc.noNeed=%s doesn't require maintenance.
+maintenanceAdHoc.unable=%s has insufficient time to perform maintenance on %s.
 ##### Base Components - These may originate in MM, but are in active use
 #### AbstractMHQNagDialog
 chkIgnore.text=Don't bother me again
@@ -1011,7 +1020,7 @@ navigatorMenu.text=Navigator
 miUnassignCrew.text=Unassign Crew
 #### AssignUnitToTechMenu Class
 AssignUnitToTechMenu.title=Tech
-miAssignTech.text=%s (%sm)
+miAssignTech.text=%s (%s available minutes)
 miUnassignTech.text=Unassign Tech
 #### ExportUnitSpriteMenu Class
 ExportUnitSpriteMenu.title=Export Unit Sprite

MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties

@@ -1,10 +1,10 @@
 # suppress inspection "UnusedProperty" for the whole file
-SPECTACULAR.label=<i>Spectacular!</i>
+SPECTACULAR.label=<i><b>Spectacular!</b></i>
 EXTRAORDINARY.label=<i>Extraordinary!</i>
-GOOD.label=<i>Good</i>
-IT_WILL_DO.label=<i>It'll do...</i>
+GOOD.label=<i>Good.</i>
+IT_WILL_DO.label=<i>It''ll do...</i>
 BARELY_MADE_IT.label=<i>Barely made it!</i>
 ALMOST.label=<i>Almost...</i>
-BAD.label=<i>Bad</i>
+BAD.label=<i>Bad.</i>
 TERRIBLE.label=<i>Terrible!</i>
-DISASTROUS.label=<i>Disastrous</i>
+DISASTROUS.label=<i><b>Disastrous!</b></i>

MekHQ/resources/mekhq/resources/DiscretionarySpending.properties

@@ -67,7 +67,6 @@ lblPermanentInjury.text=permanent injury
 btnMedical.tooltip=View medical details
 format.itemHeader=<html><b>%s:</b></html>
 format.itemHeader.roleplay=<html><i>%s:</i></html>
-format.itemHeader.roleplay.removal=\ (RP Only)
 format.kills=Kills: %d
 format.killDetail=%s with %s
 format.scenarios=Scenarios: %d