Merge pull request #8535 from IllianiBird/successor

Improvement: Added Ability to Designate Second-in-Command

Author: HammerGS

MekHQ/resources/mekhq/resources/GUI.properties

@@ -116,6 +116,8 @@ edge.text=Edge
 bareHands.text=Bare Hands
 removedCommander.format=%s has been removed as the overall unit commander.
 setAsCommander.format=%s has been set as the overall unit commander.
+removedSecondInCommand.format={0} has been removed as the unit's second in command.
+setAsSecondInCommand.format={0} has been set as the unit's second in command.
 enterNewCallsign.text=Enter new callsign
 editCallsign.text=Edit Callsign
 changeSalary.text=Change Salary (-1 to remove custom salary)
@@ -313,6 +315,9 @@ miClanPersonnel.text=Clan Personnel
 miClanPersonnel.toolTipText=If this is selected, then the person is from Clan origins.
 miCommander.text=Commander
 miCommander.toolTipText=If this is selected, then the person is the unit's commander. The current commander, if any, will have the flag removed before this is assigned.
+miSecondInCommand.text=Second in Command
+miSecondInCommand.toolTipText=If this is selected, then the person is the unit's second in command. The current \
+  second in command, if any, will have the flag removed before this is assigned.
 miDivorceable.text=Divorceable
 miDivorceable.toolTipText=If this is selected, then the person will be included as a potential person for processing divorce \n(standard checks still apply, so unmarried personnel will not be included even if this flag is selected)
 miFounder.text=Founder

MekHQ/src/mekhq/campaign/Campaign.java

