MegaMek · IllianiCBT · Sep 26, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024
diff --git a/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
@@ -130,8 +130,6 @@ personnelPanel.title=Personnel
 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.
 
@@ -437,32 +435,32 @@ chkUseDylansRandomXP.toolTipText=Use Dylan's optional random XP on creation of a
 chkUseRandomPersonalities.text=Use Random Personalities
 chkUseRandomPersonalities.toolTipText=<html>Personnel are generated with random personality traits, quirks and intelligence.\
   <br>\
-  <br>Intelligence affects a characters ability to graduate from education module academies.\
+  <br>Intelligence affects a character's ability to graduate from education module academies.\
   <br>\
   <br>While traits and quirks do not currently have a mechanical effect, they will be used by the upcoming Random Events module.</html>
 
 # Family
-familyPanel.title=Family (Unofficial)
+familyPanel.title=Family
 lblFamilyDisplayLevel.text=The Level of Relation to be Displayed in the Personnel Panel
 lblFamilyDisplayLevel.toolTipText=<html>This setting is the relation to the selected person that MekHQ will display up to, including the previous levels <br>(higher levels require more processing when loading a person in the personnel table)</html>
 
 # Marriage
-marriagePanel.title=Marriage
+marriagePanel.title=Marriage (Unofficial)
 chkUseManualMarriages.text=Use Manual Marriages
 chkUseManualMarriages.toolTipText=<html>This allows the player to disable the Choose Spouse (Mate) option in the personnel table mouse adapter. <br>This option is provided for performance reasons for extremely large campaigns (10k+ personnel).</html>
 chkUseClanPersonnelMarriages.text=Use Clan Personnel Marriages
 chkUseClanPersonnelMarriages.toolTipText=Allow clan-origin personnel to marry other personnel.
 chkUsePrisonerMarriages.text=Use Prisoner Marriages
 chkUsePrisonerMarriages.toolTipText=Allow prisoners to marry other prisoners, and manually marrying a prisoner to a free member of the force. Bondsmen are treated as free personnel when it comes to this option, and are thus not affected by it.
 lblMinimumMarriageAge.text=Minimum Marital Age
-lblMinimumMarriageAge.toolTipText=This is the minimum age that is allowed for a person to be married.
+lblMinimumMarriageAge.toolTipText=This is the minimum age allowed for a person to be married.
 lblCheckMutualAncestorsDepth.text=Minimum Mutual Ancestor Check Depth for Marriage to be Possible
-lblCheckMutualAncestorsDepth.toolTipText=<html>This is the depth to which the ancestry of two people are checked for mutual ancestors to determine if they can marry. <br>Set to 0 to disable the ancestry check.</html>
+lblCheckMutualAncestorsDepth.toolTipText=<html>This is the depth to which the ancestry of two people is checked for mutual ancestors to determine if they can marry. <br>Set to 0 to disable the ancestry check.</html>
 chkLogMarriageNameChanges.text=Log Marriage Name Changes
 chkLogMarriageNameChanges.toolTipText=This enables the addition of a personnel log entry whenever a name is changed during marriage.
 marriageSurnameWeightsPanel.title=Marriage Surname Weights
 marriageSurnameWeightsPanel.toolTipText=<html>These are the weights used in determining the surname change, if any, when using the Weighted Marriage option. <br>They will be the percent chance if the values for the weights all add up to 100.</html>
-randomMarriagePanel.title=Random Marriages (Unofficial)
+randomMarriagePanel.title=Random Marriages
 lblRandomMarriageMethod.text=Random Marriage Method
 lblRandomMarriageMethod.toolTipText=This is the method used to determine if an eligible person randomly marries.
 chkUseRandomSameSexMarriages.text=Use Same-sex Random Marriage
