Kaycee's Mod compatibility

Author: IngoHHacks

Patches/AbilitiesUtil_NewAbility.cs

@@ -24,12 +24,11 @@ public static bool Prefix(string abilityName, CardTriggerHandler __instance, ref
 		}
 	}
 
-	[HarmonyPatch(typeof(AbilitiesUtil), "GetAbilities",
-		typeof(bool), typeof(bool), typeof(int), typeof(int), typeof(AbilityMetaCategory))]
-	public class AbilitiesUtil_GetAbilities
+	[HarmonyPatch(typeof(AbilitiesUtil), "GetLearnedAbilities",
+		typeof(bool), typeof(int), typeof(int), typeof(AbilityMetaCategory))]
+	public class AbilitiesUtil_GetLearnedAbilities
 	{
 		public static void Postfix(
-			bool learned,
 			bool opponentUsable,
 			int minPower,
 			int maxPower,
@@ -43,11 +42,7 @@ ref List<Ability> __result
 				bool flag = !opponentUsable || info.opponentUsable;
 				bool flag2 = info.powerLevel >= minPower && info.powerLevel <= maxPower;
 				bool flag3 = info.metaCategories.Contains(categoryCriteria);
-				bool flag4 = true;
-				if (learned)
-				{
-					flag4 = ProgressionData.LearnedAbility(info.ability);
-				}
+				bool flag4 = ProgressionData.LearnedAbility(info.ability);
 
 				if (flag && flag2 && flag3 && flag4)
 				{

Patches/Energy.cs

@@ -171,7 +171,7 @@ public class TurnManager_PlayerTurn
 	{
 		static IEnumerable<MethodBase> TargetMethods()
 		{
-			Type targetType = AccessTools.TypeByName("DiskCardGame.TurnManager+<PlayerTurn>d__73");
+			Type targetType = AccessTools.TypeByName("DiskCardGame.TurnManager+<PlayerTurn>d__77");
 			return AccessTools.GetDeclaredMethods(targetType).Where(m => m.Name.Equals("MoveNext"));
 		}
 
@@ -182,7 +182,7 @@ public static void ILManipulator(ILContext il, MethodBase original, ILLabel retL
 		{
 			if (Plugin.configEnergy.Value)
 			{
-				Type targetType = AccessTools.TypeByName("DiskCardGame.TurnManager+<PlayerTurn>d__73");
+				Type targetType = AccessTools.TypeByName("DiskCardGame.TurnManager+<PlayerTurn>d__77");
 				ILCursor c = new ILCursor(il);
 				c.GotoNext(inst => inst.MatchCall(AccessTools.Method(typeof(SaveManager), "get_SaveFile")));
 				c.RemoveRange(6);
@@ -191,7 +191,7 @@ public static void ILManipulator(ILContext il, MethodBase original, ILLabel retL
 				c.Next.OpCode = OpCodes.Ldc_I4_1;
 				foreach (ILLabel branch in c.IncomingLabels)
 				{
-					c.GotoNext(inst => inst.MatchStfld(AccessTools.Field(targetType, "<showEnergyModule>5__2")));
+					c.GotoNext(inst => inst.MatchStfld(AccessTools.Field(targetType, "<showEnergyModule>5__1")));
 					branch.Target = c.Next;
 					foreach (Instruction inst in branch.Branches)
 					{

Patches/RegionProgression_Instance.cs

@@ -17,21 +17,20 @@ public static void Prefix(ref RegionProgression ___instance)
 				// If no custom region is defined for the default region, but custom encounters for that region exist, create one
 				for (int t = 0; t <= 3; t++)
 				{
-					if (NewEncounter.encounters.Exists(encounter => (encounter.regionName == official.regions[t][0].name)))
+					if (NewEncounter.encounters.Exists(encounter => (encounter.regionName == official.regions[t].name)))
 					{
-						if (!CustomRegion.regions.Exists(region => (region.tier == t && region.name == official.regions[t][0].name)))
+						if (!CustomRegion.regions.Exists(region => (region.tier == t && region.name == official.regions[t].name)))
 						{
-							new CustomRegion(official.regions[t][0].name);
+							new CustomRegion(official.regions[t].name);
 						}
 					}
 				}
 
 				foreach (CustomRegion region in CustomRegion.regions)
 				{
 					bool found = false;
-					foreach (List<RegionData> tier in official.regions)
+					foreach (RegionData officialRegion in official.regions)
 					{
-						RegionData officialRegion = tier.Find((RegionData x) => x.name == region.name);
 						if (officialRegion != null)
 						{
 							region.AdjustRegion(officialRegion);
@@ -65,11 +64,7 @@ public static void Prefix(ref RegionProgression ___instance)
 
 				foreach (NewRegion region in NewRegion.regions)
 				{
-					while (region.tier >= official.regions.Count)
-					{
-						official.regions.Add(new List<RegionData>());
-					}
-					official.regions[region.tier].Add(region.region);
+					official.regions.Add(region.region);
 
 					List<NewEncounter> customEncounters = NewEncounter.encounters.FindAll(x => x.regionName == region.region.name);
 					foreach (NewEncounter encounter in customEncounters)

Patches/RunState.cs

@@ -10,7 +10,8 @@ public class RunState_Initialize
 	{
 		static void Postfix(ref RunState __instance)
 		{
-			__instance.regionIndex = RegionProgression.GetRandomRegionIndexForTier(0);
+			// Random regions have been removed
+			//__instance.regionIndex = RegionProgression.GetRandomRegionIndexForTier(0);
 		}
 	}
 }