Merge pull request #7277 from IllianiBird/outlawSystemAccess

Sleet01 · web-flow · commit 66390e11e92f · 2025-06-26T12:05:59.000-07:00
Improvement: Optimized Outlaw System Access
diff --git a/MekHQ/resources/mekhq/resources/ContractMarketDialog.properties b/MekHQ/resources/mekhq/resources/ContractMarketDialog.properties
@@ -24,7 +24,7 @@ lblEmployer.text=Employer:
 lblEnemy.text=Enemy:
 lblMissionType.text=Mission Type:
 lblLocation.text=Location:
-lblDistance.text= Days (Jumps) to Location:
+lblDistance.text=Estimated Days (Jumps) to Location:
 lblAllyRating.text=Ally Experience & Equipment:
 lblEnemyRating.text=Enemy Experience & Equipment:
 lblStartDate.text=Start Date:
diff --git a/MekHQ/resources/mekhq/resources/ContractViewPanel.properties b/MekHQ/resources/mekhq/resources/ContractViewPanel.properties
@@ -18,7 +18,7 @@ lblAllyRating.text=<html><nobr><b>Ally Experience & Equipment:</b></nobr></html>
 lblEnemyRating.text=<html><nobr><b>Enemy Experience & Equipment:</b></nobr></html>
 lblMorale.text=<html><nobr><b>Enemy Morale:</b></nobr></html>
 lblScore.text=<html><nobr><b>Contract Score:</b></nobr></html>
-lblDistance.text=<html><nobr><b>Days (Jumps) to Location:</b></nobr></html>
+lblDistance.text=<html><nobr><b>Estimated Days (Jumps) to Location:</b></nobr></html>
 lblOverhead.text=<html><nobr><b>Overhead Compensation:</b></nobr></html>
 lblSupport.text=<html><nobr><b>StraightSupport:</b></nobr></html>
 lblSharePct.text=<html><nobr><b>Shares:</b></nobr></html>
diff --git a/MekHQ/resources/mekhq/resources/NewContractDialog.properties b/MekHQ/resources/mekhq/resources/NewContractDialog.properties
@@ -39,7 +39,7 @@ lblAllyRating.text=Ally Experience & Equipment:
 lblEnemyRating.text=Enemy Experience & Equipment:
 chkShowAllFactions.text=Show All Factions
 chkShowAllPlanets.text=Show All Planets
-lblDistance.text=Days (Jumps) to Location:
+lblDistance.text=Estimated Days (Jumps) to Location:
 lblAllyBotName.text=Ally Bot Name:
 lblEnemyBotName.text=Enemy Bot Name:
 lblAllyCamo.text=Ally Camo
diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -6993,6 +6993,23 @@ public Accountant getAccountant() {
         return new Accountant(this);
     }
 
+    /**
+     * Calculates and returns a {@code JumpPath} between two planetary systems, using default parameters for jump range
+     * and travel safety.
+     *
+     * <p>This method provides a convenient way to compute the most likely or optimal jump path from the specified
+     * starting system to the destination system. Internal behavior and constraints are determined by the method's
+     * default parameter settings.</p>
+     *
+     * @param start the starting {@link PlanetarySystem}
+     * @param end   the destination {@link PlanetarySystem}
+     *
+     * @return the calculated {@link JumpPath} between the two systems
+     */
+    public JumpPath calculateJumpPath(PlanetarySystem start, PlanetarySystem end) {
+        return calculateJumpPath(start, end, true, true);
+    }
+
     /**
      * Calculates the optimal jump path between two planetary systems using the A* algorithm.
      *
@@ -7008,12 +7025,18 @@ public Accountant getAccountant() {
      *
      * @param start The starting planetary system
      * @param end   The destination planetary system
+     * @param skipAccessCheck   {@code true} to skip checking for Outlaw status in system, {@code false} otherwise.
+     *                                      Should be {@code false} when determining contract-related jump paths as
+     *                                      system access is guaranteed for contract target systems.
+     * @param skipEmptySystemCheck   {@code true} to skip checking for empty system status, {@code false} otherwise.
+     *                                      Should be {@code false} when determining contract-related jump paths.
      *
      * @return A {@link JumpPath} containing the sequence of systems to traverse, or {@code null} if no valid path
      *       exists between the systems. If start and end are the same system, returns a path containing only that
      *       system.
      */
