2.23.2

Author: HumabHatterZed

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.23.2
+- Fixed error when trying to create cards that evolve/transform in 4 or more turns
+- Fixed Fledgling and Transformer sigil appearing as black boxes when a card evolves/transform in 4 or more turns
+- Evolve and Transformer icons now show support cards that evolve in 4 or more turns
+- Added extension methods for PlayableCard and CardInfo: ProvidesBlueGem, ProvidesGreenGem, ProvidesOrangeGem
+
 # 2.23.1
 - Fixed non-CardModificationInfo shields not breaking
 - Fixed ShieldGeneratorItem not correclty updating visuals

InscryptionAPI/Assets/ability_evolve_4.png

@@ -245,7 +245,7 @@ private static List<FullAbility> GenBaseGameAbilityList()
         }
 
         List<FullAbility> baseGame = new();
-        var gameAsm = typeof(AbilityInfo).Assembly;
+        Assembly gameAsm = typeof(AbilityInfo).Assembly;
         foreach (var ability in Resources.LoadAll<AbilityInfo>("Data/Abilities"))
         {
             string name = ability.ability.ToString();
@@ -719,18 +719,44 @@ private static IEnumerable<CodeInstruction> EvolveOnUpkeepPatches(IEnumerable<Co
 
         return codes;
     }
+    [HarmonyPrefix, HarmonyPatch(typeof(AbilityIconInteractable), nameof(AbilityIconInteractable.LoadIcon))]
+    private static bool OverrideTransformIcon(ref Texture __result, AbilityIconInteractable __instance, CardInfo info, AbilityInfo ability) {
+        if (ability.ability == Ability.Transformer && info?.evolveParams?.turnsToEvolve > 1) {
+            __result = TextureHelper.GetImageAsTexture($"ability_transformer_{Mathf.Min(info.evolveParams.turnsToEvolve, 6)}.png", InscryptionAPIPlugin.APIAssembly);
+            return false;
+        }
+        if (ability.ability == Ability.Evolve && info?.evolveParams?.turnsToEvolve > 3) {
+            __result = TextureHelper.GetImageAsTexture($"ability_evolve_{Mathf.Min(info.evolveParams.turnsToEvolve, 6)}.png", InscryptionAPIPlugin.APIAssembly);
+            return false;
+        }
+        return true;
+    }
+    [HarmonyPrefix, HarmonyPatch(typeof(AbilitiesUtil), nameof(AbilitiesUtil.LoadAbilityIcon))]
+    private static bool OverrideEvolveAndTransformerIcon(ref Texture __result, string abilityName) {
+        if (abilityName.StartsWith("Evolve") || abilityName.StartsWith("Transformer")) {
+            return false;
+        }
+        return true;
+    }
     private static void OverrideEvolveDerivedIcon(Evolve evolve, int turnsLeftToEvolve)
     {
         if (evolve.Ability == Ability.Evolve)
         {
-            evolve.Card.RenderInfo.OverrideAbilityIcon(
-                Ability.Evolve, ResourceBank.Get<Texture>("Art/Cards/AbilityIcons/ability_evolve_" + turnsLeftToEvolve)
-                );
+            if (turnsLeftToEvolve > 3) {
+                evolve.Card.RenderInfo.OverrideAbilityIcon(
+                    Ability.Evolve, TextureHelper.GetImageAsTexture($"ability_evolve_{Mathf.Min(turnsLeftToEvolve, 6)}.png", InscryptionAPIPlugin.APIAssembly)
+                    );
+            }
+            else {
+                evolve.Card.RenderInfo.OverrideAbilityIcon(
+                    Ability.Evolve, ResourceBank.Get<Texture>("Art/Cards/AbilityIcons/ability_evolve_" + turnsLeftToEvolve)
+                    );
+            }
         }
         else if (evolve.Ability == Ability.Transformer && (evolve.Card.Info.evolveParams?.turnsToEvolve ?? 1) != 1)
         {
             evolve.Card.RenderInfo.OverrideAbilityIcon(
-                Ability.Transformer, TextureHelper.GetImageAsTexture($"ability_transformer_{turnsLeftToEvolve}.png", typeof(AbilityManager).Assembly)
+                Ability.Transformer, TextureHelper.GetImageAsTexture($"ability_transformer_{Mathf.Min(turnsLeftToEvolve, 6)}.png", InscryptionAPIPlugin.APIAssembly)
                 );
         }
     }
@@ -808,7 +834,7 @@ private static void LoadTransformerIcon(ref Texture __result, CardInfo info, Abi
         if (turnsToEvolve <= 1)
             return;
 
-        __result = TextureHelper.GetImageAsTexture($"ability_transformer_{turnsToEvolve}.png", typeof(AbilityManager).Assembly);
+        __result = TextureHelper.GetImageAsTexture($"ability_transformer_{turnsToEvolve}.png", InscryptionAPIPlugin.APIAssembly);
     }
     #endregion
 

InscryptionAPI/Assets/ability_evolve_5.png

@@ -1,6 +1,7 @@
 using DiskCardGame;
 using InscryptionAPI.Guid;
 using System.Collections.ObjectModel;
+using System.Reflection;
 
 namespace InscryptionAPI.Card;
 
@@ -36,10 +37,10 @@ static CardAppearanceBehaviourManager()
     private static List<FullCardAppearanceBehaviour> GenBaseGameAppearanceList()
     {
         List<FullCardAppearanceBehaviour> baseGame = new();
-        var gameAsm = typeof(CardAppearanceBehaviour).Assembly;
+        Assembly gameAsm = typeof(CardAppearanceBehaviour).Assembly;
         foreach (CardAppearanceBehaviour.Appearance ability in Enum.GetValues(typeof(CardAppearanceBehaviour.Appearance)))
         {
-            var name = ability.ToString();
+            string name = ability.ToString();
             baseGame.Add(new FullCardAppearanceBehaviour(ability, gameAsm.GetType($"DiskCardGame.{name}")));
         }
         return baseGame;

InscryptionAPI/Assets/ability_evolve_6.png

@@ -109,4 +109,54 @@ public static bool OwnerHasBlueGem(this PlayableCard card)
         return card.OpponentCard ? OpponentGemsManager.Instance.HasGem(GemType.Blue) : ResourcesManager.Instance.HasGem(GemType.Blue);
     }
     public static bool IsUsingBlueGem(this PlayableCard card) => card.IsGemified() && card.OwnerHasBlueGem();
+
+    /// <summary>
+    /// Determines if this card provides its owner with a blue gem.
+    /// </summary>
+    /// <param name="card">Card to check</param>
+    public static bool ProvidesBlueGem(this PlayableCard card)
+    {
+        return card.HasAbility(Ability.GainGemTriple) || card.HasAbility(Ability.GainGemBlue);
+    }
+    /// <summary>
+    /// Determines if this card provides its owner with a green gem.
+    /// </summary>
+    /// <param name="card">Card to check</param>
+    public static bool ProvidesGreenGem(this PlayableCard card)
+    {
+        return card.HasAbility(Ability.GainGemTriple) || card.HasAbility(Ability.GainGemGreen);
+    }
+    /// <summary>
+    /// Determines if this card provides its owner with a orange gem.
+    /// </summary>
+    /// <param name="card">Card to check</param>
+    public static bool ProvidesOrangeGem(this PlayableCard card)
+    {
+        return card.HasAbility(Ability.GainGemTriple) || card.HasAbility(Ability.GainGemOrange);
+    }
+
+    /// <summary>
+    /// Determines if this card provides its owner with a blue gem.
+    /// </summary>
+    /// <param name="card">CardInfo to check</param>
+    public static bool ProvidesBlueGem(this CardInfo card)
+    {
+        return card.HasAbility(Ability.GainGemTriple) || card.HasAbility(Ability.GainGemBlue);
+    }
+    /// <summary>
+    /// Determines if this card provides its owner with a green gem.
+    /// </summary>
+    /// <param name="card">CardInfo to check</param>
+    public static bool ProvidesGreenGem(this CardInfo card)
+    {
+        return card.HasAbility(Ability.GainGemTriple) || card.HasAbility(Ability.GainGemGreen);
+    }
+    /// <summary>
+    /// Determines if this card provides its owner with a orange gem.
+    /// </summary>
+    /// <param name="card">CardInfo to check</param>
+    public static bool ProvidesOrangeGem(this CardInfo card)
+    {
+        return card.HasAbility(Ability.GainGemTriple) || card.HasAbility(Ability.GainGemOrange);
+    }
 }