Fix for v39; Don't bypass challenge rules

doombubbles · Oct 26, 2023 · 0766f9f · 0766f9f
1 parent d8f0dab
commit 0766f9f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 37 deletions.
diff --git a/LATEST.md b/LATEST.md
@@ -1 +1,2 @@
-- Should now work in even more situations, such as with Insta Monkeys / the Insta Monkey Rework mod
+- Recompiled for BTD6 v39
+- Unlimited 5th Tiers no longer bypasses challenge rule restrictions
diff --git a/ModHelperData.cs b/ModHelperData.cs
@@ -2,8 +2,8 @@
 
 public static class ModHelperData
 {
-    public const string WorksOnVersion = "35.0";
-    public const string Version = "1.1.4";
+    public const string WorksOnVersion = "39.2";
+    public const string Version = "1.1.5";
     public const string Name = "Unlimited 5th Tiers +";
 
     public const string Description =

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 ### Lets you use any amount of fith tier towers in BTD6, and more
 
-<img alt="Screenshot" src="https://github.com/doombubbles/BTD6-Mods/blob/main/Unlimited5thTiers/image.png?raw=true" height="300" />
+<img alt="Screenshot" src="image.png" height="300" />
 
 ### Features
 

diff --git a/Unlimited5thTiersMod.cs b/Unlimited5thTiersMod.cs
@@ -5,7 +5,7 @@
 using Il2CppAssets.Scripts.Models;
 using Il2CppAssets.Scripts.Models.Towers;
 using Il2CppAssets.Scripts.Models.Towers.Behaviors;
-using Il2CppAssets.Scripts.Models.Towers.Mods;
+using Il2CppAssets.Scripts.Models.TowerSets;
 using Il2CppAssets.Scripts.Simulation.Input;
 using Il2CppAssets.Scripts.Simulation.Towers;
 using Il2CppAssets.Scripts.Simulation.Towers.Behaviors;
@@ -22,7 +22,7 @@ public class Unlimited5thTiersMod : BloonsTD6Mod
     /// <summary>
     /// Sun Temples with 4 Sacrifice Groups
     /// </summary>
-    public override void OnNewGameModel(GameModel gameModel, List<ModModel> mods)
+    public override void OnNewGameModel(GameModel gameModel)
     {
         foreach (var superMonkey in gameModel.GetTowersWithBaseId(TowerType.SuperMonkey))
         {
@@ -36,38 +36,24 @@ public override void OnNewGameModel(GameModel gameModel, List<ModModel> mods)
     /// <summary>
     /// Unlimited 5th Tiers
     /// </summary>
-    [HarmonyPatch(typeof(TowerInventory), nameof(TowerInventory.IsPathTierLocked))]
-    internal static class TowerInventory_IsPathTierLocked
+    [HarmonyPatch(typeof(TowerInventory), nameof(TowerInventory.SetTowerTierRestrictions))]
+    internal static class TowerInventory_SetTowerTierRestrictions
     {
-        [HarmonyPrefix]
-        private static bool Prefix(int tier, ref bool __result)
+        [HarmonyPostfix]
+        private static void Postfix(TowerInventory __instance, IEnumerable<TowerDetailsModel> towers)
         {
-            if (tier == 5 && Settings.AllowUnlimited5thTiers)
-            {
-                __result = false;
-                return false;
-            }
+            if (!Settings.AllowUnlimited5thTiers) return;
 
-            return true;
-        }
-    }
-
-    /// <summary>
-    /// Unlimited 5th Tiers
-    /// </summary>
-    [HarmonyPatch(typeof(TowerInventory), nameof(TowerInventory.HasUpgradeInventory))]
-    internal static class TowerInventory_HasInventory
-    {
-        [HarmonyPrefix]
-        private static bool Prefix(TowerModel def, ref bool __result)
-        {
-            if (def.tier == 5 && Settings.AllowUnlimited5thTiers)
+            towers.ForEach(towerDetails =>
             {
-                __result = true;
-                return false;
-            }
-
-            return true;
+                if (towerDetails.Is<ShopTowerDetailsModel>())
+                {
+                    for (var path = 0; path < 3; path++)
+                    {
+                        __instance.AddTierRestriction(towerDetails.towerId, path, 5, 9999999);
+                    }
+                }
+            });
         }
     }
 
@@ -88,7 +74,7 @@ public static void Postfix(MonkeyTemple __instance)
     }
 
     /// <summary>
-    /// Non-maxed Vengeful Temples
+    /// Multiple Vengeful Temples
     /// </summary>
     [HarmonyPatch(typeof(MonkeyTemple), nameof(MonkeyTemple.CheckTCBOO))]
     internal class MonkeyTemple_CheckTCBOO
@@ -103,8 +89,11 @@ internal static bool Prefix(MonkeyTemple __instance)
                 __instance.monkeyTempleModel.checkForThereCanOnlyBeOne &&
                 __instance.lastSacrificed != __instance.Sim.time.elapsed)
             {
-                var superMonkeys = __instance.Sim.towerManager.GetTowersByBaseId(TowerType.SuperMonkey).ToList()
-                    .Where(tower => tower.Id != __instance.tower.Id).ToList();
+                var superMonkeys = __instance.Sim.towerManager
+                    .GetTowersByBaseId(TowerType.SuperMonkey)
+                    .ToList()
+                    .Where(tower => tower.Id != __instance.tower.Id)
+                    .ToList<Tower>();
                 var robocop = superMonkeys.FirstOrDefault(tower => tower.towerModel.tiers[1] == 5);
                 var batman = superMonkeys.FirstOrDefault(tower => tower.towerModel.tiers[2] == 5);
                 if (batman != default && robocop != default)