Fixed encounters

Author: IngoHHacks

Patches/MapGenerator_CreateNode.cs

@@ -0,0 +1,23 @@
+using API.Utils;
+using APIPlugin;
+using DiskCardGame;
+using HarmonyLib;
+using System;
+using System.Collections.Generic;
+
+namespace API.Patches
+{
+	// TODO: Fix both to work with ascension
+
+	[HarmonyPatch(typeof(MapGenerator), "CreateNode", new Type[] {typeof(int), typeof(int), typeof(List<NodeData>), typeof(List<NodeData>), typeof(int)})]
+	public class MapGenerator_CreateNode
+	{
+		public static void Postfix(ref NodeData __result, int y)
+		{
+			if (__result is CardBattleNodeData)
+            {
+				((CardBattleNodeData) __result).difficulty = RegionUtils.TrueTier() * 6 + (y + 1) / 3 - 1;
+			}
+		}
+	}
+}

Patches/RunState.cs

@@ -23,7 +23,7 @@ public class RunState_NextRegion
 		public static bool Prefix(ref RunState __instance)
 		{
 			List<RegionData> original = RegionProgression.Instance.regions;
-			int tier = __instance.regionTier < 4 ? __instance.regionTier + 1 : NewRegion.regions[__instance.regionTier - original.Count].tier + 1;
+			int tier = RegionUtils.TrueTier();
 			__instance.regionTier = RegionUtils.GetRandomRegionFromTier(tier);
 			__instance.map = MapGenerator.GenerateMap(RunState.CurrentMapRegion, 3, 13);
 			__instance.currentNodeId = __instance.map.RootNode.id;

Utils/RegionUtils.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using APIPlugin;
+using System;
 
 namespace API.Utils
 {
@@ -23,5 +24,10 @@ public static int GetRandomRegionFromTier(int tier)
             }
             return regions[SeededRandom.Range(0, regions.Count, SaveManager.SaveFile.GetCurrentRandomSeed())];
         }
+
+        public static int TrueTier()
+        {
+            return RunState.Run.regionTier < 4 ? RunState.Run.regionTier + 1 : NewRegion.regions[RunState.Run.regionTier - 4].tier + 1;
+        }
     }
 }