Fix damage types, ice monkey

doombubbles · Oct 11, 2024 · 0b5e372 · 0b5e372
1 parent 6c8ca86
commit 0b5e372
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 3 deletions.
diff --git a/Bytes/BeastHandlers.bytes b/Bytes/BeastHandlers.bytes
diff --git a/Bytes/BombShooters.bytes b/Bytes/BombShooters.bytes
diff --git a/Bytes/BoomerangMonkeys.bytes b/Bytes/BoomerangMonkeys.bytes
diff --git a/Bytes/DartMonkeys.bytes b/Bytes/DartMonkeys.bytes
diff --git a/Bytes/Druids.bytes b/Bytes/Druids.bytes
diff --git a/Bytes/EngineerMonkeys.bytes b/Bytes/EngineerMonkeys.bytes
diff --git a/Bytes/HeliPilots.bytes b/Bytes/HeliPilots.bytes
diff --git a/Bytes/IceMonkeys.bytes b/Bytes/IceMonkeys.bytes
diff --git a/Bytes/MonkeyAces.bytes b/Bytes/MonkeyAces.bytes
diff --git a/Bytes/MonkeyBuccaneers.bytes b/Bytes/MonkeyBuccaneers.bytes
diff --git a/Bytes/MonkeySubs.bytes b/Bytes/MonkeySubs.bytes
diff --git a/Bytes/MortarMonkeys.bytes b/Bytes/MortarMonkeys.bytes
diff --git a/Bytes/SniperMonkeys.bytes b/Bytes/SniperMonkeys.bytes
diff --git a/Bytes/SpikeFactorys.bytes b/Bytes/SpikeFactorys.bytes
diff --git a/Bytes/SuperMonkeys.bytes b/Bytes/SuperMonkeys.bytes
diff --git a/Bytes/TackShooters.bytes b/Bytes/TackShooters.bytes
diff --git a/Bytes/WizardMonkeys.bytes b/Bytes/WizardMonkeys.bytes
diff --git a/LATEST.md b/LATEST.md
@@ -1,3 +1,4 @@
 ## See the [BTD Mod Helper Install Guide](https://gurrenm3.github.io/BTD-Mod-Helper/wiki/Install-Guide) if this is your first time downloading, and the [Common Issues](https://github.com/doombubbles/ultimate-crosspathing/blob/1.4.5/HELP.md#common-issues) page for help
 <!--Mod Browser Message Start-->
-- Fixed for BTD6 v45
+- Fixed damage types not being merged correctly in the last version
+- Fixed error that could happen with Ice Monkey 5X5 crosspath
diff --git a/Merging/Algorithm.cs b/Merging/Algorithm.cs
@@ -732,7 +732,7 @@ private static bool IsType<T>(this Type typ)
         {
             if (typeof(T).IsEnum)
             {
-                return typ.FullName.StartsWith(typeof(T).FullName!);
+                return typeof(T).FullName!.EndsWith(typ.FullName!);
             }
             var ty = Il2CppType.From(typeof(T));
             return ty.IsAssignableFrom(typ);

diff --git a/ModHelperData.cs b/ModHelperData.cs
@@ -3,7 +3,7 @@
     public static class ModHelperData
     {
         public const string WorksOnVersion = "45.0";
-        public const string Version = "1.5.1";
+        public const string Version = "1.5.2";
         public const string Name = "Ultimate Crosspathing";
 
         public const string Description =

diff --git a/Patches.cs b/Patches.cs
@@ -2,6 +2,7 @@
 using Il2CppAssets.Scripts.Unity.UI_New.InGame.TowerSelectionMenu;
 using HarmonyLib;
 using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Simulation.Towers.Behaviors.Attack;
 
 namespace UltimateCrosspathing
 {
@@ -81,4 +82,20 @@ internal static void Postfix(Bank __instance)
             }
         }
     }
+
+    /// <summary>
+    /// Fix bug where previous target suppliers that were since destroyed would sometimes still stick around
+    /// </summary>
+    [HarmonyPatch(typeof(Attack), nameof(Attack.UpdateActiveTargetSupplier))]
+    internal static class Attack_UpdateActiveTargetSupplier
+    {
+        [HarmonyPrefix]
+        internal static void Prefix(Attack __instance)
+        {
+            if (__instance.activeTargetSupplier is {IsDestroyed: true})
+            {
+                __instance.activeTargetSupplier = null;
+            }
+        }
+    }
 }