Revert logic changes, simplify single stack loop

Author: HumabHatterZed

InscryptionCommunityPatch/Card/StackAbilityIcons.cs

@@ -319,23 +319,20 @@ 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));
+            if (ai.GetHideSingleStacks())
             {
-                if (ai.GetHideSingleStacks())
+                for (int i = 0; i < card.Status.hiddenAbilities.Count; i++)
                 {
-                    for (int i = 0; i < card.Status.hiddenAbilities.Count(x => x == ability); i++)
-                    {
+                    if (card.Status.hiddenAbilities[i] == ability)
                         baseAbilities.Remove(ability);
-                    }
                 }
-                else if (card.Status.hiddenAbilities.Contains(ability))
-                    baseAbilities.RemoveAll(x => x == ability);
-            }            
+            }
+            else if (card.Status.hiddenAbilities.Contains(ability))
+                baseAbilities.RemoveAll(x => x == ability);
         }
 
         count ??= baseAbilities.Count(ab => ab == ability);