@@ -472,15 +470,15 @@ chkUseRandomClanPersonnelMarriages.toolTipText=Allow clan-origin personnel to ra
 chkUseRandomPrisonerMarriages.text=Use Random Prisoner Marriages
 chkUseRandomPrisonerMarriages.toolTipText=Allow prisoners to randomly marry other prisoners. Bondsmen are treated as free personnel when it comes to this option, and are thus not affected by it.
 lblRandomMarriageAgeRange.text=Random Marriage Age Range
-lblRandomMarriageAgeRange.toolTipText=This plus/minus the age forms the possible range of ages for spouses in the forming of a random marriage.
-percentageRandomMarriagePanel.title=Percentage Random Marriage
-lblPercentageRandomMarriageOppositeSexChance.text=Opposite Sex Chance
-lblPercentageRandomMarriageOppositeSexChance.toolTipText=This is the percent chance that a fitting member of your force will marry another fitting member of your force of the opposite sex.
-lblPercentageRandomMarriageSameSexChance.text=Same Sex Chance
-lblPercentageRandomMarriageSameSexChance.toolTipText=This is the percent chance that a fitting member of your force will marry another fitting member of your force of the same sex.
+lblRandomMarriageAgeRange.toolTipText=This plus/minus age forms the possible range of ages for spouses in the forming of a random marriage.
+percentageRandomMarriagePanel.title=Marriage Dice
+lblRandomMarriageOppositeSexDiceSize.text=Opposite Sex Dice Size
+lblRandomMarriageOppositeSexDiceSize.toolTipText=This determines the number of sides on the die rolled to determine whether a character gets married. Marriage occurs on a roll of 1. This die size is multiplied by 1 + the number of failed marriages the character has previously experienced. The default values provide a 25% chance of a character getting married every 3 years. Set to 0 to disable opposite sex marriages.
+lblRandomMarriageSameSexDiceSize.text=Same Sex Dice Size
+lblRandomMarriageSameSexDiceSize.toolTipText=This determines the number of sides on the die rolled to determine whether a character gets married. Marriage occurs on a roll of 1. This die size is multiplied by 1 + the number of failed marriages the character has previously experienced. The default values provide a 5% chance of a character getting married every 3 years. The difference between opposite sex and same sex dice chances are based on 2022 US census data. Set to 0 to disable opposite sex marriages.
 
 # Divorce
-divorcePanel.title=Divorce
+divorcePanel.title=Divorce (Unofficial)
 chkUseManualDivorce.text=Use Manual Divorce
 chkUseManualDivorce.toolTipText=This allows the player to disable the Remove Spouse option in the personnel table mouse adapter.
 chkUseClanPersonnelDivorce.text=Use Clan Personnel Divorce
@@ -489,7 +487,7 @@ chkUsePrisonerDivorce.text=Use Prisoner Divorce
 chkUsePrisonerDivorce.toolTipText=Allow divorce when one or both of the couple are currently prisoners. Bondsmen are treated as free personnel when it comes to this option, and are thus not affected by it.
 divorceSurnameWeightsPanel.title=Divorce Surname Weights
 divorceSurnameWeightsPanel.toolTipText=<html>These are the weights used in determining the surname change, if any, when using the Weighted Divorce option. <br>They will be the percent chance if the values for the weights all add up to 100.</html>
-randomDivorcePanel.title=Random Divorce (Unofficial)
+randomDivorcePanel.title=Random Divorce
 lblRandomDivorceMethod.text=Random Divorce Method
 lblRandomDivorceMethod.toolTipText=This is the method used to determine if an eligible person randomly divorces.
 chkUseRandomOppositeSexDivorce.text=Use Random Opposite Sex Divorce
@@ -500,11 +498,9 @@ chkUseRandomClanPersonnelDivorce.text=Use Random Clan Personnel Divorce
 chkUseRandomClanPersonnelDivorce.toolTipText=Allow clan-origin personnel to randomly divorce, whether as the origin or the spouse.
 chkUseRandomPrisonerDivorce.text=Use Random Prisoner Divorce
 chkUseRandomPrisonerDivorce.toolTipText=Allow random divorce when one or both of the couple are currently prisoners. Bondsmen are treated as free personnel when it comes to this option, and are thus not affected by it.
