Fixed regions

Author: IngoHHacks

Models/New/NewAbility.cs

@@ -16,7 +16,7 @@ public class NewAbility
 
 		public NewAbility(AbilityInfo info, Type abilityBehaviour, Texture tex, AbilityIdentifier id = null)
 		{
-			ability = (Ability) Ability.NUM_ABILITIES + 1 + abilities.Count;
+			ability = Ability.NUM_ABILITIES + 1 + abilities.Count;
 			info.ability = ability;
 			this.info = info;
 			this.abilityBehaviour = abilityBehaviour;

Patches/RegionProgression_Instance.cs

@@ -31,7 +31,7 @@ public static void Prefix(ref RegionProgression ___instance)
 					bool found = false;
 					foreach (RegionData officialRegion in official.regions)
 					{
-						if (officialRegion != null)
+						if (officialRegion != null && region.name == officialRegion.name)
 						{
 							region.AdjustRegion(officialRegion);
 							List<NewEncounter> customEncounters = NewEncounter.encounters.FindAll(x => x.regionName == region.name);

Patches/RunState.cs

@@ -1,17 +1,33 @@
+using API.Utils;
 using APIPlugin;
 using DiskCardGame;
 using HarmonyLib;
-using UnityEngine;
+using System.Collections.Generic;
 
 namespace API.Patches
 {
+	// TODO: Fix both to work with ascension
+
 	[HarmonyPatch(typeof(RunState), "Initialize")]
 	public class RunState_Initialize
 	{
-		static void Postfix(ref RunState __instance)
+		public static void Postfix(ref RunState __instance)
+		{
+			__instance.regionTier = RegionUtils.GetRandomRegionFromTier(0);
+		}
+	}
+
+	[HarmonyPatch(typeof(RunState), "NextRegion")]
+	public class RunState_NextRegion
+	{
+		public static bool Prefix(ref RunState __instance)
 		{
-			// Random regions have been removed
-			//__instance.regionIndex = RegionProgression.GetRandomRegionIndexForTier(0);
+			List<RegionData> original = RegionProgression.Instance.regions;
+			int tier = __instance.regionTier < 4 ? __instance.regionTier + 1 : NewRegion.regions[__instance.regionTier - original.Count].tier + 1;
+			__instance.regionTier = RegionUtils.GetRandomRegionFromTier(tier);
+			__instance.map = MapGenerator.GenerateMap(RunState.CurrentMapRegion, 3, 13);
+			__instance.currentNodeId = __instance.map.RootNode.id;
+			return false;
 		}
 	}
 }

Utils/RegionUtils.cs

@@ -0,0 +1,27 @@
+using DiskCardGame;
+using System.Collections.Generic;
+using System.Linq;
+using APIPlugin;
+
+namespace API.Utils
+{
+    public class RegionUtils
+    {
+        public static int GetRandomRegionFromTier(int tier)
+        {
+            List<int> regions = new List<int>();
+            if (tier < 4)
+            {
+                regions.Add(tier);
+            }
+            List<NewRegion> newRegions = NewRegion.regions;
+            regions.AddRange(Enumerable.Range(4, newRegions.Count).Where(i => newRegions[i - 4].tier == tier));
+            if (regions.Count == 0)
+            {
+                Plugin.Log.LogError($"No regions have been defined for tier {tier}");
+                return 3;
+            }
+            return regions[SeededRandom.Range(0, regions.Count, SaveManager.SaveFile.GetCurrentRandomSeed())];
+        }
+    }
+}