Merge pull request #6555 from IllianiCBT/attributesOnTable

Added Attribute Columns to Personnel Table

Author: IllianiCBT

MekHQ/resources/mekhq/resources/GUI.properties

@@ -946,6 +946,13 @@ PersonnelTableModelColumn.AMBITION.text=Ambition
 PersonnelTableModelColumn.GREED.text=Greed
 PersonnelTableModelColumn.SOCIAL.text=Social
 PersonnelTableModelColumn.REASONING.text=Reasoning
+PersonnelTableModelColumn.STRENGTH.text=Strength
+PersonnelTableModelColumn.BODY.text=Body
+PersonnelTableModelColumn.REFLEXES.text=Reflexes
+PersonnelTableModelColumn.DEXTERITY.text=Dexterity
+PersonnelTableModelColumn.INTELLIGENCE.text=Intelligence
+PersonnelTableModelColumn.WILLPOWER.text=Willpower
+PersonnelTableModelColumn.CHARISMA.text=Charisma
 #### 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.
@@ -972,7 +979,10 @@ PersonnelTabView.FLAGS.toolTipText=View the various flags that may be saved for
 PersonnelTabView.PERSONALITY.text=Personality
 PersonnelTabView.PERSONALITY.toolTipText=View a character's personality traits.
 PersonnelTabView.TRAITS.text=Traits
-PersonnelTabView.TRAITS.toolTipText=View a character's Connections, Wealth, and Reputation.
+PersonnelTabView.TRAITS.toolTipText=View a character's Connections, Wealth, Reputation, Unlucky, and Edge.
+PersonnelTabView.ATTRIBUTES.text=Attributes
+PersonnelTabView.ATTRIBUTES.toolTipText=View a character's Strength, Body, Reflexes, Dexterity, Intelligence, Willpower,\
+  \ and Edge.
 PersonnelTabView.OTHER.text=Other
 PersonnelTabView.OTHER.toolTipText=View various values for a person that are otherwise isolated to export.
 ##### Menus

MekHQ/src/mekhq/gui/enums/PersonnelTabView.java