-percentageRandomDivorcePanel.title=Percentage Random Divorce
-lblPercentageRandomDivorceOppositeSexChance.text=Opposite Sex Chance
-lblPercentageRandomDivorceOppositeSexChance.toolTipText=This is the percent chance that a fitting member of your force will divorce their opposite sex spouse.
-lblPercentageRandomDivorceSameSexChance.text=Same Sex Chance
-lblPercentageRandomDivorceSameSexChance.toolTipText=This is the percent chance that a fitting member of your force will divorce their same-sex spouse.
+percentageRandomDivorcePanel.title=Divorce Dice
+lblRandomDivorceDiceSize.text=Divorce Dice Size
+lblRandomDivorceDiceSize.toolTipText=This is the number of sides featured on the weekly die rolled to see whether a marriage ends in divorce. Divorce occurs on a roll of 1. Set to 0 to disable random divorces for all personnel.
 
 # Procreation
 procreationPanel.title=Procreation (Unofficial)
@@ -538,11 +534,11 @@ chkUseRandomClanPersonnelProcreation.text=Use Random Clan Personnel Procreation
 chkUseRandomClanPersonnelProcreation.toolTipText=Allow clan-origin personnel to randomly procreate.
 chkUseRandomPrisonerProcreation.text=Use Random Prisoner Procreation
 chkUseRandomPrisonerProcreation.toolTipText=Allow prisoners to randomly procreate. Bondsmen are treated as free personnel when it comes to this option, and are thus not affected by it.
-percentageRandomProcreationPanel.title=Percentage Random Procreation
-lblPercentageRandomProcreationRelationshipChance.text=Relationship Chance
-lblPercentageRandomProcreationRelationshipChance.toolTipText=This is the percent chance per day that a female member of your force in a relationship will have a baby when not deployed.
-lblPercentageRandomProcreationRelationshiplessChance.text=Relationshipless Chance
-lblPercentageRandomProcreationRelationshiplessChance.toolTipText=This is the percent chance per day that a female member of your force not in a relationship will have a baby when not deployed.
+percentageRandomProcreationPanel.title=Procreation Dice
+lblRandomProcreationRelationshipDiceSize.text=Relationship Dice Size
+lblRandomProcreationRelationshipDiceSize.toolTipText=This is the number of sides on the die rolled weekly to determine whether a woman in a relationship will fall pregnant. A roll of 1 results in a pregnancy. Each child after the first will multiply this dice size by the number of children. Set to 0 to disable procreation within a relationship.
+lblRandomProcreationRelationshiplessDiceSize.text=Relationshipless Dice Size
+lblRandomProcreationRelationshiplessDiceSize.toolTipText=This is the number of sides on the die rolled weekly to determine whether a woman not in a relationship will fall pregnant. A roll of 1 results in a pregnancy. Each child after the first will multiply this dice size by the number of children. Set to 0 to disable procreation outside a relationship.
 
 # Death
 deathPanel.title=Death
@@ -685,17 +681,11 @@ lblTaxesPercentage.toolTipText=<html><body style='width: 300px'>The percentage o
   \ Tax amount is based on profits recorded at the end of the financial term.\
   \ Profits are calculated by comparing current funds against those from the prior financial term (or company starting funds).\
   \ Starting Capital and End of Term Carryover sums are excluded from profit calculations.</body></html>
-chkUseNotMercenaryExemption.text=Non-Mercenary Exemption
-chkUseNotMercenaryExemption.toolTipText=Campaigns belonging to non-mercenary factions are exempt from paying taxes.
-chkUseClanExemption.text=Clan Exemption
-chkUseClanExemption.toolTipText=Campaigns belonging to a 'Clan' faction are exempt from paying taxes.
 
 # 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