@@ -3989,30 +3989,66 @@ public int getPatientsFor(Person doctor) {
     private Person[] findTopCommanders() {
         Person flaggedCommander = getFlaggedCommander();
         Person commander = flaggedCommander;
-        Person secondInCommand = null;
+
+        Person flaggedSecondInCommand = getFlaggedSecondInCommand();
+        Person secondInCommand = flaggedSecondInCommand;
+
+        if (flaggedCommander != null && flaggedSecondInCommand != null) {
+            return new Person[] { commander, secondInCommand };
+        }
 
         for (Person person : getActivePersonnel(false, false)) {
-            // If we have a flagged commander, skip them
-            if (flaggedCommander != null) {
-                if (person.equals(flaggedCommander)) {
-                    continue;
-                }
-                // Second in command is best among non-flagged
-                if (secondInCommand == null || person.outRanksUsingSkillTiebreaker(this, secondInCommand)) {
-                    secondInCommand = person;
-                }
-            } else {
+            if (person == null) {
+                continue;
+            }
+
+            if (person.equals(flaggedCommander) || person.equals(flaggedSecondInCommand)) {
+                continue;
+            }
+
+            // Commander selection (if not locked)
+            if (flaggedCommander == null) {
                 if (commander == null) {
                     commander = person;
-                } else if (person.outRanksUsingSkillTiebreaker(this, commander)) {
-                    secondInCommand = commander;
+                    continue;
+                }
+
+                if (!person.equals(commander) && person.outRanksUsingSkillTiebreaker(this, commander)) {
+                    Person previousCommander = commander;
                     commander = person;
-                } else if (secondInCommand == null || person.outRanksUsingSkillTiebreaker(this, secondInCommand)) {
-                    if (!person.equals(commander)) {
-                        secondInCommand = person;
+
+                    // Previous commander becomes a candidate for second-in-command (if not locked)
+                    if (flaggedSecondInCommand == null && !previousCommander.equals(commander)) {
+                        if (secondInCommand == null) {
+                            secondInCommand = previousCommander;
+                        } else if (!previousCommander.equals(secondInCommand)
+                                         && previousCommander.outRanksUsingSkillTiebreaker(this, secondInCommand)) {
+                            secondInCommand = previousCommander;
+                        }
                     }
+                    continue;
                 }
             }
+
+            // Second-in-command selection (if not locked), excluding commander
+            if (flaggedSecondInCommand == null) {
+                if (person.equals(commander)) {
+                    continue;
+                }
+
+                if (secondInCommand == null) {
+                    secondInCommand = person;
+                    continue;
+                }
+
+                if (!person.equals(secondInCommand) && person.outRanksUsingSkillTiebreaker(this, secondInCommand)) {
+                    secondInCommand = person;
+                }
+            }
+        }
+
+        if (commander != null && commander.equals(secondInCommand)) {
+            secondInCommand = null;
         }
 
         return new Person[] { commander, secondInCommand };
@@ -5474,6 +5510,17 @@ public void setInitiativeMaxBonus(int bonus) {
         return getPersonnel().stream().filter(Person::isCommander).findFirst().orElse(null);
     }
 
+    /**
+     * Retrieves the flagged second-in-command from the personnel list. If no flagged second-in-command is found returns {@code null}.
+     *
+     * <p><b>Usage:</b> consider using {@link #getSecondInCommand()} instead.</p>
+     *
+     * @return the flagged second-in-command if present, otherwise {@code null}
+     */
+    public @Nullable Person getFlaggedSecondInCommand() {
+        return getPersonnel().stream().filter(Person::isSecondInCommand).findFirst().orElse(null);
+    }
+
     /**
      * Use {@link #getCommander()} instead
      */

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

@@ -65,6 +65,7 @@
 import static mekhq.campaign.personnel.skills.SkillType.*;
 import static mekhq.campaign.randomEvents.personalities.PersonalityController.generateReasoning;
 import static mekhq.campaign.randomEvents.personalities.PersonalityController.getTraitIndex;
+import static mekhq.utilities.MHQInternationalization.getFormattedText;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
 import static mekhq.utilities.ReportingUtilities.getNegativeColor;
@@ -396,6 +397,7 @@ public class Person {
     // region Flags
     private boolean clanPersonnel;
     private boolean commander;
+    private boolean secondInCommand;
     private boolean divorceable;
     private boolean founder; // +1 share if using shares system
     private boolean immortal;
@@ -636,6 +638,7 @@ public Person(final String preNominal, final String givenName, final String surn
         // region Flags
         setClanPersonnel(originFaction.isClan());
         setCommander(false);
+        setSecondInCommand(false);
         setDivorceable(true);
         setFounder(false);
         setImmortal(false);
@@ -1620,6 +1623,28 @@ public void changeStatus(final Campaign campaign, final LocalDate today, final P
             }
 
             setCommander(false);
+
+            // promote second in command
+            Person secondInCommand = campaign.getSecondInCommand();
+            if (secondInCommand != null) {
+                secondInCommand.setSecondInCommand(false);
+                secondInCommand.setCommander(true);
+
+                String secondInCommandHyperlink = secondInCommand.getHyperlinkedFullTitle();
+                campaign.addReport(PERSONNEL, getFormattedText("removedSecondInCommand.format",
+                      secondInCommandHyperlink));
+                campaign.addReport(PERSONNEL, String.format(resources.getString("setAsCommander.format"),
+                      secondInCommandHyperlink));
+
+                campaign.personUpdated(secondInCommand);
+            }
+        }
+
+        // release the second-in-command flag.
+        if (isSecondInCommand() && status.isDepartedUnit()) {
+            setSecondInCommand(false);
+            campaign.addReport(PERSONNEL, getFormattedText("removedSecondInCommand.format",
+                  getHyperlinkedFullTitle()));
         }
 
         // clean up the save entry
@@ -3003,6 +3028,14 @@ public void setCommander(final boolean commander) {
         this.commander = commander;
     }
 
+    public boolean isSecondInCommand() {
+        return secondInCommand;
+    }
+
+    public void setSecondInCommand(final boolean secondInCommand) {
+        this.secondInCommand = secondInCommand;
+    }
+
     public boolean isDivorceable() {
         return divorceable;
     }
@@ -3654,6 +3687,7 @@ public int writeToXMLHeadless(PrintWriter pw, int indent, Campaign campaign) {
             // region Flags
             MHQXMLUtility.writeSimpleXMLTag(pw, indent, "clanPersonnel", isClanPersonnel());
             MHQXMLUtility.writeSimpleXMLTag(pw, indent, "commander", commander);
+            MHQXMLUtility.writeSimpleXMLTag(pw, indent, "secondInCommand", secondInCommand);
             MHQXMLUtility.writeSimpleXMLTag(pw, indent, "divorceable", divorceable);
             MHQXMLUtility.writeSimpleXMLTag(pw, indent, "founder", founder);
             MHQXMLUtility.writeSimpleXMLTag(pw, indent, "immortal", immortal);
@@ -4264,6 +4298,8 @@ public static Person generateInstanceFromXML(Node wn, Campaign campaign, Version
                     person.setClanPersonnel(Boolean.parseBoolean(wn2.getTextContent().trim()));
                 } else if (nodeName.equalsIgnoreCase("commander")) {
                     person.setCommander(Boolean.parseBoolean(wn2.getTextContent().trim()));
+                } else if (nodeName.equalsIgnoreCase("secondInCommand")) {
+                    person.setSecondInCommand(Boolean.parseBoolean(wn2.getTextContent().trim()));
                 } else if (nodeName.equalsIgnoreCase("divorceable")) {
                     person.setDivorceable(Boolean.parseBoolean(wn2.getTextContent().trim()));
                 } else if (nodeName.equalsIgnoreCase("founder")) {

MekHQ/src/mekhq/campaign/universe/generators/companyGenerators/AbstractCompanyGenerator.java

@@ -396,6 +396,12 @@ private List<CompanyGenerationPersonTracker> generateCombatPersonnel(final Campa
         generateOfficers(sortedTrackers);
         generateStandardMekWarriors(campaign, sortedTrackers);
 
+        // Dynamically fetch the second-in-command
+        Person secondInCommand = campaign.getFlaggedSecondInCommand();
+        if (secondInCommand != null) {
+            secondInCommand.setSecondInCommand(true);
+        }
+
         return sortedTrackers;
     }
 

MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java

@@ -66,6 +66,8 @@
 import static mekhq.campaign.randomEvents.personalities.PersonalityController.writePersonalityDescription;
 import static mekhq.campaign.randomEvents.prisoners.PrisonerEventManager.checkForIntelBreachEvent;
 import static mekhq.campaign.randomEvents.prisoners.PrisonerEventManager.processAdHocExecution;
+import static mekhq.utilities.MHQInternationalization.getFormattedText;
+import static mekhq.utilities.MHQInternationalization.getText;
 import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
 import static mekhq.utilities.ReportingUtilities.getAmazingColor;
 import static mekhq.utilities.ReportingUtilities.getPositiveColor;
@@ -308,6 +310,7 @@ public class PersonnelTableMouseAdapter extends JPopupMenuAdapter {
     private final JTable personnelTable;
     private final PersonnelTableModel personnelModel;
 
+    @Deprecated(since = "0.50.11", forRemoval = true)
     private final transient ResourceBundle resources = ResourceBundle.getBundle("mekhq.resources.GUI",
           MekHQ.getMHQOptions().getLocale());
     // endregion Variable Declarations
@@ -3820,12 +3823,34 @@ protected Optional<JPopupMenu> createPopupMenu() {
                 });
                 if (miCommander.isSelected()) {
                     person.setCommander(true);
+                    person.setSecondInCommand(false);
                     getCampaign().addReport(PERSONNEL, String.format(resources.getString("setAsCommander.format"),
                           person.getHyperlinkedFullTitle()));
                     getCampaign().personUpdated(person);
                 }
             });
             menu.add(miCommander);
+
+            final JCheckBoxMenuItem miSecondInCommand = new JCheckBoxMenuItem(getText("miSecondInCommand.text"));
+            miSecondInCommand.setToolTipText(getText("miSecondInCommand.toolTipText"));
+            miSecondInCommand.setName("miSecondInCommand");
+            miSecondInCommand.setSelected(person.isSecondInCommand());
+            miSecondInCommand.addActionListener(evt -> {
+                getCampaign().getPersonnel().stream().filter(Person::isSecondInCommand).forEach(secondInCommand -> {
+                    secondInCommand.setSecondInCommand(false);
+                    getCampaign().addReport(PERSONNEL, getFormattedText("removedSecondInCommand.format",
+                          secondInCommand.getHyperlinkedFullTitle()));
+                    getCampaign().personUpdated(secondInCommand);
+                });
+                if (miSecondInCommand.isSelected()) {
+                    person.setSecondInCommand(true);
+                    person.setCommander(false);
+                    getCampaign().addReport(PERSONNEL, getFormattedText("setAsSecondInCommand.format",
+                          person.getHyperlinkedFullTitle()));
+                    getCampaign().personUpdated(person);
+                }
+            });
+            menu.add(miSecondInCommand);
         }
 
         cbMenuItem = new JCheckBoxMenuItem(resources.getString("miDivorceable.text"));