Fixes to Ascension Mode

Author: IngoHHacks

Patches/AscensionSaveData_RolLCurrentRunRegionOrder.cs

@@ -0,0 +1,21 @@
+using API.Utils;
+using DiskCardGame;
+using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace API.Patches
+{
+	[HarmonyPatch(typeof(AscensionSaveData), "RollCurrentRunRegionOrder")]
+	public class AscensionSaveData_RolLCurrentRunRegionOrder
+	{
+		public static void Postfix()
+		{
+			if (SaveManager.SaveFile.ascensionActive)
+			{
+				RunState.Run.regionTier = RegionUtils.GetRandomRegionFromTier(RunState.Run.regionOrder[0]);
+			}
+		}
+	}
+}

Patches/MapGenerator_CreateNode.cs

@@ -16,7 +16,14 @@ public static void Postfix(ref NodeData __result, int y)
 		{
 			if (__result is CardBattleNodeData)
             {
-				((CardBattleNodeData) __result).difficulty = RegionUtils.TrueTier() * 6 + (y + 1) / 3 - 1;
+				if (SaveManager.SaveFile.ascensionActive)
+				{
+					((CardBattleNodeData) __result).difficulty = Array.IndexOf(RunState.Run.regionOrder, RegionUtils.TrueTier()) * 6 + (y + 1) / 3 - 1;
+				}
+				else
+				{
+					((CardBattleNodeData) __result).difficulty = RegionUtils.TrueTier() * 6 + (y + 1) / 3 - 1;
+				}
 			}
 		}
 	}

Patches/RegionProgression_Instance.cs

@@ -77,6 +77,10 @@ public static void Prefix(ref RegionProgression ___instance)
 						Plugin.Log.LogInfo($"Loaded {customEncounters.Count} custom encounters into new custom region {region.region.name}");
 					}
 				}
+
+				// The final tier is reserved for ascensionFinalRegion
+				official.regions.Add(official.ascensionFinalRegion);
+
 				___instance = official;
 				Plugin.Log.LogInfo($"Loaded {CustomRegion.regions.Count} new custom regions into data");
 			}

Patches/RunState.cs

@@ -2,6 +2,7 @@
 using APIPlugin;
 using DiskCardGame;
 using HarmonyLib;
+using System;
 using System.Collections.Generic;
 
 namespace API.Patches
@@ -13,7 +14,10 @@ public class RunState_Initialize
 	{
 		public static void Postfix(ref RunState __instance)
 		{
-			__instance.regionTier = RegionUtils.GetRandomRegionFromTier(0);
+			if (!SaveManager.SaveFile.ascensionActive)
+			{
+				__instance.regionTier = RegionUtils.GetRandomRegionFromTier(RunState.Run.regionOrder[0]);
+			}
 		}
 	}
 
@@ -24,10 +28,36 @@ public static bool Prefix(ref RunState __instance)
 		{
 			List<RegionData> original = RegionProgression.Instance.regions;
 			int tier = RegionUtils.TrueTier();
-			__instance.regionTier = RegionUtils.GetRandomRegionFromTier(tier);
+			int progressionTier = Array.IndexOf(RunState.Run.regionOrder, tier);
+			__instance.regionTier = RegionUtils.GetRandomRegionFromTier((progressionTier == -1 || progressionTier == RunState.Run.regionOrder.Length - 1) ? RunState.Run.regionOrder.Length : RunState.Run.regionOrder[progressionTier + 1]);
+			if (__instance.regionTier == RunState.Run.regionOrder.Length)
+            {
+				if (SaveManager.SaveFile.ascensionActive)
+                {
+					__instance.regionTier = original.Count - 1;
+
+				}
+            }
 			__instance.map = MapGenerator.GenerateMap(RunState.CurrentMapRegion, 3, 13);
 			__instance.currentNodeId = __instance.map.RootNode.id;
 			return false;
 		}
 	}
+
+	[HarmonyPatch(typeof(RunState), "CurrentMapRegion", MethodType.Getter)]
+	public class RunState_get_CurrentMapRegion
+	{
+		public static bool Prefix(ref RegionData __result)
+		{
+			if (SaveManager.SaveFile.IsPart3 || SaveManager.SaveFile.IsGrimora)
+			{
+				__result = ResourceBank.Get<RegionData>("Data/Map/Regions/!TEST_PART3");
+			}
+			else
+            {
+				__result = RegionProgression.Instance.regions[RunState.Run.regionTier];
+			}
+			return false;
+		}
+	}
 }

Utils/RegionUtils.cs

@@ -20,7 +20,7 @@ public static int GetRandomRegionFromTier(int tier)
             if (regions.Count == 0)
             {
                 Plugin.Log.LogError($"No regions have been defined for tier {tier}");
-                return 3;
+                return 0;
             }
             return regions[SeededRandom.Range(0, regions.Count, SaveManager.SaveFile.GetCurrentRandomSeed())];
         }