-    public JumpPath calculateJumpPath(PlanetarySystem start, PlanetarySystem end) {
+    public JumpPath calculateJumpPath(PlanetarySystem start, PlanetarySystem end, boolean skipAccessCheck,
+          boolean skipEmptySystemCheck) {
         // Handle edge cases
         if (null == start) {
             return new JumpPath();
@@ -7026,7 +7049,9 @@ public JumpPath calculateJumpPath(PlanetarySystem start, PlanetarySystem end) {
         }
 
         // Shortcuts to ensure we're not processing a lot of data when we're unable to reach the target system
-        if (isAvoidingEmptySystems && end.getPopulation(currentDay) == 0) {
+        if (!skipEmptySystemCheck
+                  && isAvoidingEmptySystems
+                  && end.getPopulation(currentDay) == 0) {
             new ImmersiveDialogSimple(this, getSeniorAdminPerson(AdministratorSpecialization.TRANSPORT), null,
                   String.format(resources.getString("unableToEnterSystem.abandoned.ic"), getCommanderAddress(false)),
                   null, resources.getString("unableToEnterSystem.abandoned.ooc"), null, false);
@@ -7036,9 +7061,11 @@ public JumpPath calculateJumpPath(PlanetarySystem start, PlanetarySystem end) {
 
         List<AtBContract> activeAtBContracts = getActiveAtBContracts();
 
-        if (campaignOptions.isUseFactionStandingOutlawed()) {
+        if (!skipAccessCheck
+                  && campaignOptions.isUseFactionStandingOutlawedSafe()) {
+            FactionHints factionHints = FactionHints.defaultFactionHints();
             boolean canAccessSystem = FactionStandingUtilities.canEnterTargetSystem(faction, factionStandings,
-                  getCurrentSystem(), end, currentDay, activeAtBContracts);
+                  getCurrentSystem(), end, currentDay, activeAtBContracts, factionHints);
             if (!canAccessSystem) {
                 new ImmersiveDialogSimple(this, getSeniorAdminPerson(AdministratorSpecialization.TRANSPORT), null,
                       String.format(resources.getString("unableToEnterSystem.outlawed.ic"), getCommanderAddress(false)),
@@ -7072,6 +7099,8 @@ public JumpPath calculateJumpPath(PlanetarySystem start, PlanetarySystem end) {
         scoreG.put(current, 0.0);
         closed.add(current);
 
+        FactionHints factionHints = FactionHints.defaultFactionHints();
+
         // A* search
         final int MAX_JUMPS = 10000;
         for (int jumps = 0; jumps < MAX_JUMPS; jumps++) {
@@ -7095,9 +7124,10 @@ public JumpPath calculateJumpPath(PlanetarySystem start, PlanetarySystem end) {
                 }
 
                 // Skip systems where the campaign is outlawed
-                if (campaignOptions.isUseFactionStandingOutlawed()) {
+                if (!skipAccessCheck
+                          && campaignOptions.isUseFactionStandingOutlawed()) {
                     boolean canAccessSystem = FactionStandingUtilities.canEnterTargetSystem(faction, factionStandings,
-                          getCurrentSystem(), neighborSystem, currentDay, activeAtBContracts);
+                          getCurrentSystem(), neighborSystem, currentDay, activeAtBContracts, factionHints);
                     if (!canAccessSystem) {
                         return;
                     }
diff --git a/MekHQ/src/mekhq/campaign/universe/factionStanding/FactionStandingUtilities.java b/MekHQ/src/mekhq/campaign/universe/factionStanding/FactionStandingUtilities.java
@@ -32,10 +32,9 @@
  */
 package mekhq.campaign.universe.factionStanding;
 
-import java.util.List;
-
 import java.time.LocalDate;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import megamek.common.annotations.Nullable;
@@ -363,7 +362,6 @@ public static boolean isUseCommandCircuit(boolean overridingCommandCircuitRequir
      *   currentSystem} is {@code null}).</li>
      *   <li>If the player is outlawed in the target system, entry is denied.</li>
      *   <li>If the campaign faction is at war with all system factions, entry is denied.</li>
-     *   <li>If all system factions are at war with any employer faction, entry is denied.</li>
      *   <li>If none of the above conditions block entry, it is permitted.</li>
      * </ol>
      *
@@ -373,6 +371,7 @@ public static boolean isUseCommandCircuit(boolean overridingCommandCircuitRequir
      * @param targetSystem       the planetary system to test entry for
      * @param when               the date of attempted entry (population/ownership may change over time)
      * @param activeAtBContracts list of currently active contracts
+     * @param factionHints       the details of the current factional relations
      *
      * @return {@code true} if entry to the target system is allowed; {@code false} otherwise
      *
@@ -381,7 +380,7 @@ public static boolean isUseCommandCircuit(boolean overridingCommandCircuitRequir
      */
     public static boolean canEnterTargetSystem(Faction campaignFaction, FactionStandings factionStandings,
           @Nullable PlanetarySystem currentSystem, PlanetarySystem targetSystem, LocalDate when,
-          List<AtBContract> activeAtBContracts) {
+          List<AtBContract> activeAtBContracts, FactionHints factionHints) {
         // Always allowed in empty systems
         if (targetSystem.getPopulation(when) == 0) {
             LOGGER.debug("Target system is empty, access granted");
@@ -420,7 +419,6 @@ public static boolean canEnterTargetSystem(Faction campaignFaction, FactionStand
         }
 
         // Disallow if the campaign faction is at war with all system factions
-        FactionHints factionHints = FactionHints.defaultFactionHints();
         boolean allAtWarWithCampaign = systemFactions
                                              .stream()
                                              .allMatch(systemFaction -> factionHints.isAtWarWith(campaignFaction,
@@ -431,19 +429,6 @@ public static boolean canEnterTargetSystem(Faction campaignFaction, FactionStand
             return false;
         }
 
-        // Disallow if all system factions are at war with any one employer
-        for (Faction employer : contractEmployers) {
-            boolean allAtWarWithEmployer = systemFactions
-                                                 .stream()
-                                                 .allMatch(systemFaction -> factionHints.getCurrentWar(employer,
-                                                       systemFaction,
-                                                       when) != null);
-            if (allAtWarWithEmployer) {
-                LOGGER.debug("All system factions are at war with employer {}, access denied", employer.getShortName());
-                return false;
-            }
-        }
-
         LOGGER.debug("Access granted");
         return true;
     }
diff --git a/MekHQ/src/mekhq/gui/InterstellarMapPanel.java b/MekHQ/src/mekhq/gui/InterstellarMapPanel.java
@@ -73,6 +73,7 @@
 import mekhq.campaign.JumpPath;
 import mekhq.campaign.mission.AtBContract;
 import mekhq.campaign.universe.Faction;
+import mekhq.campaign.universe.FactionHints;
 import mekhq.campaign.universe.Factions;
 import mekhq.campaign.universe.PlanetarySystem;
 import mekhq.campaign.universe.SocioIndustrialData;
@@ -369,7 +370,7 @@ public void mouseClicked(MouseEvent e) {
                         if (e.isAltDown()) {
                             // calculate a new jump path from the current location
                             jumpPath = InterstellarMapPanel.this.campaign.calculateJumpPath(InterstellarMapPanel.this.campaign.getCurrentSystem(),
-                                  target);
+                                  target, false, false);
                             selectedSystem = target;
                             repaint();
                             notifyListeners();
@@ -380,7 +381,8 @@ public void mouseClicked(MouseEvent e) {
                             if (null == lastSystem) {
                                 lastSystem = InterstellarMapPanel.this.campaign.getCurrentSystem();
                             }
-                            JumpPath addPath = InterstellarMapPanel.this.campaign.calculateJumpPath(lastSystem, target);
+                            JumpPath addPath = InterstellarMapPanel.this.campaign.calculateJumpPath(lastSystem,
+                                  target, false, false);
                             if (!jumpPath.isEmpty()) {
                                 addPath.removeFirstSystem();
                             }
@@ -734,6 +736,8 @@ protected void paintComponent(Graphics g) {
                 LocalDate today = campaign.getLocalDate();
                 List<AtBContract> activeAtBContracts = campaign.getActiveAtBContracts();
 
+                FactionHints factionHints = FactionHints.defaultFactionHints();
+
                 for (PlanetarySystem system : systems) {
                     if (isSystemVisible(system, false)) {
                         double x = map2scrX(system.getX());
@@ -822,7 +826,7 @@ protected void paintComponent(Graphics g) {
                         // Outlaw status image
                         if (isUseFactionStandingOutlawing) {
                             boolean isOutlawedInSystem = !FactionStandingUtilities.canEnterTargetSystem(campaignFaction,
-                                  factionStandings, null, system, today, activeAtBContracts);
+                                  factionStandings, null, system, today, activeAtBContracts, factionHints);
                             if (isOutlawedInSystem) {
                                 int half = (int) (size * 0.8);
                                 g2.setPaint(Color.BLACK);
diff --git a/MekHQ/src/mekhq/gui/MapTab.java b/MekHQ/src/mekhq/gui/MapTab.java
@@ -255,7 +255,7 @@ public void refreshAll() {
     private void calculateJumpPath() {
         if (null != panMap.getSelectedSystem()) {
             panMap.setJumpPath(getCampaign().calculateJumpPath(getCampaign().getCurrentSystem(),
-                  panMap.getSelectedSystem()));
+                  panMap.getSelectedSystem(), false, false));
             refreshPlanetView();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ public void refreshAll() {`
`255`	`255`	`private void calculateJumpPath() {`
`256`	`256`	`if (null != panMap.getSelectedSystem()) {`
`257`	`257`	`panMap.setJumpPath(getCampaign().calculateJumpPath(getCampaign().getCurrentSystem(),`
`258`		`- panMap.getSelectedSystem()));`
	`258`	`+ panMap.getSelectedSystem(), false, false));`
`259`	`259`	`refreshPlanetView();`
`260`	`260`	`}`
`261`	`261`	`}`