Simplify logic

Author: HumabHatterZed

InscryptionCommunityPatch/Card/MergedSigilOnBottom.cs

@@ -22,10 +22,11 @@ private static bool DontPlaceCardModIcons_IfShowOnBottom(CardAbilityIcons __inst
     {
         // If we are showing card modifications sigils on the bottom, we don't allow the
         // AppyAbilitiesToIcons method to do anything
-        if (iconMat == __instance.emissiveIconMat && PatchPlugin.configMergeOnBottom.Value && PatchPlugin.configRemovePatches.Value)
+        if (PatchPlugin.configMergeOnBottom.Value && PatchPlugin.configRemovePatches.Value && iconMat == __instance.emissiveIconMat)
         {
-            foreach (var icon in icons)
+            foreach (AbilityIconInteractable icon in icons) {
                 icon.gameObject.SetActive(false);
+            }
             return false;
         }
 
@@ -39,13 +40,11 @@ private static void MoveMergeIconsToDefaultGroup_IfShowOnBottom(List<Ability> de
         // This is the first time that the default abilities list is used once it has been built
         // What we want to do is take all of the abilities from the merge group and move them to the default group
         // if the "show merged icons on bottom" setting is active.
-
-        if (PatchPlugin.configMergeOnBottom.Value)
-        {
+        if (PatchPlugin.configMergeOnBottom.Value) {
             defaultAbilities.AddRange(mergeAbilities);
-
-            if (PatchPlugin.configRemovePatches.Value)
+            if (PatchPlugin.configRemovePatches.Value) {
                 mergeAbilities.Clear();
+            }
         }
     }
 
@@ -54,55 +53,43 @@ private static void MoveMergeIconsToDefaultGroup_IfShowOnBottom(List<Ability> de
     [HarmonyPostfix]
     private static void RepositionAndRetextureMergedIcons_IfShowOnBottom(ref CardInfo info, ref AbilityInfo ability, ref AbilityIconInteractable __instance)
     {
-        if (!PatchPlugin.configMergeOnBottom.Value)
-            return;
+        if (PatchPlugin.configMergeOnBottom.Value && info != null && info.Mods.Count > 0) {
+            List<CardModificationInfo> MergeSigils = info.Mods.FindAll(x => x.fromCardMerge);
 
-        if (info != null)
-        {
-            if (info.Mods.Count > 0)
-            {
-                List<CardModificationInfo> MergeSigils = info.Mods.FindAll(x => x.fromCardMerge);
+            if (MergeSigils.Count > 0) {
+                foreach (CardModificationInfo mod in MergeSigils) {
+                    // if ability whose icon we're loading came from a card merge mod
+                    if (mod.abilities.Contains(ability.ability) && (__instance.name == "AbilityIcon" || __instance.name == "DefaultIcons_1Ability")) {
+                        if (PatchPlugin.configRemovePatches.Value) {
+                            __instance.SetMaterial(Singleton<CardAbilityIcons>.Instance.totemIconMat);
+                            if (__instance.GetComponentInParent<MeshRenderer>() != null)
+                                __instance.GetComponentInParent<MeshRenderer>().enabled = true;
 
-                if (MergeSigils.Count > 0)
-                {
-                    foreach (CardModificationInfo mod in MergeSigils)
-                    {
-                        if (mod.abilities.Contains(ability.ability) && (__instance.name == "AbilityIcon" || __instance.name == "DefaultIcons_1Ability"))
-                        {
-                            if (PatchPlugin.configRemovePatches.Value)
-                            {
-                                __instance.SetMaterial(Singleton<CardAbilityIcons>.Instance.totemIconMat);
-                                if (__instance.GetComponentInParent<MeshRenderer>() != null)
-                                    __instance.GetComponentInParent<MeshRenderer>().enabled = true;
+                            __instance.SetColor(Color.white);
+                            return;
+                        }
+                        int sigils = (info.DefaultAbilities.Count + MergeSigils.Count);
+                        if (sigils <= 8) {
+                            //Plugin.Log.LogInfo(sigils + " " + ability.ToString() + " " + info.name);
 
-                                __instance.SetColor(Color.white);
-                                return;
+                            Transform[] allChildren;
+                            //Plugin.Log.LogInfo(__instance.name);
+                            if (__instance.name == "DefaultIcons_1Ability") {
+                                allChildren = __instance.transform.parent.GetComponentsInChildren<Transform>();
                             }
-                            int sigils = (info.DefaultAbilities.Count + MergeSigils.Count);
-                            if (sigils <= 8)
-                            {
-                                //Plugin.Log.LogInfo(sigils + " " + ability.ToString() + " " + info.name);
-
-                                Transform[] allChildren = __instance.transform.parent.transform.parent.GetComponentsInChildren<Transform>();
-                                //Plugin.Log.LogInfo(__instance.name);
-                                if (__instance.name == "DefaultIcons_1Ability")
-                                    allChildren = __instance.transform.parent.GetComponentsInChildren<Transform>();
+                            else {
+                                allChildren = __instance.transform.parent.transform.parent.GetComponentsInChildren<Transform>();
+                            }   
 
-                                foreach (Transform child in allChildren)
-                                {
-                                    if (child.gameObject.activeSelf && child.gameObject.name.StartsWith("CardMergeIcon_"))
-                                    {
-                                        if (child.gameObject.GetComponent<AbilityIconInteractable>().Ability == __instance.Ability)
-                                        {
-                                            child.gameObject.transform.localPosition = __instance.transform.localPosition;
-                                            child.gameObject.transform.localScale = __instance.transform.localScale;
-                                        }
-                                    }
+                            foreach (Transform child in allChildren) {
+                                if (child.gameObject.activeSelf && child.gameObject.name.StartsWith("CardMergeIcon_") &&
+                                    child.gameObject.GetComponent<AbilityIconInteractable>().Ability == __instance.Ability) {
+                                    child.gameObject.transform.localPosition = __instance.transform.localPosition;
+                                    child.gameObject.transform.localScale = __instance.transform.localScale;
                                 }
                             }
                         }
                     }
-                    return;
                 }
             }
         }