adjustments to RegionManager

Author: HumabHatterZed

CHANGELOG.md

@@ -1,5 +1,7 @@
 # 2.23.3
 - Fixed custom deck exhaust sequence not performing the requisite checks
+- Added 'CanAppearRandomly' bool and associated extension method for custom regions
+- All custom regions added through the API are now included in AllRegionsCopy and NewRegions (if addToPool was false then it won't be encounterable in-game like normal)
 
 # 2.23.2
 - Fixed error when trying to create cards that evolve/transform in 4 or more turns

InscryptionAPI/Regions/Part1RegionData.cs

@@ -17,6 +17,7 @@ public class Part1RegionData
     public bool DoNotForceReachTerrain { get; set; }
     public bool AllowLockedTerrainCards { get; set; }
     public bool AllowSacrificableTerrainCards { get; set; }
+    public bool CanAppearRandomly { get; set; }
 
     private int tier;
     private RegionData region;
@@ -34,6 +35,7 @@ public Part1RegionData(RegionData region, int tier)
         AllowTerrainOnPlayerSide = true;
         RemoveDefaultReachTerrain = false;
         DoNotForceReachTerrain = false;
+        CanAppearRandomly = true;
         this.region = region;
         this.tier = tier;
     }

InscryptionAPI/Regions/RegionExtensions.cs

@@ -1,3 +1,4 @@
+using APIPlugin;
 using DiskCardGame;
 using InscryptionAPI.Card;
 using InscryptionAPI.Encounters;
@@ -8,6 +9,23 @@ namespace InscryptionAPI.Regions;
 
 public static class RegionExtensions
 {
+    /// <summary>
+    /// If the created region will be added to the pool of regions that can appear in a run.
+    /// </summary>
+    /// <param name="data">The RegionData for the region we are modifying.</param>
+    /// <param name="canAppear">If the created region will be added to the pool of regions that can appear in a run.</param>
+    /// <returns>The same RegionData so a chain can continue.</returns>
+    public static RegionData SetCanAppearRandomly(this RegionData data, bool canAppear) {
+        Part1RegionData region = RegionManager.NewRegions.FirstOrDefault(x => x.Region == data);
+        if (region != null) {
+            region.CanAppearRandomly = canAppear;
+        }
+        else {
+            InscryptionAPIPlugin.Logger.LogWarning($"Could not find custom region for RegionData [{data.name}]!");
+        }
+        return data;
+    }
+
     public static RegionData RegionByName(this IEnumerable<RegionData> regions, string name) => regions.FirstOrDefault(x => x.name == name);
 
     public static RegionData SetName(this RegionData region, string name)
@@ -199,6 +217,11 @@ public static RegionData SetFogAlpha(this RegionData region, float alpha)
         return region;
     }
 
+    public static RegionData SetMapEmission(this RegionData region, Texture texture) {
+        region.mapEmission = texture;
+        return region;
+    }
+
     public static RegionData SetMapEmission(this RegionData region, Texture2D texture)
     {
         region.mapEmission = texture;

InscryptionAPI/Regions/RegionManager.cs

@@ -36,6 +36,12 @@ private static List<RegionData> ReorderBaseRegions()
 
         return orderedRegions;
     }
+
+    private static List<Part1RegionData> GenerateBasePart1RegionData() {
+        List<RegionData> data = ReorderBaseRegions();
+        return data.Select(x => new Part1RegionData(x, 0)).ToList();
+    }
+
     public static readonly ObservableCollection<Part1RegionData> NewRegions = new();
 
     public static event Func<List<RegionData>, List<RegionData>> ModifyRegionsList;
@@ -109,8 +115,11 @@ public static RegionData New(string name, int tier, bool addToPool = true)
         RegionData retval = ScriptableObject.CreateInstance<RegionData>();
         retval.name = name;
 
-        if (addToPool)
-            Add(retval, tier);
+        Add(retval, tier);
+        if (!addToPool) {
+            retval.SetCanAppearRandomly(false);
+        }
+            
 
         return retval;
     }
@@ -355,38 +364,23 @@ private static bool MapDataReader_SpawnAndPlaceElement(ref MapDataReader __insta
         return false;
     }
 
-    private static List<RegionData> GetAllRegionsForMapGeneration()
-    {
+    private static List<RegionData> GetAllRegionsForMapGeneration() {
         List<RegionData> allRegions = new(RegionProgression.Instance.regions);
         allRegions.RemoveAt(allRegions.Count - 1); // Remove midnight region
-        allRegions.AddRange(NewRegions.Select(a => a.Region)); // New Regions
+        allRegions.AddRange(NewRegions.Where(x => x.CanAppearRandomly).Select(a => a.Region)); // New Regions
+        allRegions.ForEach(x => InscryptionAPIPlugin.Logger.LogInfo(x.name));
         return allRegions;
     }
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(AscensionSaveData), "RollCurrentRunRegionOrder")]
     private static bool RollCurrentRunRegionOrder(AscensionSaveData __instance)
     {
-        // Get all regions to choose from
         List<RegionData> allRegions = GetAllRegionsForMapGeneration();
         allRegions = allRegions.Randomize().ToList();
 
         List<RegionData> selectedRegions = new();
         List<Opponent.Type> selectedOpponents = new();
-        for (int i = 0; i < allRegions.Count; i++)
-        {
-            RegionData regionData = allRegions[i];
-            Opponent.Type opponentType = GetRandomAvailableOpponent(regionData, selectedOpponents);
-            if (opponentType != Opponent.Type.Default)
-            {
-                // Add a region that doesn't conflict with the already selected ones
-                selectedRegions.Add(regionData);
-                selectedOpponents.Add(opponentType);
-            }
-
-            if (selectedRegions.Count == 3)
-                break;
-        }
 
         // Safety check: Make sure we have 3 regions!
         while (selectedRegions.Count < 3)