Reimplemented the disabling mechanism

Author: Asgragrt

Main.cs

@@ -5,11 +5,19 @@ namespace SelectiveEffects
 {
     public class Main : MelonMod
     {
+        internal static bool _isGameMain = false;
+        public static bool IsGameMain => _isGameMain;
+
         public override void OnInitializeMelon()
         {
             SettingsManager.Load();
             EffectsDisablerManager.Init();
             LoggerInstance.Msg("SelectiveEffects has loaded correctly!");
         }
+
+        public override void OnSceneWasLoaded(int buildIndex, string sceneName)
+        {
+            _isGameMain = sceneName.Equals("GameMain");
+        }
     }
 }

Managers/EffectsDisablerManager.cs

@@ -2,9 +2,18 @@
 {
     using static SettingsManager;
 
+    /*
+    [RegisterTypeInIl2Cpp]
+    public class DisableEffectComponent : MonoBehaviour
+    {
+        public DisableEffectComponent(IntPtr ptr) : base(ptr) { }
+    }
+    */
+
     internal static class EffectsDisablerManager
     {
         public static List<EffectsCondition> effectsDisablerList;
+        public static HashSet<string> effectsDisabledUids = new();
         public static bool AnyEffect = false;
 
         public static void Init()
@@ -43,6 +52,29 @@ public static void Init()
     internal abstract class EffectsCondition
     {
         public abstract bool Condition(string s);
+
+        public virtual void Action(string s)
+        {
+            EffectsDisablerManager.effectsDisabledUids.Add(s);
+            //effectPrefab.AddComponent<DisableEffectComponent>();
+        }
+
+        public bool CheckDo(string uid)
+        {
+            if (!Condition(uid)) return false;
+
+            Action(uid);
+            return true;
+        }
+    }
+
+    // Unused
+    internal class JudgementSize : EffectsCondition
+    {
+        public override bool Condition(string s)
+        {
+            return s.Contains("Score");
+        }
     }
 
     internal class Perfects : EffectsCondition

Patches/MainEffectsPatch.cs

@@ -5,31 +5,34 @@
 
 namespace SelectiveEffects.Patches
 {
-    [HarmonyPatch(typeof(Effect), nameof(Effect.CreateInstance))]
-    internal class MainEffectsPatch
+    [HarmonyPatch(typeof(Effect))]
+    internal static class MainEffectsPatch
     {
-        public static void Postfix(Effect __instance, ref GameObject __result)
+        [HarmonyPostfix]
+        [HarmonyPatch(nameof(Effect.Init))]
+        public static void ModifyPrefabs(Effect __instance)
         {
-            if (!SettingsManager.Enabled) return;
+            if (!Main.IsGameMain) return;
+
+            if (SettingsManager.DisableAllEffects) return;
 
-            
-            if (SettingsManager.DisableAllEffects)
+            foreach (EffectsCondition effecObject in EffectsDisablerManager.effectsDisablerList)
             {
-                __result.SetActive(false);
-                return;
+                if (effecObject.CheckDo(__instance.uid)) return;
             }
-            
+        }
 
-            if (SettingsManager.DisableAllEffects || !EffectsDisablerManager.AnyEffect) return;
 
-            string fxName = __instance.uid;
-            foreach (EffectsCondition effecObject in EffectsDisablerManager.effectsDisablerList)
-            {
-                if (!effecObject.Condition(fxName)) continue;
+        [HarmonyPostfix]
+        [HarmonyPatch(nameof(Effect.CreateInstance))]
+        public static void DisableEffects(Effect __instance, ref GameObject __result)
+        {
+            if (!SettingsManager.Enabled) return;
 
-                __result.SetActive(false);
-                return;
-            }
+            if (!SettingsManager.DisableAllEffects
+                && !EffectsDisablerManager.effectsDisabledUids.Contains(__instance.uid)
+                ) return;
+            __result.SetActive(false);
         }
     }
 }