fix RemoveShields not updating visual shield stack amount correctly

Author: HumabHatterZed

InscryptionAPI/Card/CardExtensionsHelpers.cs

@@ -776,7 +776,10 @@ public static int GetTotalShields(this PlayableCard card)
         // covers for a situation I discovered where you use a SpecialBattleSequencer's triggers to advance a boss fight
         // somehow you can end up with a null playablecard which breaks this bit here
         if (card == null)
+        {
+            InscryptionAPIPlugin.Logger.LogDebug("[GetTotalShields] Card is null, returning 0.");
             return 0;
+        }
 
         int totalShields = 0;
         List<Ability> distinct = new(); // keep track of non-stacking shield abilities so we don't add them again
@@ -792,6 +795,7 @@ public static int GetTotalShields(this PlayableCard card)
             }
         }
 
+        //InscryptionAPIPlugin.Logger.LogDebug("[GetTotalShields] Total is " + totalShields);
         return totalShields;
     }
 

InscryptionAPI/Card/DamageShieldBehaviour.cs

@@ -40,13 +40,15 @@ public virtual void AddShields(int amount, bool updateDisplay = true)
     public virtual void RemoveShields(int amount, bool updateDisplay = true)
     {
         numShields -= amount;
-        if (base.Card.GetTotalShields() <= 0)
-            base.Card.Status.lostShield = true;
-
-        if (!Ability.GetHideSingleStacks() && !HasShields() && !base.Card.Status.hiddenAbilities.Contains(this.Ability))
+        if (!this.HasShields())
         {
-            base.Card.Status.hiddenAbilities.Add(this.Ability);
-            //Debug.Log("Add hidden single");
+            if (Ability.GetHideSingleStacks()) // visually reduce the number of shield stacks
+            {
+                for (int i = 0; i < amount; i++)
+                    base.Card.Status.hiddenAbilities.Add(this.Ability);
+            }
+            else if (!base.Card.Status.hiddenAbilities.Contains(this.Ability)) // hide the whole sigil
+                base.Card.Status.hiddenAbilities.Add(this.Ability);
         }
 
         if (updateDisplay)

InscryptionCommunityPatch/Card/StackAbilityIcons.cs

@@ -319,19 +319,23 @@ 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.GetHideSingleStacks())
+            if (ai.IsShieldAbility())
+            {
+                count = card.GetShieldBehaviour(ability)?.NumShields;
+            }
+            else
             {
-                for (int i = 0; i < card.Status.hiddenAbilities.Count(x => x == ability); i++)
+                baseAbilities.AddRange(AbilitiesUtil.GetAbilitiesFromMods(card.TemporaryMods/*.Where(x => !x.fromTotem && (!x.fromCardMerge || PatchPlugin.configMergeOnBottom.Value)).ToList()*/));
+                if (ai.GetHideSingleStacks())
                 {
-                    baseAbilities.Remove(ability);
+                    for (int i = 0; i < card.Status.hiddenAbilities.Count(x => x == ability); i++)
+                    {
+                        baseAbilities.Remove(ability);
+                    }
                 }
-            }
-            else if (card.Status.hiddenAbilities.Contains(ability))
-                baseAbilities.RemoveAll(x => x == ability);
-
-            if (ai.IsShieldAbility())
-                count = card.GetShieldBehaviour(ability)?.NumShields;
+                else if (card.Status.hiddenAbilities.Contains(ability))
+                    baseAbilities.RemoveAll(x => x == ability);
+            }            
         }
 
         count ??= baseAbilities.Count(ab => ab == ability);