Merge pull request #7344 from IllianiBird/atowCitizenshipSPA

Improvement: Added Citizenship/Trueborn SPA

Author: HammerGS

MekHQ/data/universe/defaultspa.xml

@@ -553,6 +553,18 @@ They can make one additional procurement attempt per day.]]></desc>
 This SPA reduces the penalty from low Reputation by 2 and reduces the chance of an assassination attempt occurring by half.
 
 While this SPA does exist in ATOW (and that's where you'll find its description), these effects are unique to MekHQ.]]></desc>
+        <xpCost>200</xpCost>
+        <weight>1</weight>
+        <skillPrereq />
+    </ability>
+    <ability>
+    <lookupName>atow_citizenship</lookupName>
+    <displayName>Citizenship/Trueborn (ATOW)</displayName>
+    <desc><![CDATA[Unlocks additional options during character creation.
+
+Increases Connections by 1.
+
+While this SPA does exist in ATOW, the Connections modifier is unique to MekHQ. We use that to abstract the kinds of bonuses this SPA would incur in a tabletop game.]]></desc>
         <xpCost>200</xpCost>
         <weight>1</weight>
         <skillPrereq/>

MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java

@@ -361,7 +361,7 @@ private void checkForSubcontracts(Campaign campaign, AtBContract contract, int u
             int connections = 0;
             Person commander = campaign.getCommander();
             if (commander != null) {
-                connections = commander.getConnections();
+                connections = commander.getAdjustedConnections();
             }
             int roll = d6(2) + connections;
             if (roll < 6) {

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

@@ -5475,6 +5475,26 @@ public int getConnections() {
         return connections;
     }
 
+    /**
+     * Calculates and returns the character's adjusted Connections value.
+     *
+     * <p>If the character has the {@link PersonnelOptions#ATOW_CITIZENSHIP} SPA their Connections value is
+     * increased by 1.</p>
+     *
+     * <p>The connections value is clamped within the allowed minimum and maximum range before being returned.</p>
+     *
+     * @return the character's Connections value, clamped within the minimum and maximum limits
+     *
+     * @author Illiani
+     * @since 0.50.07
+     */
+    public int getAdjustedConnections() {
+        boolean hasCitizenship = options.booleanOption(ATOW_CITIZENSHIP);
+
+        int modifiers = (hasCitizenship ? 1 : 0);
+        return clamp(connections + modifiers, MINIMUM_CONNECTIONS, MAXIMUM_CONNECTIONS);
+    }
+
     public void setConnections(final int connections) {
         this.connections = clamp(connections, MINIMUM_CONNECTIONS, MAXIMUM_CONNECTIONS);
     }

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

@@ -67,6 +67,7 @@ public class PersonnelOptions extends PilotOptions {
     public static final String FLAW_SLOW_LEARNER = "flaw_slow_learner";
     public static final String ATOW_FAST_LEARNER = "atow_fast_learner";
     public static final String ATOW_ALTERNATE_ID = "atow_alternate_id";
+    public static final String ATOW_CITIZENSHIP = "atow_citizenship";
     public static final String FLAW_ANIMAL_ANTIPATHY = "flaw_animal_antipathy";
     public static final String ATOW_ANIMAL_EMPATHY = "atow_animal_empathy";
     public static final String ATOW_AMBIDEXTROUS = "atow_ambidextrous";
@@ -186,6 +187,7 @@ public void initialize() {
         addOption(l3a, FLAW_SLOW_LEARNER, false);
         addOption(l3a, ATOW_FAST_LEARNER, false);
         addOption(l3a, ATOW_ALTERNATE_ID, false);
+        addOption(l3a, ATOW_CITIZENSHIP, false);
         addOption(l3a, FLAW_ANIMAL_ANTIPATHY, false);
         addOption(l3a, ATOW_ANIMAL_EMPATHY, false);
         addOption(l3a, ATOW_AMBIDEXTROUS, false);

MekHQ/src/mekhq/campaign/rating/CamOpsReputation/CommandRating.java

@@ -136,7 +136,7 @@ private static int getATOWTraitValues(Person commander, boolean isUseAgingEffect
         PersonnelOptions options = commander.getOptions();
 
         // Connections
-        traitScore += commander.getConnections();
+        traitScore += commander.getAdjustedConnections();
 
         // Wealth
         traitScore += commander.getWealth() >= 7 ? 1 : 0;

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

@@ -934,7 +934,7 @@ public String getCellValue(final Campaign campaign, final PersonnelMarket person
             case TOUGHNESS:
                 return Integer.toString(person.getToughness());
             case CONNECTIONS:
-                return Integer.toString(person.getConnections());
+                return Integer.toString(person.getAdjustedConnections());
             case WEALTH:
                 return Integer.toString(person.getWealth());
             case REPUTATION:

MekHQ/src/mekhq/gui/view/PersonViewPanel.java

@@ -2074,7 +2074,7 @@ private JPanel fillOther() {
         pnlOther.setBorder(RoundedLineBorder.createRoundedLineBorder(resourceMap.getString("pnlSkills.traits")));
 
         JLabel lblConnections = null;
-        int connections = person.getConnections();
+        int connections = person.getAdjustedConnections();
         if (connections != 0) {
             String connectionsLabel = String.format(resourceMap.getString("format.traitValue"),
                   resourceMap.getString("lblConnections.text"),