MegaMek · IllianiCBT · Sep 26, 2024 · Jul 22, 2024 · Jul 22, 2024 · Jul 22, 2024
diff --git a/MekHQ/docs/Personnel Modules/Prisoner & Defection System.pdf b/MekHQ/docs/Personnel Modules/Prisoner & Defection System.pdf
diff --git a/MekHQ/docs/Personnel Modules/Prisoners, Defection & Dependents.pdf b/MekHQ/docs/Personnel Modules/Prisoners, Defection & Dependents.pdf
diff --git a/MekHQ/mmconf/campaignPresets/Campaign Operations (StratCon).xml b/MekHQ/mmconf/campaignPresets/Campaign Operations (StratCon).xml
@@ -218,9 +218,8 @@
 		<prisonerBabyStatus>true</prisonerBabyStatus>
 		<useAtBPrisonerDefection>false</useAtBPrisonerDefection>
 		<useAtBPrisonerRansom>false</useAtBPrisonerRansom>
-		<randomDependentMethod>NONE</randomDependentMethod>
-		<useRandomDependentAddition>true</useRandomDependentAddition>
-		<useRandomDependentRemoval>true</useRandomDependentRemoval>
+		<useRandomDependentAddition>false</useRandomDependentAddition>
+		<useRandomDependentRemoval>false</useRandomDependentRemoval>
 		<usePersonnelRemoval>true</usePersonnelRemoval>
 		<useRemovalExemptCemetery>true</useRemovalExemptCemetery>
 		<useRemovalExemptRetirees>true</useRemovalExemptRetirees>

diff --git a/MekHQ/mmconf/campaignPresets/Campaign Operations.xml b/MekHQ/mmconf/campaignPresets/Campaign Operations.xml
@@ -218,9 +218,8 @@
 		<prisonerBabyStatus>true</prisonerBabyStatus>
 		<useAtBPrisonerDefection>false</useAtBPrisonerDefection>
 		<useAtBPrisonerRansom>false</useAtBPrisonerRansom>
-		<randomDependentMethod>NONE</randomDependentMethod>
-		<useRandomDependentAddition>true</useRandomDependentAddition>
-		<useRandomDependentRemoval>true</useRandomDependentRemoval>
+		<useRandomDependentAddition>false</useRandomDependentAddition>
+		<useRandomDependentRemoval>false</useRandomDependentRemoval>
 		<usePersonnelRemoval>true</usePersonnelRemoval>
 		<useRemovalExemptCemetery>true</useRemovalExemptCemetery>
 		<useRemovalExemptRetirees>true</useRemovalExemptRetirees>

diff --git a/MekHQ/mmconf/campaignPresets/Complete Experience.xml b/MekHQ/mmconf/campaignPresets/Complete Experience.xml
@@ -218,7 +218,6 @@
 		<prisonerBabyStatus>true</prisonerBabyStatus>
 		<useAtBPrisonerDefection>true</useAtBPrisonerDefection>
 		<useAtBPrisonerRansom>true</useAtBPrisonerRansom>
-		<randomDependentMethod>AGAINST_THE_BOT</randomDependentMethod>
 		<useRandomDependentAddition>true</useRandomDependentAddition>
 		<useRandomDependentRemoval>true</useRandomDependentRemoval>
 		<usePersonnelRemoval>true</usePersonnelRemoval>

diff --git a/MekHQ/mmconf/campaignPresets/New Pilot Program.xml b/MekHQ/mmconf/campaignPresets/New Pilot Program.xml
@@ -218,9 +218,8 @@
 		<prisonerBabyStatus>true</prisonerBabyStatus>
 		<useAtBPrisonerDefection>true</useAtBPrisonerDefection>
 		<useAtBPrisonerRansom>true</useAtBPrisonerRansom>
-		<randomDependentMethod>NONE</randomDependentMethod>
-		<useRandomDependentAddition>true</useRandomDependentAddition>
-		<useRandomDependentRemoval>true</useRandomDependentRemoval>
+		<useRandomDependentAddition>false</useRandomDependentAddition>
+		<useRandomDependentRemoval>false</useRandomDependentRemoval>
 		<usePersonnelRemoval>true</usePersonnelRemoval>
 		<useRemovalExemptCemetery>true</useRemovalExemptCemetery>
 		<useRemovalExemptRetirees>true</useRemovalExemptRetirees>

diff --git a/MekHQ/mmconf/campaignPresets/Tabula Rasa.xml b/MekHQ/mmconf/campaignPresets/Tabula Rasa.xml
@@ -218,9 +218,8 @@
 		<prisonerBabyStatus>true</prisonerBabyStatus>
 		<useAtBPrisonerDefection>false</useAtBPrisonerDefection>
 		<useAtBPrisonerRansom>false</useAtBPrisonerRansom>
