Merge pull request #7201 from IllianiBird/comingOfAgeRPSkills

Improvement: #7199 Added Coming of Age RP Skill Generation

Author: rjhancock

MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties

@@ -1897,7 +1897,11 @@ lblComingOfAgeAbilities.tooltip=If checked, all characters will be awarded a sin
   <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.
-lblATOWAttributesPanel.text=A Time of War Traits
+lblComingOfAgeRPSkills.text=Award Coming of Age RP Skills \u26A0 <span style="color:#C344C3;">\u2605</span>
+lblComingOfAgeRPSkills.tooltip=If checked, all characters will be awarded random RP skills SPA when they turn 16.\
+  <br>\
+  <br><b>Warning:</b> This option relies on the RP skill chances found in the 'Secondary Skills' panel.
+lblATOWAttributesPanel.text=A Time of War Traits and Attributes
 lblUseAttributes.text=Use Attributes \u26A0
 lblUseAttributes.tooltip=If checked, characters will be generated with <i>A Time of War</i> Attribute scores.\
   <br>\

MekHQ/src/mekhq/campaign/Campaign.java

@@ -41,7 +41,6 @@
 import static mekhq.campaign.CampaignOptions.S_TECH;
 import static mekhq.campaign.CampaignOptions.TRANSIT_UNIT_MONTH;
 import static mekhq.campaign.CampaignOptions.TRANSIT_UNIT_WEEK;
-import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
 import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
 import static mekhq.campaign.force.Force.FORCE_NONE;
 import static mekhq.campaign.force.Force.FORCE_ORIGIN;
@@ -110,7 +109,6 @@
 import megamek.client.ui.util.PlayerColour;
 import megamek.codeUtilities.ObjectUtility;
 import megamek.common.*;
-import megamek.common.BombType.BombTypeEnum;
 import megamek.common.ITechnology.AvailabilityValue;
 import megamek.common.annotations.Nullable;
 import megamek.common.enums.Gender;
@@ -195,8 +193,10 @@
 import mekhq.campaign.personnel.enums.Phenotype;
 import mekhq.campaign.personnel.enums.SplittingSurnameStyle;
 import mekhq.campaign.personnel.generator.AbstractPersonnelGenerator;
+import mekhq.campaign.personnel.generator.AbstractSkillGenerator;
 import mekhq.campaign.personnel.generator.AbstractSpecialAbilityGenerator;
 import mekhq.campaign.personnel.generator.DefaultPersonnelGenerator;
+import mekhq.campaign.personnel.generator.DefaultSkillGenerator;
 import mekhq.campaign.personnel.generator.DefaultSpecialAbilityGenerator;
 import mekhq.campaign.personnel.generator.RandomPortraitGenerator;
 import mekhq.campaign.personnel.generator.SingleSpecialAbilityGenerator;
@@ -5342,22 +5342,31 @@ private void processAnniversaries(Person person) {
             }
         }
 
-        if (campaignOptions.isShowLifeEventDialogComingOfAge()) {
-            if ((age == 16) && (isBirthday)) {
-                new ComingOfAgeAnnouncement(this, person);
-            }
-        }
-
         if (campaignOptions.isUseAgeEffects() && isBirthday) {
             // This is where we update all the aging modifiers for the character.
             updateAllSkillAgeModifiers(currentDay, person);
             applyAgingSPA(age, person);
         }
 
-        if (campaignOptions.isRewardComingOfAgeAbilities() && isBirthday && (person.getAge(currentDay) == 16)) {
-            SingleSpecialAbilityGenerator singleSpecialAbilityGenerator = new SingleSpecialAbilityGenerator();
-            singleSpecialAbilityGenerator.rollSPA(this, person);
+        // Coming of Age Events
+        if (isBirthday && (person.getAge(currentDay) == 16)) {
+            if (campaignOptions.isRewardComingOfAgeAbilities()) {
+                SingleSpecialAbilityGenerator singleSpecialAbilityGenerator = new SingleSpecialAbilityGenerator();
+                singleSpecialAbilityGenerator.rollSPA(this, person);
+            }
+
+            if (campaignOptions.isRewardComingOfAgeRPSkills()) {
+                AbstractSkillGenerator skillGenerator = new DefaultSkillGenerator(rskillPrefs);
+                skillGenerator.generateRoleplaySkills(person);
+            }
+
+            // We want the event trigger to fire before the dialog is shown, so that the character will have finished
+            // updating in the gui before the player has a chance to jump to them
             MekHQ.triggerEvent(new PersonChangedEvent(person));
+
+            if (campaignOptions.isShowLifeEventDialogComingOfAge()) {
+                new ComingOfAgeAnnouncement(this, person);
+            }
         }
     }
 

MekHQ/src/mekhq/campaign/CampaignOptions.java

