Don't modify face stuff if GN or DA are active

TheBlackParrot · Jan 3, 2025 · 35fda55 · 35fda55
1 parent d1c2129
commit 35fda55
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/NoteTweaks/Patches/NoteArrowPatch.cs b/NoteTweaks/Patches/NoteArrowPatch.cs
@@ -121,7 +121,7 @@ private static bool IsAllowedToScaleNotes
             }
         }
 
-        private static bool IsAllowedToUseAccDots
+        private static bool IsUsingHiddenTypeModifier
         {
             get
             {
@@ -130,7 +130,7 @@ private static bool IsAllowedToUseAccDots
                     return false;
                 }
 
-                return !(_gameplayModifiers.disappearingArrows || _gameplayModifiers.ghostNotes);
+                return _gameplayModifiers.disappearingArrows || _gameplayModifiers.ghostNotes;
             }
         }
 
@@ -197,7 +197,7 @@ internal static void Postfix(ref GameNoteController __instance, ref BoxCuttableB
                     return;
                 }
 
-                if (Plugin.Config.EnableAccDot && __instance.gameplayType != NoteData.GameplayType.BurstSliderHead && IsAllowedToUseAccDots)
+                if (Plugin.Config.EnableAccDot && __instance.gameplayType != NoteData.GameplayType.BurstSliderHead && !IsUsingHiddenTypeModifier)
                 {
                     if (!_accDotObject)
                     {
@@ -324,7 +324,7 @@ internal class NoteArrowPatch
 
             internal static void Postfix(ColorNoteVisuals __instance, ref MeshRenderer[] ____arrowMeshRenderers, ref MeshRenderer[] ____circleMeshRenderers)
             {
-                if (!Plugin.Config.Enabled || _autoDisable)
+                if (!Plugin.Config.Enabled || _autoDisable || IsUsingHiddenTypeModifier)
                 {
                     return;
                 }
@@ -356,7 +356,7 @@ internal static void Postfix(ColorNoteVisuals __instance, ref MeshRenderer[] ___
                     isChainHead = c.gameplayType == NoteData.GameplayType.BurstSliderHead;   
                 }
 
-                if (Plugin.Config.EnableAccDot && IsAllowedToUseAccDots)
+                if (Plugin.Config.EnableAccDot)
                 {
                     _replacementDotMaterial.renderQueue = Plugin.Config.RenderAccDotsAboveSymbols ? 1997 : 2000;
                     _dotGlowMaterial.renderQueue = Plugin.Config.RenderAccDotsAboveSymbols ? 1998 : 1999;
@@ -405,7 +405,7 @@ internal static void Postfix(ColorNoteVisuals __instance, ref MeshRenderer[] ___
                         materialPropertyBlockController.ApplyChanges();   
                     }
 
-                    if (Plugin.Config.EnableAccDot && IsAllowedToUseAccDots)
+                    if (Plugin.Config.EnableAccDot)
                     {
                         meshRenderer.sharedMaterial.renderQueue = Plugin.Config.RenderAccDotsAboveSymbols ? 1997 : 2000;
                     }
@@ -436,7 +436,7 @@ internal static void Postfix(ColorNoteVisuals __instance, ref MeshRenderer[] ___
                             }
                             else
                             {
-                                if (Plugin.Config.EnableAccDot && IsAllowedToUseAccDots)
+                                if (Plugin.Config.EnableAccDot)
                                 {
                                     arrowGlowMeshRenderer.material.renderQueue = Plugin.Config.RenderAccDotsAboveSymbols ? 1998 : 1999;
                                 }