Added Character Flaws as a New Ability Category

IllianiBird · IllianiBird · commit b3b9ca7c4ac7 · 2025-04-02T23:27:49.000-05:00
- Introduced a new ability category, `Character Flaws`, for managing abilities with negative XP costs or effects.
- Updated `CampaignOptionsAbilityInfo` and relevant enums to handle the new category.
- Enhanced UI components to support the `Character Flaws` tab within the abilities sections.
- Adjusted ability categorization logic to properly classify flaws based on their negative cost.
- Refined `EditSpecialAbilityDialog` functionality and associated resources for seamless integration of the new category.
diff --git a/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
@@ -1970,23 +1970,29 @@ lblSkillPanelStrategy.text=Strategy
 lblSkillPanelTactics.text=Tactics
 ## Advancement Tab
 abilityContentTabs.title=Abilities
-combatAbilitiesTab.title=Combat Abilities
-combatAbilitiesTab.border="Abilities only matter if you know how to use them. A sharp blade is\
+0combatAbilitiesTab.title=Combat Abilities
+0combatAbilitiesTab.border="Abilities only matter if you know how to use them. A sharp blade is\
   \ useless in the hands of someone who doesn't know how to wield it."\
   <br><i>Captain Elena "Ironshadow" Kane\
   <br>Problem, Meet Solution</i>
-maneuveringAbilitiesTab.title=Maneuvering Abilities
-maneuveringAbilitiesTab.border="Talent without discipline is like a fusion engine without a 'Mek\
+1maneuveringAbilitiesTab.title=Maneuvering Abilities
+1maneuveringAbilitiesTab.border="Talent without discipline is like a fusion engine without a 'Mek\
   \ \u2014 powerful, but going nowhere."\
   <br><i>Colonel Liana "Shadow" Voss\
   <br>Axis Innovations</i>
-utilityAbilitiesTab.title=Utility Abilities
-utilityAbilitiesTab.border="Unique abilities? Yeah, I've got one: breaking everything I touch."\
+2utilityAbilitiesTab.title=Utility Abilities
+2utilityAbilitiesTab.border="Unique abilities? Yeah, I've got one: breaking everything I touch."\
   <br><i>Technician Cole "Scrapheap" Drayton\
   <br>The Bulwarks</i>
+3characterFlawsTab.title=Flaws
+3characterFlawsTab.border="They say replacing flesh with metal makes you stronger. I say it just makes you louder when you fall\
+  \ over."\
+  <br><i>Sergeant Tessa "Karen" Quinn\
+  <br>Bob's Bastards</i>
 lblCombatAbilitiesTab.text=Combat Ability Options \u2318
 lblManeuveringAbilitiesTab.text=Maneuvering Ability Options \u2318
 lblUtilityAbilitiesTab.text=Utility Ability Options \u2318
+lblCharacterFlawsTab.text=Character Flaw Options \u2318
 lblEdgeCostPanel.text=Edge Cost
 lblEdgeCost.text=Cost
 lblEdgeCost.tooltip=The cost per rank of Edge.
diff --git a/MekHQ/resources/mekhq/resources/GUI.properties b/MekHQ/resources/mekhq/resources/GUI.properties
@@ -123,7 +123,6 @@ award.text=Award
 removeAward.text=Remove Award
 spendXP.text=Spend XP
 spendOnSpecialAbilities.text=Special Abilities
-costNotPossible.text=(Not Possible)
 costValue.format=(%dXP)
 abilityDesc.format=%s %s
 envspec_fog.text=Fog
diff --git a/MekHQ/resources/mekhq/resources/PersonViewPanel.properties b/MekHQ/resources/mekhq/resources/PersonViewPanel.properties
@@ -1,5 +1,4 @@
 # General Properties
-
 # Buttons
 lblCall1.text=<html><nobr><b>Callsign:</b></nobr></html>;
 lblBackground1.text=<html><nobr><b>Background:</b></nobr></html>;
@@ -61,7 +60,7 @@ pnlLogHeader.title=Show Personal Log
 pnlLog.title=Hide Personal Log
 pnlKillsHeader.title=Show Kill Record
 pnlKills.title=Hide Kill Record
-lblPermanentInjury.text= permanent injury
+lblPermanentInjury.text=permanent injury
 btnMedical.tooltip=View medical details
 format.itemHeader=<html><b>%s:</b></html>
 format.kills=Kills: %d