@@ -246,6 +246,7 @@ public static String getTechLevelName(final int techLevel) {
     private boolean displayAssignmentRecord;
     private boolean displayPerformanceRecord;
     private boolean rewardComingOfAgeAbilities;
+    private boolean rewardComingOfAgeRPSkills;
 
     // Expanded Personnel Information
     private boolean useTimeInService;
@@ -801,6 +802,7 @@ public CampaignOptions() {
         setDisplayKillRecord(false);
         setDisplayMedicalRecord(false);
         setRewardComingOfAgeAbilities(false);
+        setRewardComingOfAgeRPSkills(false);
 
         // Expanded Personnel Information
         setUseTimeInService(false);
@@ -1705,6 +1707,14 @@ public void setRewardComingOfAgeAbilities(final boolean rewardComingOfAgeAbiliti
         this.rewardComingOfAgeAbilities = rewardComingOfAgeAbilities;
     }
 
+    public boolean isRewardComingOfAgeRPSkills() {
+        return rewardComingOfAgeRPSkills;
+    }
+
+    public void setRewardComingOfAgeRPSkills(final boolean rewardComingOfAgeRPSkills) {
+        this.rewardComingOfAgeRPSkills = rewardComingOfAgeRPSkills;
+    }
+
     public boolean isUseFatigue() {
         return useFatigue;
     }
@@ -5010,6 +5020,7 @@ public void writeToXml(final PrintWriter pw, int indent) {
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "displayAssignmentRecord", isDisplayAssignmentRecord());
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "displayPerformanceRecord", isDisplayPerformanceRecord());
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "rewardComingOfAgeAbilities", isRewardComingOfAgeAbilities());
+        MHQXMLUtility.writeSimpleXMLTag(pw, indent, "rewardComingOfAgeRPSkills", isRewardComingOfAgeRPSkills());
         // endregion General Personnel
 
         // region Expanded Personnel Information
@@ -5846,6 +5857,8 @@ public static CampaignOptions generateCampaignOptionsFromXml(Node parentNod, Ver
                     campaignOptions.setDisplayPerformanceRecord(Boolean.parseBoolean(nodeContents));
                 } else if (nodeName.equalsIgnoreCase("rewardComingOfAgeAbilities")) {
                     campaignOptions.setRewardComingOfAgeAbilities(Boolean.parseBoolean(nodeContents));
+                } else if (nodeName.equalsIgnoreCase("rewardComingOfAgeRPSkills")) {
+                    campaignOptions.setRewardComingOfAgeRPSkills(Boolean.parseBoolean(nodeContents));
                     // endregion General Personnel
 
                     // region Expanded Personnel Information

MekHQ/src/mekhq/gui/campaignOptions/contents/AdvancementTab.java

@@ -122,6 +122,7 @@ public class AdvancementTab {
     private CampaignOptionsHeaderPanel skillRandomizationHeader;
     private JCheckBox chkExtraRandomness;
     private JCheckBox chkComingOfAgeSPAs;
+    private JCheckBox chkRewardComingOfAgeRPSkills;
 
     private JPanel pnlPhenotype;
     private JLabel[] phenotypeLabels;
@@ -577,6 +578,7 @@ private void initializeSkillRandomizationTab() {
         pnlATOWAttributes = new JPanel();
         chkRandomizeTraits = new JCheckBox();
         chkComingOfAgeSPAs = new JCheckBox();
+        chkRewardComingOfAgeRPSkills = new JCheckBox();
 
         pnlPhenotype = new JPanel();
         phenotypeLabels = new JLabel[] {}; // This will be initialized properly later
@@ -664,9 +666,14 @@ public JPanel skillRandomizationTab() {
         // Contents
         chkExtraRandomness = new CampaignOptionsCheckBox("ExtraRandomness");
         chkExtraRandomness.addMouseListener(createTipPanelUpdater(skillRandomizationHeader, "ExtraRandomness"));
+
         chkComingOfAgeSPAs = new CampaignOptionsCheckBox("ComingOfAgeAbilities");
         chkComingOfAgeSPAs.addMouseListener(createTipPanelUpdater(skillRandomizationHeader, "ComingOfAgeAbilities"));
 
+        chkRewardComingOfAgeRPSkills = new CampaignOptionsCheckBox("ComingOfAgeRPSkills");
+        chkRewardComingOfAgeRPSkills.addMouseListener(createTipPanelUpdater(skillRandomizationHeader,
+              "ComingOfAgeRPSkills"));
+
         pnlPhenotype = createPhenotypePanel();
         pnlRandomAbilities = createAbilityPanel();
         pnlSkillGroups = createSkillGroupPanel();
@@ -686,6 +693,9 @@ public JPanel skillRandomizationTab() {
         layout.gridy++;
         panel.add(chkComingOfAgeSPAs, layout);
 
+        layout.gridy++;
+        panel.add(chkRewardComingOfAgeRPSkills, layout);
+
         layout.gridx = 0;
         layout.gridy++;
         panel.add(pnlPhenotype, layout);
@@ -1279,6 +1289,7 @@ public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampai
         chkRandomizeAttributes.setSelected(skillPreferences.isRandomizeAttributes());
         chkRandomizeTraits.setSelected(skillPreferences.isRandomizeTraits());
         chkComingOfAgeSPAs.setSelected(options.isRewardComingOfAgeAbilities());
+        chkRewardComingOfAgeRPSkills.setSelected(options.isRewardComingOfAgeRPSkills());
         final int[] phenotypeProbabilities = options.getPhenotypeProbabilities();
         for (int i = 0; i < phenotypeSpinners.length; i++) {
             phenotypeSpinners[i].setValue(phenotypeProbabilities[i]);
@@ -1372,6 +1383,7 @@ public void applyCampaignOptionsToCampaign(@Nullable CampaignOptions presetCampa
         options.setAdminXP((int) spnAdminWeeklyXP.getValue());
         options.setAdminXPPeriod((int) spnAdminWeeklyXPPeriod.getValue());
         options.setRewardComingOfAgeAbilities(chkComingOfAgeSPAs.isSelected());
+        options.setRewardComingOfAgeRPSkills(chkRewardComingOfAgeRPSkills.isSelected());
 
         //start Skill Randomization Tab
         skillPreferences.setRandomizeSkill(chkExtraRandomness.isSelected());