@@ -35,17 +35,20 @@ public enum PersonnelTabView {
     //region Enum Declarations
     GRAPHIC("PersonnelTabView.GRAPHIC.text", "PersonnelTabView.GRAPHIC.toolTipText"),
     GENERAL("PersonnelTabView.GENERAL.text", "PersonnelTabView.GENERAL.toolTipText"),
-    PILOT_GUNNERY_SKILLS("PersonnelTabView.PILOT_GUNNERY_SKILLS.text", "PersonnelTabView.PILOT_GUNNERY_SKILLS.toolTipText"),
+    PILOT_GUNNERY_SKILLS("PersonnelTabView.PILOT_GUNNERY_SKILLS.text",
+          "PersonnelTabView.PILOT_GUNNERY_SKILLS.toolTipText"),
     INFANTRY_SKILLS("PersonnelTabView.INFANTRY_SKILLS.text", "PersonnelTabView.INFANTRY_SKILLS.toolTipText"),
     TACTICAL_SKILLS("PersonnelTabView.TACTICAL_SKILLS.text", "PersonnelTabView.TACTICAL_SKILLS.toolTipText"),
     TECHNICAL_SKILLS("PersonnelTabView.TECHNICAL_SKILLS.text", "PersonnelTabView.TECHNICAL_SKILLS.toolTipText"),
-    ADMINISTRATIVE_SKILLS("PersonnelTabView.ADMINISTRATIVE_SKILLS.text", "PersonnelTabView.ADMINISTRATIVE_SKILLS.toolTipText"),
+    ADMINISTRATIVE_SKILLS("PersonnelTabView.ADMINISTRATIVE_SKILLS.text",
+          "PersonnelTabView.ADMINISTRATIVE_SKILLS.toolTipText"),
+    TRAITS("PersonnelTabView.TRAITS.text", "PersonnelTabView.TRAITS.toolTipText"),
+    ATTRIBUTES("PersonnelTabView.ATTRIBUTES.text", "PersonnelTabView.ATTRIBUTES.toolTipText"),
+    PERSONALITY("PersonnelTabView.PERSONALITY.text", "PersonnelTabView.PERSONALITY.toolTipText"),
     BIOGRAPHICAL("PersonnelTabView.BIOGRAPHICAL.text", "PersonnelTabView.BIOGRAPHICAL.toolTipText"),
     FLUFF("PersonnelTabView.FLUFF.text", "PersonnelTabView.FLUFF.toolTipText"),
     DATES("PersonnelTabView.DATES.text", "PersonnelTabView.DATES.toolTipText"),
     FLAGS("PersonnelTabView.FLAGS.text", "PersonnelTabView.FLAGS.toolTipText"),
-    PERSONALITY("PersonnelTabView.PERSONALITY.text", "PersonnelTabView.PERSONALITY.toolTipText"),
-    TRAITS("PersonnelTabView.TRAITS.text", "PersonnelTabView.TRAITS.toolTipText"),
     OTHER("PersonnelTabView.OTHER.text", "PersonnelTabView.OTHER.toolTipText");
     //endregion Enum Declarations
 
@@ -57,7 +60,7 @@ public enum PersonnelTabView {
     //region Constructors
     PersonnelTabView(final String name, final String toolTipText) {
         final ResourceBundle resources = ResourceBundle.getBundle("mekhq.resources.GUI",
-                MekHQ.getMHQOptions().getLocale());
+              MekHQ.getMHQOptions().getLocale());
         this.name = resources.getString(name);
         this.toolTipText = resources.getString(toolTipText);
     }

MekHQ/src/mekhq/gui/enums/PersonnelTableModelColumn.java

@@ -52,6 +52,7 @@
 import mekhq.campaign.personnel.PersonnelOptions;
 import mekhq.campaign.personnel.enums.GenderDescriptors;
 import mekhq.campaign.personnel.skills.SkillType;
+import mekhq.campaign.personnel.skills.enums.SkillAttribute;
 import mekhq.campaign.randomEvents.personalities.enums.Aggression;
 import mekhq.campaign.randomEvents.personalities.enums.Ambition;
 import mekhq.campaign.randomEvents.personalities.enums.Greed;
@@ -144,7 +145,14 @@ public enum PersonnelTableModelColumn {
     AMBITION("PersonnelTableModelColumn.AMBITION.text"),
     GREED("PersonnelTableModelColumn.GREED.text"),
     SOCIAL("PersonnelTableModelColumn.SOCIAL.text"),
-    REASONING("PersonnelTableModelColumn.REASONING.text");
+    REASONING("PersonnelTableModelColumn.REASONING.text"),
+    STRENGTH("PersonnelTableModelColumn.STRENGTH.text"),
+    BODY("PersonnelTableModelColumn.BODY.text"),
+    REFLEXES("PersonnelTableModelColumn.REFLEXES.text"),
+    DEXTERITY("PersonnelTableModelColumn.DEXTERITY.text"),
+    INTELLIGENCE("PersonnelTableModelColumn.INTELLIGENCE.text"),
+    WILLPOWER("PersonnelTableModelColumn.WILLPOWER.text"),
+    CHARISMA("PersonnelTableModelColumn.CHARISMA.text");
 
     // endregion Enum Declarations
 
@@ -464,6 +472,8 @@ public boolean isSocial() {
     }
 
     /**
+     * When this is removed {@link #isATOWIntelligence()} should be renamed to just 'isIntelligence()'
+     *
      * @deprecated replaced by {@link #isReasoning()}
      */
     @Deprecated(since = "0.50.05", forRemoval = true)
@@ -475,6 +485,45 @@ public boolean isReasoning() {
         return this == REASONING;
     }
 
+    public boolean isStrength() {
+        return this == STRENGTH;
+    }
+
+    public boolean isBody() {
+        return this == BODY;
+    }
+
+    public boolean isReflexes() {
+        return this == REFLEXES;
+    }
+
+    public boolean isDexterity() {
+        return this == DEXTERITY;
+    }
+
+    public boolean isATOWIntelligence() {
+        return this == INTELLIGENCE;
+    }
+
+    public boolean isWillpower() {
+        return this == WILLPOWER;
+    }
+
+    public boolean isCharisma() {
+        return this == CHARISMA;
+    }
+
+    public boolean isATOWAttribute() {
+        return isStrength() ||
+                     isBody() ||
+                     isReflexes() ||
+                     isDexterity() ||
+                     isATOWIntelligence() ||
+                     isWillpower() ||
+                     isCharisma();
+    }
+
+
     public boolean isPersonality() {
         return isAggression() || isAmbition() || isGreed() || isSocial() || isReasoning();
     }
@@ -845,6 +894,20 @@ public String getCellValue(final Campaign campaign, final PersonnelMarket person
                 Reasoning reasoning = person.getReasoning();
 
                 return String.valueOf(reasoning.ordinal());
+            case STRENGTH:
+                return String.valueOf(person.getAttributeScore(SkillAttribute.STRENGTH));
+            case BODY:
+                return String.valueOf(person.getAttributeScore(SkillAttribute.BODY));
+            case REFLEXES:
+                return String.valueOf(person.getAttributeScore(SkillAttribute.REFLEXES));
+            case DEXTERITY:
+                return String.valueOf(person.getAttributeScore(SkillAttribute.DEXTERITY));
+            case INTELLIGENCE:
+                return String.valueOf(person.getAttributeScore(SkillAttribute.INTELLIGENCE));
+            case WILLPOWER:
+                return String.valueOf(person.getAttributeScore(SkillAttribute.WILLPOWER));
+            case CHARISMA:
+                return String.valueOf(person.getAttributeScore(SkillAttribute.CHARISMA));
             default:
                 return "UNIMPLEMENTED";
         }
@@ -1026,6 +1089,19 @@ yield switch (this) {
                 case EDGE -> campaign.getCampaignOptions().isUseEdge();
                 default -> false;
             };
+            case ATTRIBUTES -> switch (this) {
+                case RANK,
+                     FIRST_NAME,
+                     LAST_NAME,
+                     STRENGTH,
+                     BODY,
+                     REFLEXES,
+                     DEXTERITY,
+                     INTELLIGENCE,
+                     WILLPOWER,
+                     CHARISMA -> true;
+                default -> false;
+            };
             case OTHER -> switch (this) {
                 case RANK, FIRST_NAME, LAST_NAME -> true;
                 case TOUGHNESS -> campaign.getCampaignOptions().isUseToughness();
@@ -1080,7 +1156,14 @@ public Comparator<?> getComparator(final Campaign campaign) {
                  SPA_COUNT,
                  IMPLANT_COUNT,
                  LOYALTY,
-                 REASONING -> new IntegerStringSorter();
+                 REASONING,
+                 STRENGTH,
+                 BODY,
+                 REFLEXES,
+                 DEXTERITY,
+                 INTELLIGENCE,
+                 WILLPOWER,
+                 CHARISMA -> new IntegerStringSorter();
             case SALARY -> new FormattedNumberSorter();
             default -> new NaturalOrderComparator();
         };

MekHQ/unittests/mekhq/gui/enums/PersonnelTableModelColumnTest.java

@@ -902,6 +902,13 @@ public void testGetComparator() {
                 case IMPLANT_COUNT:
                 case LOYALTY:
                 case REASONING:
+                case STRENGTH:
+                case BODY:
+                case REFLEXES:
+                case DEXTERITY:
+                case INTELLIGENCE:
+                case WILLPOWER:
+                case CHARISMA:
                     assertInstanceOf(IntegerStringSorter.class, personnelTableModelColumn.getComparator(mockCampaign));
                     break;
                 case SALARY: