If a bounty has no spawn locations, try again without Tags.THEME_HIDDEN.

Author: wispborne

CHANGELOGS.md

@@ -1,6 +1,8 @@
 Version 1.5.2
 **MagicBounty**
 - Added `fleet_attitude` to MagicBounty, allowing you to make a fleet neutral or hostile.
+- If a bounty has no spawn locations, try again without Tags.THEME_HIDDEN.
+  - For bounties that *only* spawn in hidden systems.
 **MagicPaintjobs**
   - Added template files for MagicPaintjobs 2.0.
   - Fixed ships not showing up in new paintjob selector if they have a D-mod.

jars/MagicLib.jar

@@ -8,6 +8,6 @@
     {
       "major": "1",
       "minor": "5",
-      "patch": "2"
+      "patch": "2-dev01"
     }
 }

magiclib.version

@@ -41,6 +41,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.fs.starfarer.api.util.Misc.MAX_OFFICER_LEVEL;
 
@@ -720,10 +721,8 @@ public static MarketAPI addSimpleMarket(
      * @param factionId                person's faction
      * @param rankId                   rank from campaign.ids.Ranks
      * @param postId                   post from campaign.ids.Ranks
-     * @param isMarketAdmin
+     * @param isMarketAdmin            if the person is the market admin
      * @param industrialPlanning_level skill level for market admin
-     * @param spaceOperation_level     skill level for market admin
-     * @param groundOperations_level   skill level for market admin
      * @param commScreenPosition       position order in the comm screen, 0 is the admin position
      * @return
      */
@@ -1433,7 +1432,7 @@ public static SectorEntityToken findSuitableTarget(
             desiredEntities = entities;
         }
 
-        //lets check the system lists in order by prefered distances
+        // lets check the system lists in order by prefered distances
         for (int i = 0; i < 3; i++) {
             //check if the system list has anything, and shuffle it to ensure proper randomization
             if (distance_priority.get(i).isEmpty()) {
@@ -1442,8 +1441,8 @@ public static SectorEntityToken findSuitableTarget(
                 Collections.shuffle(distance_priority.get(i));
             }
 
-            //now check if any valid system got the required entity in this range band
-            //starting with unexplored systems if required
+            // now check if any valid system got the required entity in this range band
+            // starting with unexplored systems if required
             if (prioritizeUnexplored) {
                 for (StarSystemAPI s : distance_priority.get(i)) {
                     //skip visited systems
@@ -1562,11 +1561,24 @@ public static SectorEntityToken findSuitableTarget(
         if (verbose) {
             log.warn("No valid system found");
         }
-        return null;
-    }
 
-    ////////////////////////////////////////////////////////////////////////////
-    //DUMPSTER
-    ////////////////////////////////////////////////////////////////////////////
+        // If no valid systems were found, retry without the hardcoded Tags.THEME_HIDDEN restriction
+        // so that bounties that are intended to be in hidden systems will spawn.
+        if (avoid_themes != null && avoid_themes.contains(Tags.THEME_HIDDEN)) {
+            log.info("findSuitableTarget did not find a valid system, retrying without " + Tags.THEME_HIDDEN);
+            return findSuitableTarget(
+                    entityIDs,
+                    marketFactions,
+                    distance,
+                    seek_themes,
+                    avoid_themes.stream().filter(t -> !t.equals(Tags.THEME_HIDDEN)).collect(Collectors.toList()),
+                    entities,
+                    defaultToAnyEntity,
+                    prioritizeUnexplored,
+                    verbose
+            );
+        }
 
+        return null;
+    }
 }