Fix for BTD6 v39

doombubbles · Oct 14, 2023 · 14cb86a · 14cb86a
1 parent 5a07c2c
commit 14cb86a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/AscendedUpgrade.cs b/AscendedUpgrade.cs
@@ -20,9 +20,11 @@ public abstract class AscendedUpgrade : NamedModContent
 {
     protected abstract ModBuffIcon ModBuffIcon { get; }
 
-    protected BuffIndicatorModel BuffIndicatorModel => (InGame.instance.Exists()?.GetGameModel() ?? Game.instance.model)
+    protected BuffIndicatorModel? BuffIndicatorModel => AscendedUpgradesMod.ShowBuffIndicators
+        ? (InGame.instance.Exists()?.GetGameModel() ?? Game.instance.model)
         .buffIndicatorModels
-        .First(model => model.name == $"BuffIndicatorModel_{ModBuffIcon.Id}-{ModBuffIcon.Icon}");
+        .First(model => model.name == $"BuffIndicatorModel_{ModBuffIcon.Id}-{ModBuffIcon.Icon}")
+        : null;
 
     public static readonly Dictionary<int, string> IdByPath = new();
     public static readonly Dictionary<int, AscendedUpgrade> ByPath = new();
@@ -70,7 +72,7 @@ public void UnApply()
     private void ChangeUpgradeCosts(float delta)
     {
         if (!AscendedUpgradesMod.SharedTowerScaling) return;
-        
+
         var gameModel = InGame.instance.bridge.Model;
         var affected = AscendedUpgradesMod.SharedUpgradeScaling
             ? GetContent<AscendedUpgrade>()

diff --git a/AscendedUpgradesMod.cs b/AscendedUpgradesMod.cs
@@ -51,6 +51,14 @@ public class AscendedUpgradesMod : BloonsTD6Mod
         description = "Whether the grid of blue upgrade pips appears as you purchase Ascended Upgrades",
         icon = ModContent.GetTextureGUID<AscendedUpgradesMod>("AscendedPip")
     };
+
+    public static readonly ModSettingBool ShowBuffIndicators = new(true)
+    {
+        displayName = "Show Buff Indicators",
+        description = "",
+        icon = VanillaSprites.BuffIconComeOnEverybodyRate
+    };
+
 
     public static readonly ModSettingBool SharedUpgradeScaling = new(false)
     {

diff --git a/LATEST.md b/LATEST.md
@@ -1 +1 @@
-- Fixed for BTD6 v38.1
+- Fixed for BTD6 v39.0
diff --git a/ModHelperData.cs b/ModHelperData.cs
@@ -2,8 +2,8 @@ namespace AscendedUpgrades;
 
 public static class ModHelperData
 {
-    public const string WorksOnVersion = "38.1";
-    public const string Version = "1.0.5";
+    public const string WorksOnVersion = "39.0";
+    public const string Version = "1.0.6";
     public const string Name = "Ascended Upgrades";
 
     public const string Description = "Adds special Ascended Upgrades that you can use to infinitely upgrade towers.\n" +

diff --git a/Patches.cs b/Patches.cs
@@ -133,7 +133,7 @@ private static void Postfix(UpgradeButton __instance)
 }
 
 [HarmonyPatch(typeof(TowerSelectionMenu), nameof(TowerSelectionMenu.UpgradeTower), typeof(UpgradeModel), typeof(int),
-    typeof(float))]
+    typeof(float), typeof(double))]
 internal static class TowerSelectionMenu_UpgradeTower
 {
     [HarmonyPrefix]