diff --git a/MekHQ/resources/mekhq/resources/Personnel.properties b/MekHQ/resources/mekhq/resources/Personnel.properties
@@ -1015,20 +1015,20 @@ RandomDependentMethod.AGAINST_THE_BOT.toolTipText=This follows the dependent add
 # RandomDivorceMethod
 RandomDivorceMethod.NONE.text=Disabled
 RandomDivorceMethod.NONE.toolTipText=Random divorce is disabled.
-RandomDivorceMethod.PERCENTAGE.text=Percentage
-RandomDivorceMethod.PERCENTAGE.toolTipText=This checks if a random value is lower than the percentage to determine if an eligible married person divorces on a given day.
+RandomDivorceMethod.DICE_ROLL.text=Dice Roll
+RandomDivorceMethod.DICE_ROLL.toolTipText=A die is rolled each week to determine whether a marriage ends in divorce. The options below determine how many sides this dice has. Divorce occurs on a roll of 1.
 
 # RandomMarriageMethod Enum
 RandomMarriageMethod.NONE.text=Disabled
 RandomMarriageMethod.NONE.toolTipText=Random marriage is disabled.
-RandomMarriageMethod.PERCENTAGE.text=Percentage
-RandomMarriageMethod.PERCENTAGE.toolTipText=This checks if a random value is lower than the percentage to determine if an eligible person marries on a given day.
+RandomMarriageMethod.DICE_ROLL.text=Dice Roll
+RandomMarriageMethod.DICE_ROLL.toolTipText=A die is rolled each week to determine whether an eligible character gets married to another eligible character. The options below determine how many sides this dice has. Marriage occurs on a roll of 1.
 
 # RandomProcreationMethod Enum
 RandomProcreationMethod.NONE.text=Disabled
 RandomProcreationMethod.NONE.toolTipText=Random procreation is disabled.
-RandomProcreationMethod.PERCENTAGE.text=Percentage
-RandomProcreationMethod.PERCENTAGE.toolTipText=This checks if a random value is lower than the percentage to determine if an eligible person procreates on a given day.
+RandomProcreationMethod.DICE_ROLL.text=Dice Roll
+RandomProcreationMethod.DICE_ROLL.toolTipText=Once per week roll a die with sides equal to those set below. On a roll of 1 the character falls pregnant.
 
 # TurnoverTargetNumberMethod Enum
 TurnoverTargetNumberMethod.FIXED.text=Fixed

diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -3413,9 +3413,6 @@ public void processNewDayPersonnel() {
                 continue;
             }
 
-            // Marriage
-            getMarriage().processNewDay(this, getLocalDate(), p);
-
             p.resetMinutesLeft();
             // Reset acquisitions made to 0
             p.setAcquisition(0);
@@ -3465,11 +3462,12 @@ public void processNewDayPersonnel() {
                 }
             }
 
-            // Divorce
-            getDivorce().processNewDay(this, getLocalDate(), p);
-
-            // Procreation
-            getProcreation().processNewDay(this, getLocalDate(), p);
+            // Divorce, Marriage, & Procreation
+            if (getLocalDate().getDayOfWeek() == DayOfWeek.MONDAY) {
+                getDivorce().processNewWeek(this, getLocalDate(), p);
+                getMarriage().processNewWeek(this, getLocalDate(), p);
+                getProcreation().processNewWeek(this, getLocalDate(), p);
+            }
 
             // Anniversaries
             if ((p.getRank().isOfficer()) || (!getCampaignOptions().isAnnounceOfficersOnly())) {
@@ -3671,7 +3669,7 @@ public boolean newDay() {
         getPersonnelMarket().generatePersonnelForDay(this);
 
         // TODO : AbstractContractMarket : Uncomment
-        //getContractMarket().processNewDay(this);
+        //getContractMarket().processNewWeek(this);
         getUnitMarket().processNewDay(this);
 
         // Process New Day for AtB