Merge pull request #7265 from IllianiBird/factionsExcludeCommands

Fix: Adjusted Active Faction Getter to Optionally Exclude 'Command' Factions

Author: IllianiBird

MekHQ/src/mekhq/campaign/universe/Faction.java

@@ -403,6 +403,10 @@ public boolean isInactive() {
         return is(FactionTag.INACTIVE);
     }
 
+    public boolean isActive() {
+        return !isInactive();
+    }
+
     public boolean isChaos() {
         return is(FactionTag.CHAOS);
     }

MekHQ/src/mekhq/campaign/universe/Factions.java

@@ -106,14 +106,38 @@ public Collection<Faction> getFactions() {
     }
 
     /**
-     * Returns a list of all factions active in a specific year.
-     * @param date
-     * @return
+     * Returns a collection of all active factions on the specified date, excluding Command factions.
+     *
+     * <p>A faction is considered active if it is valid for the given date and not marked as inactive. Command
+     * factions (those whose short name contains a dot, {@code .}) are not included in the results.</p>
+     *
+     * @param date the date for which to check faction activity
+     * @return a collection of active factions (excluding Commands) for the specified date
      */
     public Collection<Faction> getActiveFactions(LocalDate date) {
-        return getFactions().stream().filter(f ->
-            f.validIn(date) && !f.isInactive())
-            .collect(Collectors.toList());
+        return getActiveFactions(date, false);
+    }
+
+    /**
+     * Returns a collection of all active factions on the specified date.
+     *
+     * <p>A faction is considered active if it is valid for the given date and not marked as inactive.</p>
+     *
+     * <p>If {@code includeCommands} is {@code false}, factions whose short name contains a dot ({@code .}) are
+     * excluded, as these denote Commands rather than standard factions. If {@code includeCommands} is {@code true},
+     * these Command factions are included in the results.</p>
+     *
+     * @param date            the date for which to check faction activity
+     * @param includeCommands whether to include Command factions (those whose short name contains a dot)
+     *
+     * @return a collection of active factions for the specified date, optionally including Commands
+     */
+    public Collection<Faction> getActiveFactions(LocalDate date, boolean includeCommands) {
+        return getFactions().stream()
+                     .filter(f -> f.validIn(date))
+                     .filter(Faction::isActive)
+                     .filter(f -> (includeCommands || !f.getShortName().contains(".")))
+                     .toList();
     }
 
     public Collection<String> getFactionList() {