Fixed for BTD6 v34 / MelonLoader 0.6.0

doombubbles · Dec 29, 2022 · 07a4a56 · 07a4a56
1 parent c7a1e1b
commit 07a4a56
Show file tree

Hide file tree

Showing 31 changed files with 81 additions and 85 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   PROJECT_NAME: CardMonkey
-  MOD_HELPER_BRANCH: master
+  MELONLOADER_BRANCH: alpha-development
 
   MOD_HELPER_NAME: Btd6ModHelper
   BLOONSTD6: ./BloonsTD6
@@ -48,7 +48,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: build.yml
           branch: ${{ env.MELONLOADER_BRANCH }}
-          name: MelonLoader.x64.CI.Release
+          name: MelonLoader.Linux.x64.CI.Release
           repo: LavaGang/MelonLoader
           path: ${{ env.BLOONSTD6 }}
 
@@ -59,11 +59,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: doombubbles/btd6-ci-dependencies
           ref: main
-          path: ${{ env.BLOONSTD6 }}/MelonLoader/Managed
+          path: ${{ env.BLOONSTD6 }}/MelonLoader/Il2CppAssemblies
 
 
       - name: Download Latest Mod Helper
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: robinraju/release-[email protected]
         if: env.MOD_HELPER_BRANCH == ''
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -93,15 +93,15 @@ jobs:
           if [ "$RUNNER_OS" == "Windows" ]; then
             choco install -y wget
           fi
-          wget https://raw.githubusercontent.com/gurrenm3/BTD-Mod-Helper/${{ env.MOD_HELPER_BRANCH }}/BloonsTD6%20Mod%20Helper/btd6.targets
+          wget https://raw.githubusercontent.com/gurrenm3/BTD-Mod-Helper/master/BloonsTD6%20Mod%20Helper/btd6.targets
 
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
           dotnet-version: 6.0.x # net6 can still build older as well
-          
-          
+
+
       - name: Build
         run: dotnet build -c Release -p:BloonsTD6="../${{ env.BLOONSTD6 }}" "${{ env.PROJECT_NAME }}/${{ env.PROJECT_NAME }}.csproj"
 
@@ -111,12 +111,12 @@ jobs:
         with:
           name: ${{ env.PROJECT_NAME }}.dll
           path: ${{ env.BLOONSTD6 }}/Mods/${{ env.PROJECT_NAME }}.dll
-          
-          
+
+
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
-        with: 
+        with:
           files: ${{ env.BLOONSTD6 }}/Mods/${{ env.PROJECT_NAME }}.dll
           body_path: ${{ env.PROJECT_NAME }}/LATEST.md
           fail_on_unmatched_files: true
diff --git a/CardMonkey.cs b/CardMonkey.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.TowerSets;
+using BTD_Mod_Helper;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.TowerSets;
 using BTD_Mod_Helper.Api.Enums;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
@@ -17,7 +18,7 @@ public class CardMonkey : ModTower
         // public override string Portrait => "Don't need to override this, using the default of Name-Portrait";
         // public override string Icon => "Don't need to override this, using the default of Name-Icon";
 
-        public override string TowerSet => TowerSetType.Primary;
+        public override TowerSet TowerSet => TowerSet.Primary;
 
         public override string BaseTower => TowerType.DartMonkey;
         public override int Cost => 400;
@@ -58,6 +59,6 @@ public override int GetTowerIndex(List<TowerDetailsModel> towerSet)
         /// That mod will handle actually allowing the upgrades to happen in the UI
         /// </summary>
         public override bool IsValidCrosspath(int[] tiers) =>
-            HasMod("UltimateCrosspathing") ? true : base.IsValidCrosspath(tiers);
+            ModHelper.HasMod("UltimateCrosspathing") ? true : base.IsValidCrosspath(tiers);
     }
 }
diff --git a/CardMonkey.csproj b/CardMonkey.csproj
@@ -1,22 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net48</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>CardMonkey</RootNamespace>
         <Configurations>Debug;Release</Configurations>
         <Nullable>enable</Nullable>
         <AssemblyName>CardMonkey</AssemblyName>
         <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <Optimize>False</Optimize>
         <DebugType>embedded</DebugType>
     </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-        <Optimize>True</Optimize>
-        <DebugType>none</DebugType>
-    </PropertyGroup>
-
+
     <Import Project="..\btd6.targets" />
 </Project>
diff --git a/Displays/CardMonkeyBaseDisplay.cs b/Displays/CardMonkeyBaseDisplay.cs
@@ -1,6 +1,6 @@
 using System.Linq;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Unity.Display;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Unity.Display;
 using BTD_Mod_Helper.Api.Display;
 using BTD_Mod_Helper.Extensions;
 using UnityEngine;

