Merge pull request #6553 from IllianiCBT/reasoning

Rebranded "Intelligence" as "Reasoning" to Avoid Confusion with ATOW Intelligence Attribute

Author: IllianiCBT

MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties

@@ -716,14 +716,14 @@ lblBackgroundsTab.text=Background Options \u270E
 lblRandomBackgroundsPanel.text=Random Backgrounds \u2728
 lblUseRandomPersonalities.text=Assign Random Personalities \u2318
 lblUseRandomPersonalities.tooltip=Personnel are generated with random personality traits, quirks\
-  \ and intelligence.\
+  \ and reasoning.\
   <br>\
-  <br>Intelligence affects a character's ability to graduate from education module academies.
+  <br>Reasoning affects a character's ability to graduate from education module academies.
 lblUseRandomPersonalityReputation.text=Personality Influences Reputation
 lblUseRandomPersonalityReputation.tooltip=If enabled, the personality of the campaign commander\
   \ will impact the unit's Reputation.
-lblUseIntelligenceXpMultiplier.text=Intelligence Influences XP Costs
-lblUseIntelligenceXpMultiplier.tooltip=If enabled, a character's intelligence will influence all XP\
+lblUseReasoningXpMultiplier.text=Reasoning Influences XP Costs
+lblUseReasoningXpMultiplier.tooltip=If enabled, a character's reasoning will influence all XP\
   \ costs.
 lblUseSimulatedRelationships.text=Simulate Background Relationships \u26A0
 lblUseSimulatedRelationships.tooltip=Personnel are generated with a random relationship history.\
@@ -808,8 +808,7 @@ lblShowIneligibleAcademies.tooltip=Displays academies a character is ineligible
 lblEntranceExamBaseTargetNumber.text=Entrance Exam Target Number \u26A0
 lblEntranceExamBaseTargetNumber.tooltip=The base target number for Prestigious Academy entrance exams.\
   <br>\
-  <br>The final TN is this value minus Faculty Skill, opposed by 2d6 + Intelligence/4 or just 2d6\
-  \ (if personalities are disabled)
+  <br>The final TN is this value minus Faculty Skill, opposed by 2d6 + Reasoning/4 or just 2d6 (if personalities are disabled)
 # createEnableStandardSetsPanel
 lblEnableStandardSetsPanel.text=Enable Academy Sets
 lblEnableLocalAcademies.text=Local Academies

MekHQ/resources/mekhq/resources/GUI.properties

@@ -937,7 +937,7 @@ PersonnelTableModelColumn.AGGRESSION.text=Aggression
 PersonnelTableModelColumn.AMBITION.text=Ambition
 PersonnelTableModelColumn.GREED.text=Greed
 PersonnelTableModelColumn.SOCIAL.text=Social
-PersonnelTableModelColumn.INTELLIGENCE.text=Intelligence
+PersonnelTableModelColumn.REASONING.text=Reasoning
 #### PersonnelTabView Enum
 PersonnelTabView.GRAPHIC.text=Graphic
 PersonnelTabView.GRAPHIC.toolTipText=View the person's portrait, their current unit assignment, and their force, all shown with their graphics.

MekHQ/resources/mekhq/resources/Intelligence.properties MekHQ/resources/mekhq/resources/Reasoning.properties