diff --git a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
@@ -2214,13 +2214,8 @@ protected Optional<JPopupMenu> createPopupMenu() {
                     cost = (int) round(spa.getCost() * intelligenceXpCostMultiplier);
                     cost = (int) round(cost * xpCostMultiplier);
 
-                    String costDesc;
-                    if (cost < 0) {
-                        costDesc = resources.getString("costNotPossible.text");
-                    } else {
-                        costDesc = String.format(resources.getString("costValue.format"), cost);
-                    }
-                    boolean available = (cost >= 0) && (person.getXP() >= cost);
+                    String costDesc = String.format(resources.getString("costValue.format"), cost);
+                    boolean available = person.getXP() >= cost;
                     if (spa.getName().equals(OptionsConstants.GUNNERY_WEAPON_SPECIALIST)) {
                         Unit u = person.getUnit();
                         if (null != u) {
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/CampaignOptionsAbilityInfo.java b/MekHQ/src/mekhq/gui/campaignOptions/CampaignOptionsAbilityInfo.java
@@ -30,9 +30,8 @@
 import mekhq.campaign.personnel.SpecialAbility;
 
 /**
- * The {@code AbilityInfo} class represents information about a specific ability,
- * encapsulating its name, the associated {@link SpecialAbility}, its active status,
- * and its category.
+ * The {@code AbilityInfo} class represents information about a specific ability, encapsulating its name, the associated
+ * {@link SpecialAbility}, its active status, and its category.
  */
 public class CampaignOptionsAbilityInfo {
     private String name;
@@ -41,16 +40,15 @@ public class CampaignOptionsAbilityInfo {
     private AbilityCategory category;
 
     /**
-     * Enum {@code AbilityCategory} represents the categories abilities can belong to.
-     * Categories available:
+     * Enum {@code AbilityCategory} represents the categories abilities can belong to. Categories available:
      * <ul>
      *     <li>{@code COMBAT_ABILITIES}: Abilities related to combat actions</li>
      *     <li>{@code MANEUVERING_ABILITIES}: Abilities related to movement and maneuvering</li>
      *     <li>{@code UTILITY_ABILITIES}: Abilities providing utility or non-combat benefits</li>
      * </ul>
      */
     public enum AbilityCategory {
-        COMBAT_ABILITY, MANEUVERING_ABILITY, UTILITY_ABILITY
+        COMBAT_ABILITY, MANEUVERING_ABILITY, UTILITY_ABILITY, CHARACTER_FLAW
     }
 
     /**
@@ -61,7 +59,8 @@ public enum AbilityCategory {
      * @param isEnabled {@code true} if the ability is enabled, otherwise {@code false}
      * @param category  the category of the ability, represented as an {@link AbilityCategory}
      */
-    public CampaignOptionsAbilityInfo(String name, SpecialAbility ability, boolean isEnabled, AbilityCategory category) {
+    public CampaignOptionsAbilityInfo(String name, SpecialAbility ability, boolean isEnabled,
+                                      AbilityCategory category) {
         this.name = name;
         this.ability = ability;
         this.isEnabled = isEnabled;
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/CampaignOptionsPane.java b/MekHQ/src/mekhq/gui/campaignOptions/CampaignOptionsPane.java
@@ -29,6 +29,10 @@
 
 import static java.lang.Math.round;
 import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
+import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.CHARACTER_FLAW;
+import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.COMBAT_ABILITY;
+import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.MANEUVERING_ABILITY;
+import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.UTILITY_ABILITY;
 import static mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode.ABRIDGED;
 import static mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode.STARTUP_ABRIDGED;
 import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.createSubTabs;
@@ -51,7 +55,6 @@
 import mekhq.campaign.personnel.SkillType;
 import mekhq.campaign.universe.Faction;
 import mekhq.gui.baseComponents.AbstractMHQTabbedPane;
-import mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory;
 import mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode;
 import mekhq.gui.campaignOptions.contents.*;
 
@@ -308,12 +311,14 @@ private JTabbedPane createAdvancementParentTab() {
         // SPAs
         abilitiesTab = new AbilitiesTab();
 
-        JTabbedPane abilityContentTabs = createSubTabs(Map.of("combatAbilitiesTab",
-              abilitiesTab.createAbilitiesTab(AbilityCategory.COMBAT_ABILITY),
-              "maneuveringAbilitiesTab",
-              abilitiesTab.createAbilitiesTab(AbilityCategory.MANEUVERING_ABILITY),
-              "utilityAbilitiesTab",
-              abilitiesTab.createAbilitiesTab(AbilityCategory.UTILITY_ABILITY)));
+        JTabbedPane abilityContentTabs = createSubTabs(Map.of("0combatAbilitiesTab",
+              abilitiesTab.createAbilitiesTab(COMBAT_ABILITY),
+              "1maneuveringAbilitiesTab",
+              abilitiesTab.createAbilitiesTab(MANEUVERING_ABILITY),
+              "2utilityAbilitiesTab",
+              abilitiesTab.createAbilitiesTab(UTILITY_ABILITY),
+              "3characterFlawsTab",
+              abilitiesTab.createAbilitiesTab(CHARACTER_FLAW)));
         // the loading of values from the campaign is built into the AbilitiesTab class so not called here.
 
         // Add Tabs
@@ -445,7 +450,8 @@ private JTabbedPane createStrategicOperationsParentTab() {
      * @param isStartUp    specifies whether this is run as part of a startup initialization
      * @param isSaveAction determines if this action is saving options to a preset
      */
-    public void applyCampaignOptionsToCampaign(@Nullable CampaignPreset preset, boolean isStartUp, boolean isSaveAction) {
+    public void applyCampaignOptionsToCampaign(@Nullable CampaignPreset preset, boolean isStartUp,
+                                               boolean isSaveAction) {
         CampaignOptions options = this.campaignOptions;
         RandomSkillPreferences presetRandomSkillPreferences = null;
         Map<String, SkillType> presetSkills = null;
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/contents/AbilitiesTab.java b/MekHQ/src/mekhq/gui/campaignOptions/contents/AbilitiesTab.java
diff --git a/MekHQ/src/mekhq/gui/dialog/EditSpecialAbilityDialog.java b/MekHQ/src/mekhq/gui/dialog/EditSpecialAbilityDialog.java