diff --git a/Displays/CardMonkeyMultiDisplay.cs b/Displays/CardMonkeyMultiDisplay.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Unity.Display;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Unity.Display;
 using BTD_Mod_Helper.Api;
 using BTD_Mod_Helper.Api.Display;
 using BTD_Mod_Helper.Extensions;

diff --git a/Displays/CardMonkeyParagonDisplay.cs b/Displays/CardMonkeyParagonDisplay.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Assets.Scripts.Models.GenericBehaviors;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Unity;
-using Assets.Scripts.Unity.Display;
+using Il2CppAssets.Scripts.Models.GenericBehaviors;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Unity;
+using Il2CppAssets.Scripts.Unity.Display;
 using BTD_Mod_Helper.Api;
 using BTD_Mod_Helper.Api.Display;
 using BTD_Mod_Helper.Extensions;

diff --git a/Displays/Projectiles/CardDisplays.cs b/Displays/Projectiles/CardDisplays.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Simulation.SMath;
-using Assets.Scripts.Unity.Display;
+using Il2CppAssets.Scripts.Simulation.SMath;
+using Il2CppAssets.Scripts.Unity.Display;
 using BTD_Mod_Helper.Api.Display;
 
 namespace CardMonkey.Displays.Projectiles

diff --git a/Displays/Tier5/AceOfSpadesDisplay.cs b/Displays/Tier5/AceOfSpadesDisplay.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Unity.Display;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Unity.Display;
 using BTD_Mod_Helper.Api.Display;
 using BTD_Mod_Helper.Extensions;
 using UnityEngine;

diff --git a/Displays/Tier5/RoyalFlushDisplay.cs b/Displays/Tier5/RoyalFlushDisplay.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Unity.Display;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Unity.Display;
 using BTD_Mod_Helper.Api.Display;
 using BTD_Mod_Helper.Extensions;
 using UnityEngine;

diff --git a/Displays/Tier5/TFDisplay.cs b/Displays/Tier5/TFDisplay.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Unity.Display;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Unity.Display;
 using BTD_Mod_Helper.Api.Display;
 using BTD_Mod_Helper.Extensions;
 using UnityEngine;