@@ -255,11 +255,11 @@ private static void processEducationTime(Campaign campaign, Person commander, Pe
 
             int perExperienceLevelMultiplier = EDUCATION_TIME_MULTIPLIER;
             double experienceMultiplier = campaignOptions.getXpCostMultiplier();
-            double intelligenceCostMultiplier = trainee.getIntelligenceXpCostMultiplier(campaignOptions.isUseIntelligenceXpMultiplier());
+            double reasoningCostMultiplier = trainee.getReasoningXpCostMultiplier(campaignOptions.isUseReasoningXpMultiplier());
 
-            // Intelligence cost changes should always take place before global changes
+            // Reasoning cost changes should always take place before global changes
             perExperienceLevelMultiplier = (int) round(perExperienceLevelMultiplier * experienceMultiplier);
-            perExperienceLevelMultiplier = (int) round(perExperienceLevelMultiplier * intelligenceCostMultiplier);
+            perExperienceLevelMultiplier = (int) round(perExperienceLevelMultiplier * reasoningCostMultiplier);
 
             int educationTimeReduction = currentExperienceLevel * perExperienceLevelMultiplier;
             if (newEducationTime >= educationTimeReduction) {

MekHQ/src/mekhq/campaign/CampaignOptions.java

@@ -37,12 +37,13 @@
 import java.io.PrintWriter;
 import java.util.Objects;
 
+import megamek.codeUtilities.MathUtility;
 import megamek.common.Compute;
 import megamek.common.enums.SkillLevel;
 import megamek.logging.MMLogger;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.PersonnelOptions;
-import mekhq.campaign.randomEvents.personalities.enums.Intelligence;
+import mekhq.campaign.randomEvents.personalities.enums.Reasoning;
 import mekhq.utilities.MHQXMLUtility;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -342,7 +343,7 @@ public void improve() {
      * the cost for the next valid level if it exists.</p>
      *
      * <p><b>Usage:</b> For most use cases you probably want to call {@code getCostToImprove(String)} from a
-     * {@link Person} object, as that will factor in things like {@link Intelligence}.</p>
+     * {@link Person} object, as that will factor in things like {@link Reasoning}.</p>
      *
      * @return the cost to improve the skill, or 0 if no valid level with a positive cost is found.
      */
@@ -433,11 +434,11 @@ public static Skill generateInstanceFromXML(final Node wn) {
                     String text = wn2.getTextContent();
                     retVal.type = SkillType.getType(text);
                 } else if (wn2.getNodeName().equalsIgnoreCase("level")) {
-                    retVal.level = Integer.parseInt(wn2.getTextContent());
+                    retVal.level = MathUtility.parseInt(wn2.getTextContent());
                 } else if (wn2.getNodeName().equalsIgnoreCase("bonus")) {
-                    retVal.bonus = Integer.parseInt(wn2.getTextContent());
+                    retVal.bonus = MathUtility.parseInt(wn2.getTextContent());
                 } else if (wn2.getNodeName().equalsIgnoreCase("agingModifier")) {
-                    retVal.agingModifier = Integer.parseInt(wn2.getTextContent());
+                    retVal.agingModifier = MathUtility.parseInt(wn2.getTextContent());
                 }
             }
         } catch (Exception ex) {

MekHQ/src/mekhq/campaign/personnel/Person.java

@@ -42,7 +42,7 @@
  *
  * <p>It identifies deprecated skills from the person's current skill set and allows the user to remove them while
  * refunding the appropriate amount of XP. This process involves calculating XP refunds using the skill's cost and
- * intelligence multiplier, and providing a dialog for managing the refund.
+ * reasoning multiplier, and providing a dialog for managing the refund.
  *
  * <p>The class is initialized with a {@link Campaign} and a {@link Person}, and directly modifies the person's
  * skills and XP as necessary.
@@ -110,7 +110,7 @@ public boolean isRefundAll() {
      * Checks the specified person's skills for any deprecated skills.
      *
      * <p>If a deprecated skill is found, calculates the XP refund based on the skill's level and the person's
-     * intelligence multiplier. It then triggers a dialog to allow the user to refund or retain the skill.
+     * reasoning multiplier. It then triggers a dialog to allow the user to refund or retain the skill.
      *
      * @param person the {@link Person} to check for deprecated skills
      */
@@ -119,17 +119,17 @@ private void checkForDeprecatedSkills(Person person) {
 
         final double xpCostMultiplier = campaignOptions.getXpCostMultiplier();
 
-        final boolean isUseIntelligenceMultiplier = campaignOptions.isUseIntelligenceXpMultiplier();
-        final double intelligenceMultiplier = person.getIntelligenceXpCostMultiplier(isUseIntelligenceMultiplier);
+        final boolean isUseReasoningMultiplier = campaignOptions.isUseReasoningXpMultiplier();
+        final double reasoningXpMultiplier = person.getReasoningXpCostMultiplier(isUseReasoningMultiplier);
 
         final Skills skills = person.getSkills();
         for (SkillType skillType : DEPRECATED_SKILLS) {
             final String skillName = skillType.getName();
             if (skills.hasSkill(skillName)) {
                 int refundValue = getRefundValue(skills, skillType, skillName);
 
-                // Intelligence cost changes should always take place before global changes
-                refundValue = (int) round(refundValue * intelligenceMultiplier);
+                // Reasoning cost changes should always take place before global changes
+                refundValue = (int) round(refundValue * reasoningXpMultiplier);
                 refundValue = (int) round(refundValue * xpCostMultiplier);
 
                 triggerDialog(skills, skillName, refundValue);

MekHQ/src/mekhq/campaign/personnel/education/EducationController.java

@@ -34,7 +34,7 @@
 import static mekhq.campaign.personnel.enums.GenderDescriptors.HE_SHE_THEY;
 import static mekhq.campaign.personnel.enums.GenderDescriptors.HIM_HER_THEM;
 import static mekhq.campaign.personnel.enums.GenderDescriptors.HIS_HER_THEIR;
-import static mekhq.campaign.randomEvents.personalities.enums.Intelligence.*;
+import static mekhq.campaign.randomEvents.personalities.enums.Reasoning.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,13 +46,13 @@
 import mekhq.campaign.randomEvents.personalities.enums.Aggression;
 import mekhq.campaign.randomEvents.personalities.enums.Ambition;
 import mekhq.campaign.randomEvents.personalities.enums.Greed;
-import mekhq.campaign.randomEvents.personalities.enums.Intelligence;
 import mekhq.campaign.randomEvents.personalities.enums.PersonalityQuirk;
+import mekhq.campaign.randomEvents.personalities.enums.Reasoning;
 import mekhq.campaign.randomEvents.personalities.enums.Social;
 
 /**
  * This class is responsible for generating and managing personalities for characters. It assigns traits such as
- * aggression, ambition, greed, social behavior, intelligence, and personality quirks to a person, and generates a
+ * aggression, ambition, greed, social behavior, reasoning, and personality quirks to a person, and generates a
  * descriptive personality summary.
  *
  * <p>Additionally, this class includes methods for handling fallback personality logic, generating
@@ -76,12 +76,12 @@ public class PersonalityController {
      * </ul>
      */
     public enum PersonalityTraitType {
-        AGGRESSION, AMBITION, GREED, SOCIAL, INTELLIGENCE, PERSONALITY_QUIRK;
+        AGGRESSION, AMBITION, GREED, SOCIAL, REASONING, PERSONALITY_QUIRK;
     }
 
     /**
      * Generates a personality for the given person by assigning various personality characteristics such as aggression,
-     * ambition, greed, social behavior, intelligence, and optional quirks.
+     * ambition, greed, social behavior, reasoning, and optional quirks.
      *
      * <p>The method ensures that each personality characteristic is generated with a specified
      * probability (1 in 6 by default). If no characteristic is assigned, a fallback mechanism generates at least one
@@ -132,8 +132,8 @@ public static void generatePersonality(Person person) {
             person.setPersonalityQuirk(PersonalityQuirk.NONE);
         }
 
-        // INTELLIGENCE
-        person.setIntelligence(generateIntelligence(randomInt(8346)));
+        // REASONING
+        person.setReasoning(generateReasoning(randomInt(8346)));
 
         // finally, write the description
         writePersonalityDescription(person);
@@ -150,15 +150,15 @@ public static void generatePersonality(Person person) {
      * Generates an expansive "big" personality for a major character, Ronin, or hero.
      *
      * <p>This method creates a detailed set of personality traits for the given person,
-     * selecting and assigning a combination of major traits, a quirk, and intelligence. It ensures the generated
+     * selecting and assigning a combination of major traits, a quirk, and reasoning. It ensures the generated
      * personality reflects a high degree of uniqueness and depth.</p>
      *
      * <p>The method proceeds as follows:
      * <ul>
      *     <li>Randomly selects up to four major traits (Aggression, Ambition, Greed, Social).</li>
      *     <li>Assigns the selected traits to the person's corresponding personality attributes.</li>
      *     <li>Generates and applies a unique personality quirk to the person.</li>
-     *     <li>Generates an intelligence score using the maximum of two random values.</li>
+     *     <li>Generates a reasoning score using the maximum of two random values.</li>
      *     <li>Writes a personality description based on the generated traits and attributes.</li>
      * </ul>
      *
@@ -225,10 +225,10 @@ public static void generateBigPersonality(Person person) {
         // PERSONALITY QUIRK
         generateAndApplyPersonalityQuirk(person);
 
-        // INTELLIGENCE
-        int firstIntelligence = randomInt(8346);
-        int secondIntelligence = randomInt(8346);
-        person.setIntelligence(generateIntelligence(max(firstIntelligence, secondIntelligence)));
+        // REASONING
+        int firstReasoning = randomInt(8346);
+        int secondReasoning = randomInt(8346);
+        person.setReasoning(generateReasoning(max(firstReasoning, secondReasoning)));
 
         // finally, write the description
         writePersonalityDescription(person);
@@ -324,14 +324,12 @@ public static void writePersonalityDescription(Person person) {
               person.getSocial(),
               person.getSocialDescriptionIndex());
 
-        // Intelligence and personality quirk are handled differently to general personality traits.
-        // INTELLIGENCE
-        Intelligence intelligence = person.getIntelligence();
-        String intelligenceDescription = "";
-        if (!intelligence.isAverageType()) {
-            intelligenceDescription = intelligence.getDescription(person.getIntelligenceDescriptionIndex(),
-                  gender,
-                  givenName);
+        // Reasoning and personality quirk are handled differently to general personality traits.
+        // REASONING
+        Reasoning reasoning = person.getReasoning();
+        String reasoningDescription = "";
+        if (!reasoning.isAverageType()) {
+            reasoningDescription = reasoning.getDescription(person.getReasoningDescriptionIndex(), gender, givenName);
         }
 
         // PERSONALITY QUIRK
@@ -369,11 +367,11 @@ public static void writePersonalityDescription(Person person) {
             }
         }
 
-        if (!intelligenceDescription.isBlank()) {
+        if (!reasoningDescription.isBlank()) {
             if (!personalityDescription.toString().isBlank()) {
-                personalityDescription.append("<p>").append(intelligenceDescription).append("</p>");
+                personalityDescription.append("<p>").append(reasoningDescription).append("</p>");
             } else {
-                personalityDescription.append(intelligenceDescription);
+                personalityDescription.append(reasoningDescription);
             }
         }
 
@@ -389,9 +387,9 @@ public static void writePersonalityDescription(Person person) {
     }
 
     /**
-     * Retrieves the descriptions of all personality traits (other than Intelligence and Quirks) for the given person.
-     * This method processes various personality traits such as aggression, ambition, greed, and social behavior,
-     * generating descriptions based on the specified indices, gender, and given name of the person.
+     * Retrieves the descriptions of all personality traits (other than Reasoning and Quirks) for the given person. This
+     * method processes various personality traits such as aggression, ambition, greed, and social behavior, generating
+     * descriptions based on the specified indices, gender, and given name of the person.
      *
      * <p>Descriptions for traits that are not assigned or are empty will be excluded from the
      * returned list. This ensures only meaningful and applicable descriptions are included.
@@ -416,10 +414,8 @@ public static void writePersonalityDescription(Person person) {
      *       the given person; traits without meaningful descriptions are excluded
      */
     private static List<String> getTraitDescriptions(Gender gender, String givenName, Aggression aggression,
-                                                     int aggressionDescriptionIndex, Ambition ambition,
-                                                     int ambitionDescriptionIndex, Greed greed,
-                                                     int greedDescriptionIndex, Social social,
-                                                     int socialDescriptionIndex) {
+          int aggressionDescriptionIndex, Ambition ambition, int ambitionDescriptionIndex, Greed greed,
+          int greedDescriptionIndex, Social social, int socialDescriptionIndex) {
         List<String> traitDescriptions = new ArrayList<>();
 
         // AGGRESSION
@@ -461,18 +457,24 @@ private static List<String> getTraitDescriptions(Gender gender, String givenName
         return traitDescriptions;
     }
 
+
+    /**
+     * @deprecated replaced by {@link #getReasoning()}
+     */
+    @Deprecated(since = "0.50.05", forRemoval = true)
+
+
     /**
-     * Generates an Intelligence enum value for a person based on a randomly rolled value. Each intelligence level is
-     * mapped to a specific range of values, with lower rolls producing less intelligent results and higher rolls
-     * producing more intelligent results.
+     * Generates an {@link Reasoning} enum value for a person based on a randomly rolled value. Each reasoning
+     * level is mapped to a specific range of values, with lower rolls producing less intelligent results and higher
+     * rolls producing more intelligent results.
      *
-     * @param roll the random roll value used to determine the Intelligence enum value
+     * @param roll the random roll value used to determine the {@link Reasoning} enum value
      *
-     * @return the Intelligence enum value corresponding to the rolled range
+     * @return the {@link Reasoning} enum value corresponding to the rolled range
      *
      * @throws IllegalStateException if the roll exceeds the expected value range
-     */
-    private static Intelligence generateIntelligence(int roll) {
+     */ private static Reasoning generateReasoning(int roll) {
         if (roll < 1) {
             return BRAIN_DEAD;
         } else if (roll < 2) {
@@ -525,7 +527,7 @@ private static Intelligence generateIntelligence(int roll) {
             return GENIUS;
         } else {
             throw new IllegalStateException(
-                  "Unexpected value in mekhq/campaign/personnel/randomEvents/PersonalityController.java/generateIntelligence: " +
+                  "Unexpected value in mekhq/campaign/personnel/randomEvents/PersonalityController.java/generateReasoning: " +
                         roll);
         }
     }
@@ -549,7 +551,7 @@ private static Intelligence generateIntelligence(int roll) {
      *       are not enabled
      */
     public static int getPersonalityValue(final boolean isUseRandomPersonalities, final Aggression aggression,
-                                          final Ambition ambition, final Greed greed, final Social social) {
+          final Ambition ambition, final Greed greed, final Social social) {
         if (!isUseRandomPersonalities) {
             return 0;
         }