Removed test code causing shields to persist forever

Author: HumabHatterZed

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.23.1
+- Fixed non-CardModificationInfo shields not breaking
+
 # 2.23.0
 - Added 'GBC Vanilla Render' config to community patches (false by default) - makes GBC cards render with vanilla cost sprites
 - Added 'Vanilla Stacking' config to community patches (false by default) - renders cards with only two (stacking) sigils as they appear in vanilla, eg Spore Mice and Sporedigger

InscryptionAPI/Card/ShieldManager.cs

@@ -26,6 +26,7 @@ public static class ShieldManager
 
     public static IEnumerator TriggerBreakShield(PlayableCard target, int damage, PlayableCard attacker)
     {
+        InscryptionAPIPlugin.Logger.LogDebug("[TriggerBreakShield] Begin");
         BreakShield(target, damage, attacker);
 
         List<IShieldPreventedDamage> shieldTriggers = CustomTriggerFinder.FindTriggersOnBoard<IShieldPreventedDamage>(false).ToList();
@@ -56,9 +57,11 @@ public static void BreakShield(PlayableCard target, int damage, PlayableCard att
         DamageShieldBehaviour shield = Array.Find(target.GetComponents<DamageShieldBehaviour>(), x => x.HasShields());
         if (shield != null)
         {
+            InscryptionAPIPlugin.Logger.LogDebug("[BreakShield] Found DamageShieldBehaviour");
             CardModificationInfo info = target.TemporaryMods.Find(x => x.abilities != null && x.abilities.Contains(shield.Ability));
             if (info != null)
             {
+                InscryptionAPIPlugin.Logger.LogDebug("[BreakShield] CardModInfo found for behaviour");
                 target.RemoveTemporaryMod(info, false); // RemoveShields is called here in a patch
                 info.abilities.Remove(shield.Ability);
                 target.AddTemporaryMod(info);
@@ -71,6 +74,7 @@ public static void BreakShield(PlayableCard target, int damage, PlayableCard att
         target.Anim.StrongNegationEffect();
         if (target.GetTotalShields() == 0) // if we removed the last shield
         {
+            InscryptionAPIPlugin.Logger.LogDebug("[BreakShield] TotalShields == 0");
             target.Status.lostShield = true;
             if (target.Info.HasBrokenShieldPortrait())
                 target.SwitchToPortrait(target.Info.BrokenShieldPortrait());
@@ -95,7 +99,10 @@ private static bool PreventShieldReset(PlayableCard target)
     /// <summary>
     /// The new version of PlayableCard.HasShield implementing the new shield logic.
     /// </summary>
-    public static bool NewHasShield(PlayableCard instance) => instance.GetTotalShields() > 0 && !instance.Status.lostShield;
+    public static bool NewHasShield(PlayableCard instance)
+    {
+        return instance.GetTotalShields() > 0 && !instance.Status.lostShield;
+    }
 
     [HarmonyPostfix, HarmonyPatch(typeof(PlayableCard), nameof(PlayableCard.HasShield))]
     private static void ReplaceHasShieldBool(PlayableCard __instance, ref bool __result) => __result = NewHasShield(__instance);
@@ -247,7 +254,6 @@ private static void CorrectHiddenAbilityRender(PlayableCard card)
             {
                 if (com.Ability.GetHideSingleStacks())
                 {
-                    card.AddShieldCount(1, Ability.DeathShield);
                     int shieldsLost = com.StartingNumShields - com.NumShields;
                     if (card.Status.hiddenAbilities.Count(x => x == com.Ability) < shieldsLost)
                     {

InscryptionAPI/InscryptionAPIPlugin.cs

@@ -30,7 +30,7 @@ public class InscryptionAPIPlugin : BaseUnityPlugin
 {
     public const string ModGUID = "cyantist.inscryption.api";
     public const string ModName = "InscryptionAPI";
-    public const string ModVer = "2.23.0";
+    public const string ModVer = "2.23.1";
 
     public static string Directory = "";
 

InscryptionCommunityPatch/Card/StackAbilityIcons.cs

@@ -319,13 +319,13 @@ private static void AddIconNumber(Ability ability, CardInfo info, PlayableCard c
         AbilityInfo ai = AbilityManager.AllAbilityInfos.AbilityByID(ability);
         if (card != null)
         {
+            baseAbilities.AddRange(AbilitiesUtil.GetAbilitiesFromMods(card.TemporaryMods/*.Where(x => !x.fromTotem && (!x.fromCardMerge || PatchPlugin.configMergeOnBottom.Value)).ToList()*/));
             if (ai.IsShieldAbility())
             {
                 count = card.GetShieldBehaviour(ability)?.NumShields;
             }
             else
             {
-                baseAbilities.AddRange(AbilitiesUtil.GetAbilitiesFromMods(card.TemporaryMods/*.Where(x => !x.fromTotem && (!x.fromCardMerge || PatchPlugin.configMergeOnBottom.Value)).ToList()*/));
                 if (ai.GetHideSingleStacks())
                 {
                     for (int i = 0; i < card.Status.hiddenAbilities.Count(x => x == ability); i++)
@@ -344,7 +344,7 @@ private static void AddIconNumber(Ability ability, CardInfo info, PlayableCard c
         if (count > 1) // we have a stack and need to add an override
         {
             if (PatchPlugin.doubleStackSplit.Value && count == 2 && count == baseAbilities.Count)
-                __instance.SetIcon(__instance.LoadIcon(info, ai, card != null && card.OpponentCard));//RenderSameSigilTwice(__instance, ai, info, card);
+                __instance.SetIcon(__instance.LoadIcon(info, ai, card != null && card.OpponentCard));
             else
                 __instance.SetIcon(PatchTexture(ability, (int)count));
         }