diff --git a/Displays/Tier5/TFDisplay.png b/Displays/Tier5/TFDisplay.png
diff --git a/Displays/Tier5/TFDisplay_32.png b/Displays/Tier5/TFDisplay_32.png
diff --git a/Displays/Tier5/TFDisplay_33.png b/Displays/Tier5/TFDisplay_33.png
diff --git a/LATEST.md b/LATEST.md
@@ -1 +1 @@
-- Fixed displays for v33
+- Fixed for BTD6 v34 / MelonLoader 0.6.0
diff --git a/ModHelperData.cs b/ModHelperData.cs
@@ -2,7 +2,8 @@
 {
     public static class ModHelperData
     {
-        public const string Version = "1.2.4";
+        public const string WorksOnVersion = "34.3";
+        public const string Version = "1.2.5";
         public const string Name = "Card Monkey";
         public const string Description =
             "Adds in a new custom tower themed around playing cards.";

diff --git a/Upgrades/BottomPath/CardCounting.cs b/Upgrades/BottomPath/CardCounting.cs
@@ -1,4 +1,4 @@
-using Assets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/BottomPath/MarkedCards.cs b/Upgrades/BottomPath/MarkedCards.cs
@@ -1,4 +1,4 @@
-using Assets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/BottomPath/SleightOfHand.cs b/Upgrades/BottomPath/SleightOfHand.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Filters;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Filters;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/BottomPath/StackedDeck.cs b/Upgrades/BottomPath/StackedDeck.cs
@@ -1,6 +1,6 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Behaviors;
-using Assets.Scripts.Unity;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors;
+using Il2CppAssets.Scripts.Unity;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/BottomPath/TwistOfFate.cs b/Upgrades/BottomPath/TwistOfFate.cs
@@ -1,8 +1,8 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Filters;
-using Assets.Scripts.Models.Towers.Projectiles.Behaviors;
-using Assets.Scripts.Unity;
-using Assets.Scripts.Utils;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Filters;
+using Il2CppAssets.Scripts.Models.Towers.Projectiles.Behaviors;
+using Il2CppAssets.Scripts.Unity;
+using Il2CppAssets.Scripts.Utils;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 using CardMonkey.Displays.Projectiles;
@@ -75,7 +75,7 @@ public override void ApplyUpgrade(TowerModel tower)
 
             var behavior = new CreateProjectileOnExhaustFractionModel(
                 "CreateProjectileOnExhaustFractionModel_",
-                pb.projectile, pb.emission, 1f, 1f, true);
+                pb.projectile, pb.emission, 1f, 1f, true, false);
             redCard.projectile.AddBehavior(behavior);
 
             var soundBehavior = new CreateSoundOnProjectileExhaustModel(

diff --git a/Upgrades/GodKingOfSpades.cs b/Upgrades/GodKingOfSpades.cs
@@ -1,4 +1,4 @@
-using Assets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers;
 using BTD_Mod_Helper.Api.Towers;
 
 namespace CardMonkey.Upgrades

diff --git a/Upgrades/MiddlePath/AceInTheHole.cs b/Upgrades/MiddlePath/AceInTheHole.cs
@@ -1,16 +1,17 @@
-using Assets.Scripts.Models;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Behaviors.Abilities;
-using Assets.Scripts.Models.Towers.Behaviors.Abilities.Behaviors;
-using Assets.Scripts.Models.Towers.Behaviors.Attack;
-using Assets.Scripts.Models.Towers.Behaviors.Attack.Behaviors;
-using Assets.Scripts.Models.Towers.Behaviors.Emissions.Behaviors;
-using Assets.Scripts.Models.Towers.Projectiles.Behaviors;
-using Assets.Scripts.Unity;
+using Il2CppAssets.Scripts.Models;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Abilities;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Abilities.Behaviors;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Attack;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Attack.Behaviors;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Emissions.Behaviors;
+using Il2CppAssets.Scripts.Models.Towers.Projectiles.Behaviors;
+using Il2CppAssets.Scripts.Unity;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 using CardMonkey.Displays.Projectiles;
-using UnhollowerBaseLib;
+using Il2Cpp;
+using Il2CppInterop.Runtime.InteropTypes.Arrays;
 
 namespace CardMonkey.Upgrades.MiddlePath
 {

diff --git a/Upgrades/MiddlePath/AceOfSpades.cs b/Upgrades/MiddlePath/AceOfSpades.cs
@@ -1,7 +1,7 @@
 using System.Linq;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Projectiles;
-using Assets.Scripts.Models.Towers.Projectiles.Behaviors;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Projectiles;
+using Il2CppAssets.Scripts.Models.Towers.Projectiles.Behaviors;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 using CardMonkey.Displays.Projectiles;

diff --git a/Upgrades/MiddlePath/AcesWild.cs b/Upgrades/MiddlePath/AcesWild.cs
@@ -1,6 +1,6 @@
 using System.Linq;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Projectiles.Behaviors;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Projectiles.Behaviors;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 using CardMonkey.Displays.Projectiles;

diff --git a/Upgrades/MiddlePath/CutTheDeck.cs b/Upgrades/MiddlePath/CutTheDeck.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Simulation.Towers;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Simulation.Towers;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/MiddlePath/WildCards.cs b/Upgrades/MiddlePath/WildCards.cs
@@ -1,7 +1,8 @@
-using Assets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 using CardMonkey.Displays.Projectiles;
+using Il2Cpp;
 
 namespace CardMonkey.Upgrades.MiddlePath
 {

diff --git a/Upgrades/TopPath/FourOfAKind.cs b/Upgrades/TopPath/FourOfAKind.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Behaviors.Emissions;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Emissions;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/TopPath/Pair.cs b/Upgrades/TopPath/Pair.cs
@@ -1,6 +1,6 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Behaviors.Emissions;
-using Assets.Scripts.Simulation.Towers;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Emissions;
+using Il2CppAssets.Scripts.Simulation.Towers;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/TopPath/RoyalFlush.cs b/Upgrades/TopPath/RoyalFlush.cs
@@ -1,4 +1,4 @@
-using Assets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/TopPath/StraightFlush.cs b/Upgrades/TopPath/StraightFlush.cs
@@ -1,6 +1,6 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Behaviors.Emissions;
-using Assets.Scripts.Models.Towers.Weapons.Behaviors;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Emissions;
+using Il2CppAssets.Scripts.Models.Towers.Weapons.Behaviors;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
 

diff --git a/Upgrades/TopPath/ThreeOfAKind.cs b/Upgrades/TopPath/ThreeOfAKind.cs
@@ -1,5 +1,5 @@
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Behaviors.Emissions;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors.Emissions;
 using BTD_Mod_Helper.Api.Towers;
 using BTD_Mod_Helper.Extensions;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- Fixed displays for v33
		- Fixed for BTD6 v34 / MelonLoader 0.6.0