-		<randomDependentMethod>NONE</randomDependentMethod>
-		<useRandomDependentAddition>true</useRandomDependentAddition>
-		<useRandomDependentRemoval>true</useRandomDependentRemoval>
+		<useRandomDependentAddition>false</useRandomDependentAddition>
+		<useRandomDependentRemoval>false</useRandomDependentRemoval>
 		<usePersonnelRemoval>true</usePersonnelRemoval>
 		<useRemovalExemptCemetery>true</useRemovalExemptCemetery>
 		<useRemovalExemptRetirees>true</useRemovalExemptRetirees>

diff --git a/MekHQ/resources/mekhq/resources/Campaign.properties b/MekHQ/resources/mekhq/resources/Campaign.properties
@@ -73,8 +73,8 @@ turnoverPersonnelKilled.text=<html>You have personnel who have left the unit or
 divorce.text=%s has divorced %s.
 
 #### Unsorted Campaign Resources
-dependentLeavesForce.text=%s is no longer travelling with the force, and is thus no longer dependent on it.
-dependentJoinsForce.text=%s has started traveling with the force, and is now dependent on it.
+dependentLeavesForce.text=%s is no longer travelling with the force.
+dependentJoinsForce.text=%s has started traveling with the force.
 relativeJoinsForce.text=%s, %s's %s, has started traveling with the force, and is now dependent on it.
 relativeJoinsForceSpouse.text=spouse
 relativeJoinsForceChild.text=child

diff --git a/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
@@ -340,15 +340,11 @@ lblFatigueLeaveThreshold.toolTipText=<html>Automatically assign personnel to Lea
 
 # 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 (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.
+dependentPanel.toolTipText=These options concern the random addition or removal of dependents from the campaign.
 chkUseRandomDependentAddition.text=Use Random Dependent Addition
-chkUseRandomDependentAddition.toolTipText=This enables the random additions of dependents to the Force.
+chkUseRandomDependentAddition.toolTipText=This enables the monthly addition of random dependents to the campaign.
 chkUseRandomDependentRemoval.text=Use Random Dependent Removal
-chkUseRandomDependentRemoval.toolTipText=This enables the random removal of dependents from the Force.
+chkUseRandomDependentRemoval.toolTipText=This enables the monthly removal of dependents from the campaign.
 
 # Personnel Removal
 personnelRemovalPanel.title=Personnel Clean Up

diff --git a/MekHQ/src/mekhq/Utilities.java b/MekHQ/src/mekhq/Utilities.java
@@ -19,27 +19,6 @@
  */
 package mekhq;
 
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.function.Consumer;
-
-import javax.swing.JTable;
-import javax.swing.table.TableModel;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
-import org.w3c.dom.Node;
-
 import megamek.client.Client;
 import megamek.client.generator.RandomNameGenerator;
 import megamek.codeUtilities.MathUtility;
@@ -63,6 +42,21 @@
 import mekhq.campaign.unit.CrewType;
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.unit.UnitTechProgression;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+import org.w3c.dom.Node;
+
+import javax.swing.*;
+import javax.swing.table.TableModel;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Consumer;
 
 public class Utilities {
     private static final MMLogger logger = MMLogger.create(Utilities.class);
@@ -839,37 +833,45 @@ public static boolean rollProbability(int prob) {
         return Compute.randomInt(100) <= prob;
     }
 
+    /**
+     * Calculates the age of a character based on their experience level and clan status.
+     *
+     * @param expLevel the experience level of the character represented by an integer value.
+     * @param clan     a boolean value indicating whether the character is a clan character.
+     * @return the age of the character calculated based on the provided expLevel and clan.
+     */
     public static int getAgeByExpLevel(int expLevel, boolean clan) {
-        int baseAge = 19;
-        int nDice = 1;
-        switch (expLevel) {
-            case SkillType.EXP_REGULAR:
-                nDice = 2;
-                break;
-            case SkillType.EXP_VETERAN:
-                nDice = 3;
-                break;
-            case SkillType.EXP_ELITE:
-                nDice = 4;
-                break;
-            default:
-                break;
-        }
+        int baseAge = 18;
+
+        int nDice = switch (expLevel) {
+            case SkillType.EXP_NONE -> 7;
+            case SkillType.EXP_GREEN -> 1;
+            case SkillType.EXP_REGULAR -> 2;
+            case SkillType.EXP_VETERAN -> 4;
+            case SkillType.EXP_ELITE -> 8;
+            default -> 0;
+        };
 
         int age = baseAge;
-        while (nDice > 0) {
-            int roll = Compute.d6();
-            // reroll all sixes once
+
+        for (int i = 0; i < nDice; i++) {
+            int roll = Compute.d6(1);
+
             if (roll == 6) {
                 roll += (Compute.d6() - 1);
             }
 
             if (clan) {
                 roll = (int) Math.ceil(roll / 2.0);
             }
+
             age += roll;
-            nDice--;
         }
+
+        if (expLevel == SkillType.EXP_NONE) {
+            age -= baseAge; // only use the result of the dice roll
+        }
+
         return age;
     }