bugfixes, preparation for music fest

Conti · Conti · commit 473f9f9759de · 2021-10-26T17:53:09.000+02:00
diff --git a/ApiController.cs b/ApiController.cs
@@ -16,10 +16,12 @@ public static class ApiController
     {
         private static float brightness = RenderSettings.skybox.GetFloat("_Exposure") * 255f;
         private static float red, green, blue = 255f;
+        private static string eventName = "";
         public static bool isRunning = false;
-        public static async void PostAsync(float _red, float _green, float _blue, float _brightness)
+        private static object token = null;
+        public static async void PostAsync(float _red, float _green, float _blue, float _brightness, string _eventName)
         {
-            string json = $"{{\"red\": {_red}, \"green\": {_green}, \"blue\": {_blue}, \"bright\": {_brightness}}}";
+            string json = $"{{\"red\": {_red}, \"green\": {_green}, \"blue\": {_blue}, \"bright\": {_brightness}, \"event\": \"{_eventName}\"}}";
             try
             {
                 HttpClient client = new HttpClient();
@@ -31,14 +33,16 @@ await client.PostAsync(
             {
                 MelonLogger.Msg(ex.InnerException.Message);
             }
-           
         }
 
         public static IEnumerator StartPost()
         {
             while (isRunning)
             {
-                PostAsync(red, green, blue, brightness);
+                if(InGameUI.I.mState != InGameUI.State.PausePage)
+                {
+                    PostAsync(red, green, blue, brightness, eventName);
+                }
                 yield return new WaitForSecondsRealtime(.04f);
             }
         }
@@ -47,7 +51,8 @@ private static void Start()
         {
             isRunning = true;
             brightness = RenderSettings.skybox.GetFloat("_Exposure") * 255f;
-            MelonCoroutines.Start(StartPost());
+            eventName = "";
+            token = MelonCoroutines.Start(StartPost());
         }
 
         public static void SetBrightness(float _brightness)
@@ -72,13 +77,28 @@ public static void SetColor(Color color)
             }
         }
 
+        public static void SetEvent(string _event)
+        {
+            if (!Config.postToApi) return;
+            eventName = _event;
+            if (!isRunning)
+            {
+                Start();
+            }
+        }
+
         public static void TurnOff()
         {
             if (!Config.postToApi) return;
             brightness = 0f;
+            red = 255f;
+            green = 255f;
+            blue = 255;
             red = green = blue = 255f;
+            eventName = "";
             isRunning = false;
-            PostAsync(red, green, blue, brightness);
+            MelonCoroutines.Stop(token);
+            PostAsync(red, green, blue, brightness, eventName);
         }
     }
 }
diff --git a/src/AuthorableModifiers.cs b/src/AuthorableModifiers.cs
@@ -21,7 +21,7 @@ public class AuthorableModifiersMod : MelonMod
         public static List<Modifier> singleUseModifiers = new List<Modifier>();
         public static Dictionary<int, float> oldOffsetDict = new Dictionary<int, float>();
         public static string audicaFilePath = "";
-        public static bool modifiersFound = false;
+        public static bool modifiersFound { get; set; } = false;
 
         public static Vector3 debugTextPosition = new Vector3(0f, 8f, 8f);
 
@@ -43,12 +43,13 @@ public class AuthorableModifiersMod : MelonMod
 
         public static Dictionary<float, DebugTextPopup> popupTextDictionary = new Dictionary<float, DebugTextPopup>();
         public static bool lightshowWasEnabled = false;
+        public static Vector3 lastRotationEndValue = Vector3.zero;
         public static class BuildInfo
         {
             public const string Name = "AuthorableModifiers";  // Name of the Mod.  (MUST BE SET)
             public const string Author = "Continuum"; // Author of the Mod.  (Set as null if none)
             public const string Company = null; // Company that made the Mod.  (Set as null if none)
-            public const string Version = "1.2.6"; // Version of the Mod.  (MUST BE SET)
+            public const string Version = "1.2.7"; // Version of the Mod.  (MUST BE SET)
             public const string DownloadLink = null; // Download Link for the Mod.  (Set as null if none)
         }
 
@@ -113,6 +114,7 @@ public static void LoadModifierCues(bool fromRestart = false)
                 modifiersLoaded = true;
                 return;
             }
+            if(fromRestart) AudioDriver.I.Pause();
             awaitEnableModifiers = Decoder.GetModifierCues(audicaFilePath);
 
             if (awaitEnableModifiers is null || (awaitEnableModifiers.Count == 0 && preloadModifiers.Count == 0 && zOffsetList.Count == 0))
@@ -124,6 +126,7 @@ public static void LoadModifierCues(bool fromRestart = false)
                 {
                     ResetArena(true);
                 }
+                if (fromRestart) AudioDriver.I.Resume();
                 return;
             }
             SetOldColors(KataConfig.I.leftHandColor, KataConfig.I.rightHandColor);
@@ -157,18 +160,20 @@ public static void LoadModifierCues(bool fromRestart = false)
                 MelonCoroutines.Start(IWaitForArenaLoad("<color=\"red\">WARNING</color>\nMay contain flashing lights and rotating arenas. \nThis can be disabled in Mod Settings.", .001f));
             //if (endless) MelonCoroutines.Start(StartTimer());
             //else modifiersLoaded = true;
-            MelonCoroutines.Start(WaitForArenaSwitch());
+            MelonCoroutines.Start(WaitForArenaSwitch(fromRestart));
             //modifiersLoaded = true;
         }
 
-        private static IEnumerator WaitForArenaSwitch()
+
+        private static IEnumerator WaitForArenaSwitch(bool fromRestart)
         {
             while (EnvironmentLoader.I.IsSwitching())
             {
                 yield return new WaitForSecondsRealtime(.2f);
             }
             modifiersLoaded = true;
             defaultSkyboxColor = RenderSettings.skybox.GetColor("_Tint");
+            if (fromRestart) AudioDriver.I.Resume();
         }
 
         private static void EnableAutoLightshow(bool enable)
@@ -390,10 +395,21 @@ private static IEnumerator IResetArenaValues(bool resetToUserValues)
             RenderSettings.skybox.SetFloat("_Rotation", rotation);
             ArenaLoaderMod.CurrentSkyboxReflection = 0f;
             ArenaLoaderMod.ChangeReflectionStrength(reflection);
+            RenderSettings.skybox.SetColor("_Tint", defaultSkyboxColor);
         }
 
         public override void OnUpdate()
         {
+            /*if (Input.GetKeyDown(KeyCode.L))
+            {
+                AutoPlayer.EnableAutoplayer(!AutoPlayer.I.IsAutoPlayerEnabled);
+                MelonLogger.Msg("Auto player is " + (AutoPlayer.I.IsAutoPlayerEnabled ? "enabled" : "disabled"));
+
+            }
+            if (Input.GetKeyDown(KeyCode.P) && MenuState.sState == MenuState.State.Launched)
+            {
+                InGameUI.I.GoToPausePage(true);
+            }*/
             /*if (Input.GetKeyDown(KeyCode.L))
             {
                 ApiController.isRunning = true;
diff --git a/src/Config.cs b/src/Config.cs
@@ -53,8 +53,6 @@ public static void OnPreferencesSaved()
                 else if (fieldInfo.FieldType == typeof(float)) fieldInfo.SetValue(null, MelonPreferences.GetEntryValue<float>(Category, fieldInfo.Name));
                 else if (fieldInfo.FieldType == typeof(string)) fieldInfo.SetValue(null, MelonPreferences.GetEntryValue<string>(Category, fieldInfo.Name));
             }
-
-            AuthorableModifiersMod.modifiersFound = false;
         }
     }
 }
diff --git a/src/Decoder.cs b/src/Decoder.cs
@@ -418,8 +418,8 @@ public static List<Modifier> GetModifierCues(string audicaFilePath)
                                             AmountY = yOffset,
                                             AmountZ = zOffset,
                                             Reset = option1,
-                                            Preload = option2
-
+                                            Preload = option2,
+                                            ShortestRoute = independantBool
                                         };
                                         /*modifierCue = new ArenaScale(type,
                                             modifiersJSON["modifiers"][i]["startTick"],
@@ -433,8 +433,9 @@ public static List<Modifier> GetModifierCues(string audicaFilePath)
                                         preload = option2;
                                         break;
                                     case ModifierType.SkyboxColor:
-                                        if (!Config.enableSkyboxColorChange) continue;
+                                        if (!Config.enableSkyboxColorChange || !Integrations.arenaLoaderFound) continue;
                                         modifierCue = new SkyboxColor(type,
+                                            amount,
                                             startTick,
                                             endTick,
                                             leftHandColor.r,
diff --git a/src/Hooks.cs b/src/Hooks.cs
@@ -67,7 +67,7 @@ private static class PatchShowPage
         {
             private static void Postfix(OptionsMenu __instance, OptionsMenu.Page page)
             {
-                if (page == OptionsMenu.Page.Main)
+                if (page == OptionsMenu.Page.Main && !AuthorableModifiersMod.modifiersFound)
                     AuthorableModifiersMod.SetUserBrightness(RenderSettings.skybox.GetFloat("_Exposure"), RenderSettings.skybox.GetFloat("_Rotation"), RenderSettings.reflectionIntensity);
             }
         }
@@ -79,6 +79,7 @@ private static void Postfix(MenuState __instance, MenuState.State state)
             {
                 if(state == MenuState.State.SongPage)
                 {
+                    
                     AuthorableModifiersMod.SetEndlessActive(false);
                 }
             }
diff --git a/src/Modifiers/ArenaManipulation.cs b/src/Modifiers/ArenaManipulation.cs
@@ -23,6 +23,7 @@ public class ArenaManipulation : Modifier
         //private Quaternion currentRotation;
         public bool Preload { get; set; }
         public bool Reset { get; set; }
+        public bool ShortestRoute { get; set; }
         /*protected ArenaManipulation(ModifierType _type, float _startTick, float _endTick, string _amountX, string _amountY, string _amountZ, bool _reset, bool _preload)
         {
             Type = _type;
@@ -48,14 +49,14 @@ public override void Activate()
             //MelonLogger.Msg("Target " + Type.ToString() + ": " + targetAmount.x + "/" + targetAmount.y + "/" + targetAmount.z);
             if (Preload)
             {
-                SetAmount(targetAmount);
+                SetAmount(targetAmount, true);
             }
             else
             {
                 base.Activate();
                 if (EndTick == StartTick || EndTick == 0)
                 {
-                    SetAmount(targetAmount);
+                    SetAmount(targetAmount, true);
                 }
                 else
                 {
@@ -140,16 +141,18 @@ private void GetTargetAmount()
                     targetAmount.z = currentAmount.z;
                 }
 
-                if(Type == ModifierType.ArenaSpin)
-                {
-                    float tickSpan = EndTick - StartTick;
-                    if (Reset) tickSpan = 1;
-                    amountPerTick = new Vector3(Mathf.DeltaAngle(currentAmount.x, targetAmount.x), Mathf.DeltaAngle(currentAmount.y, targetAmount.y), Mathf.DeltaAngle(currentAmount.z, targetAmount.z));
-                    amountPerTick /= tickSpan;
-                    //amountPerTick = (targetAmount - currentAmount) / tickSpan;
-                    //MelonLogger.Msg($"{amountPerTick.x}/{amountPerTick.y}/{amountPerTick.z} over {tickSpan} ticks (Target: {targetAmount.x}/{targetAmount.y}/{targetAmount.z} || Calculated: {amountPerTick.x * tickSpan}/{amountPerTick.y * tickSpan}/{amountPerTick.z * tickSpan})");
-                    lastTick = StartTick;
-                }
+                
+                //if (Type != ModifierType.ArenaScale) targetAmount += currentAmount;
+            }
+            if (Type == ModifierType.ArenaSpin)
+            {
+                float tickSpan = EndTick - StartTick;
+                if (Reset || EndTick == 0 || StartTick == EndTick) tickSpan = 1;
+                //amountPerTick = new Vector3(Mathf.DeltaAngle(currentAmount.x, targetAmount.x), Mathf.DeltaAngle(currentAmount.y, targetAmount.y), Mathf.DeltaAngle(currentAmount.z, targetAmount.z));
+                //amountPerTick /= tickSpan;
+                amountPerTick = (targetAmount - currentAmount) / tickSpan;
+                //MelonLogger.Msg($"{amountPerTick.x}/{amountPerTick.y}/{amountPerTick.z} over {tickSpan} ticks (Target: {targetAmount.x}/{targetAmount.y}/{targetAmount.z} || Calculated: {amountPerTick.x * tickSpan}/{amountPerTick.y * tickSpan}/{amountPerTick.z * tickSpan})");
+                lastTick = StartTick;
             }
         }
         private Vector3 amountPerTick = new Vector3();
@@ -168,6 +171,7 @@ protected Vector3 GetAmount(float percentage)
                 amnt.y = CalculateAmount(currentAmount.y, targetAmount.y, percentage);
                 amnt.z = CalculateAmount(currentAmount.z, targetAmount.z, percentage);
             }*/
+
             amnt.x = CalculateAmount(currentAmount.x, targetAmount.x, percentage);
             amnt.y = CalculateAmount(currentAmount.y, targetAmount.y, percentage);
             amnt.z = CalculateAmount(currentAmount.z, targetAmount.z, percentage);
@@ -194,16 +198,18 @@ private IEnumerator DoManipulation()
             {
                 float percentage = ((AudioDriver.I.mCachedTick - StartTick) * 100f) / (EndTick - StartTick);
                 percentage /= 100f;
-                SetAmount(GetAmount(percentage));
+                SetAmount(GetAmount(percentage), false, percentage);
+                if(Type == ModifierType.ArenaSpin)
+                {
+                    //world.rotation = Quaternion.Lerp(Quaternion.Euler(currentAmount), Quaternion.Euler(targetAmount), percentage);
+                    
+                }
                 yield return new WaitForSecondsRealtime(Time.unscaledDeltaTime);
             }
             //if (Type == ModifierType.ArenaSpin) SetAmount(targetRotation);
-            SetAmount(targetAmount);
+            SetAmount(targetAmount, true);
         }
 
-
-
-
         private float CalculateAmount(float current, float target, float percentage)
         {
             //if(Type == ModifierType.ArenaSpin) target = target * target * (3f - 2f * target); //test this
@@ -216,7 +222,7 @@ private float CalculateAmount(float current, float target, float percentage)
             world.transform.rotation = rot;
         }*/
 
-        private void SetAmount(Vector3 _amount)
+        private void SetAmount(Vector3 _amount, bool instant, float percentage = 100f)
         {
             switch (Type)
             {       
@@ -227,9 +233,9 @@ private void SetAmount(Vector3 _amount)
                     world.transform.localScale = _amount;
                     break;
                 case ModifierType.ArenaSpin:
-                    /*float currentTick = AudioDriver.I.mCachedTick;
+                    float currentTick = AudioDriver.I.mCachedTick;
                     float numTicksPassed = currentTick - lastTick;
-                    lastTick = currentTick;*/
+                    lastTick = currentTick;
 
                     /*world.Rotate(Vector3.right, amountPerTick.x * numTicksPassed);
                     world.Rotate(Vector3.up, amountPerTick.y * numTicksPassed);
@@ -239,14 +245,31 @@ private void SetAmount(Vector3 _amount)
                     /*world.rotation *= Quaternion.AngleAxis(amountPerTick.x * numTicksPassed, Vector3.right);
                     world.rotation *= Quaternion.AngleAxis(amountPerTick.y * numTicksPassed, Vector3.up);
                     world.rotation *= Quaternion.AngleAxis(amountPerTick.z * numTicksPassed, Vector3.forward);*/
-                    /*
-                    world.transform.rotation *= Quaternion.AngleAxis(_amount.x, Vector3.right);
+
+                    /*world.transform.rotation *= Quaternion.AngleAxis(_amount.x, Vector3.right);
                     world.transform.rotation *= Quaternion.AngleAxis(_amount.y, Vector3.up);
                     world.transform.rotation *= Quaternion.AngleAxis(_amount.z, Vector3.forward);
                     */
+                    /*if (instant) world.rotation = Quaternion.Euler(_amount);
+                    else
+                    {
+                        
+                    }*/
+                    if (Reset && instant) world.rotation = Quaternion.identity;
+                    else
+                    {
+                        if(ShortestRoute) world.rotation = Quaternion.Lerp(Quaternion.Euler(currentAmount), Quaternion.Euler(targetAmount), percentage);
+                        else world.rotation = Quaternion.Euler(_amount);
+                    }
 
-                    //world.eulerAngles = _amount;
-                    world.rotation = Quaternion.Euler(_amount);
+                    
+                        /*world.rotation *= Quaternion.AngleAxis(amountPerTick.x * numTicksPassed, Vector3.right);
+                        world.rotation *= Quaternion.AngleAxis(amountPerTick.y * numTicksPassed, Vector3.up);
+                        world.rotation *= Quaternion.AngleAxis(amountPerTick.z * numTicksPassed, Vector3.forward);*/
+                        
+                    
+                    //world.rotation = Quaternion.Euler(_amount);
+                    //MelonLogger.Msg(world.rotation.x + " " + world.rotation.y + " " + world.rotation.z);
                     //world.localRotation = Quaternion.Euler(_amount);
                     break;
                 default:
diff --git a/src/Modifiers/SkyboxColor.cs b/src/Modifiers/SkyboxColor.cs
@@ -18,12 +18,17 @@ public class SkyboxColor : Modifier
         private bool isDefaultEnvironment = false;
         private bool reset;
         private Color defaultColor;
-        public SkyboxColor(ModifierType _type, float _startTick, float _endTick, float r, float g, float b, bool _reset)
+        public SkyboxColor(ModifierType _type, float _amount, float _startTick, float _endTick, float r, float g, float b, bool _reset)
         {
+            if (_amount == 0f) _amount = 1f;
+            Amount = _amount;
             Type = _type;
             StartTick = _startTick;
             EndTick = _endTick;
             reset = _reset;
+            r *= Amount;
+            g *= Amount;
+            b *= Amount;
             targetColor = new Color(r, g, b, defaultColor.a);               
             
             //if (!PlayerPreferences.I.Environment.Get().ToLower().Contains("environment")) targetColor *= .7f;
diff --git a/src/Modifiers/TextPopup.cs b/src/Modifiers/TextPopup.cs

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,12 @@ public static class ApiController`
`16`	`16`	`{`
`17`	`17`	`private static float brightness = RenderSettings.skybox.GetFloat("_Exposure") * 255f;`
`18`	`18`	`private static float red, green, blue = 255f;`
	`19`	`+ private static string eventName = "";`
`19`	`20`	`public static bool isRunning = false;`
`20`		`- public static async void PostAsync(float _red, float _green, float _blue, float _brightness)`
	`21`	`+ private static object token = null;`
	`22`	`+ public static async void PostAsync(float _red, float _green, float _blue, float _brightness, string _eventName)`
`21`	`23`	`{`
`22`		`- string json = $"{{\"red\": {_red}, \"green\": {_green}, \"blue\": {_blue}, \"bright\": {_brightness}}}";`
	`24`	`+ string json = $"{{\"red\": {_red}, \"green\": {_green}, \"blue\": {_blue}, \"bright\": {_brightness}, \"event\": \"{_eventName}\"}}";`
`23`	`25`	`try`
`24`	`26`	`{`
`25`	`27`	`HttpClient client = new HttpClient();`
`@@ -31,14 +33,16 @@ await client.PostAsync(`
`31`	`33`	`{`
`32`	`34`	`MelonLogger.Msg(ex.InnerException.Message);`
`33`	`35`	`}`
`34`		`-`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public static IEnumerator StartPost()`
`38`	`39`	`{`
`39`	`40`	`while (isRunning)`
`40`	`41`	`{`
`41`		`- PostAsync(red, green, blue, brightness);`
	`42`	`+ if(InGameUI.I.mState != InGameUI.State.PausePage)`
	`43`	`+ {`
	`44`	`+ PostAsync(red, green, blue, brightness, eventName);`
	`45`	`+ }`
`42`	`46`	`yield return new WaitForSecondsRealtime(.04f);`
`43`	`47`	`}`
`44`	`48`	`}`
`@@ -47,7 +51,8 @@ private static void Start()`
`47`	`51`	`{`
`48`	`52`	`isRunning = true;`
`49`	`53`	`brightness = RenderSettings.skybox.GetFloat("_Exposure") * 255f;`
`50`		`- MelonCoroutines.Start(StartPost());`
	`54`	`+ eventName = "";`
	`55`	`+ token = MelonCoroutines.Start(StartPost());`
`51`	`56`	`}`
`52`	`57`
`53`	`58`	`public static void SetBrightness(float _brightness)`
`@@ -72,13 +77,28 @@ public static void SetColor(Color color)`
`72`	`77`	`}`
`73`	`78`	`}`
`74`	`79`
	`80`	`+ public static void SetEvent(string _event)`
	`81`	`+ {`
	`82`	`+ if (!Config.postToApi) return;`
	`83`	`+ eventName = _event;`
	`84`	`+ if (!isRunning)`
	`85`	`+ {`
	`86`	`+ Start();`
	`87`	`+ }`
	`88`	`+ }`
	`89`	`+`
`75`	`90`	`public static void TurnOff()`
`76`	`91`	`{`
`77`	`92`	`if (!Config.postToApi) return;`
`78`	`93`	`brightness = 0f;`
	`94`	`+ red = 255f;`
	`95`	`+ green = 255f;`
	`96`	`+ blue = 255;`
`79`	`97`	`red = green = blue = 255f;`
	`98`	`+ eventName = "";`
`80`	`99`	`isRunning = false;`
`81`		`- PostAsync(red, green, blue, brightness);`
	`100`	`+ MelonCoroutines.Stop(token);`
	`101`	`+ PostAsync(red, green, blue, brightness, eventName);`
`82`	`102`	`}`
`83`	`103`	`}`
`84`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class AuthorableModifiersMod : MelonMod`
`21`	`21`	`public static List<Modifier> singleUseModifiers = new List<Modifier>();`
`22`	`22`	`public static Dictionary<int, float> oldOffsetDict = new Dictionary<int, float>();`
`23`	`23`	`public static string audicaFilePath = "";`
`24`		`- public static bool modifiersFound = false;`
	`24`	`+ public static bool modifiersFound { get; set; } = false;`
`25`	`25`
`26`	`26`	`public static Vector3 debugTextPosition = new Vector3(0f, 8f, 8f);`
`27`	`27`
`@@ -43,12 +43,13 @@ public class AuthorableModifiersMod : MelonMod`
`43`	`43`
`44`	`44`	`public static Dictionary<float, DebugTextPopup> popupTextDictionary = new Dictionary<float, DebugTextPopup>();`
`45`	`45`	`public static bool lightshowWasEnabled = false;`
	`46`	`+ public static Vector3 lastRotationEndValue = Vector3.zero;`
`46`	`47`	`public static class BuildInfo`
`47`	`48`	`{`
`48`	`49`	`public const string Name = "AuthorableModifiers"; // Name of the Mod. (MUST BE SET)`
`49`	`50`	`public const string Author = "Continuum"; // Author of the Mod. (Set as null if none)`
`50`	`51`	`public const string Company = null; // Company that made the Mod. (Set as null if none)`
`51`		`- public const string Version = "1.2.6"; // Version of the Mod. (MUST BE SET)`
	`52`	`+ public const string Version = "1.2.7"; // Version of the Mod. (MUST BE SET)`
`52`	`53`	`public const string DownloadLink = null; // Download Link for the Mod. (Set as null if none)`
`53`	`54`	`}`
`54`	`55`
`@@ -113,6 +114,7 @@ public static void LoadModifierCues(bool fromRestart = false)`
`113`	`114`	`modifiersLoaded = true;`
`114`	`115`	`return;`
`115`	`116`	`}`
	`117`	`+ if(fromRestart) AudioDriver.I.Pause();`
`116`	`118`	`awaitEnableModifiers = Decoder.GetModifierCues(audicaFilePath);`
`117`	`119`
`118`	`120`	`if (awaitEnableModifiers is null \|\| (awaitEnableModifiers.Count == 0 && preloadModifiers.Count == 0 && zOffsetList.Count == 0))`
`@@ -124,6 +126,7 @@ public static void LoadModifierCues(bool fromRestart = false)`
`124`	`126`	`{`
`125`	`127`	`ResetArena(true);`
`126`	`128`	`}`
	`129`	`+ if (fromRestart) AudioDriver.I.Resume();`
`127`	`130`	`return;`
`128`	`131`	`}`
`129`	`132`	`SetOldColors(KataConfig.I.leftHandColor, KataConfig.I.rightHandColor);`
`@@ -157,18 +160,20 @@ public static void LoadModifierCues(bool fromRestart = false)`
`157`	`160`	`MelonCoroutines.Start(IWaitForArenaLoad("<color=\"red\">WARNING</color>\nMay contain flashing lights and rotating arenas. \nThis can be disabled in Mod Settings.", .001f));`
`158`	`161`	`//if (endless) MelonCoroutines.Start(StartTimer());`
`159`	`162`	`//else modifiersLoaded = true;`
`160`		`- MelonCoroutines.Start(WaitForArenaSwitch());`
	`163`	`+ MelonCoroutines.Start(WaitForArenaSwitch(fromRestart));`
`161`	`164`	`//modifiersLoaded = true;`
`162`	`165`	`}`
`163`	`166`
`164`		`- private static IEnumerator WaitForArenaSwitch()`
	`167`	`+`
	`168`	`+ private static IEnumerator WaitForArenaSwitch(bool fromRestart)`
`165`	`169`	`{`
`166`	`170`	`while (EnvironmentLoader.I.IsSwitching())`
`167`	`171`	`{`
`168`	`172`	`yield return new WaitForSecondsRealtime(.2f);`
`169`	`173`	`}`
`170`	`174`	`modifiersLoaded = true;`
`171`	`175`	`defaultSkyboxColor = RenderSettings.skybox.GetColor("_Tint");`
	`176`	`+ if (fromRestart) AudioDriver.I.Resume();`
`172`	`177`	`}`
`173`	`178`
`174`	`179`	`private static void EnableAutoLightshow(bool enable)`
`@@ -390,10 +395,21 @@ private static IEnumerator IResetArenaValues(bool resetToUserValues)`
`390`	`395`	`RenderSettings.skybox.SetFloat("_Rotation", rotation);`
`391`	`396`	`ArenaLoaderMod.CurrentSkyboxReflection = 0f;`
`392`	`397`	`ArenaLoaderMod.ChangeReflectionStrength(reflection);`
	`398`	`+ RenderSettings.skybox.SetColor("_Tint", defaultSkyboxColor);`
`393`	`399`	`}`
`394`	`400`
`395`	`401`	`public override void OnUpdate()`
`396`	`402`	`{`
	`403`	`+ /*if (Input.GetKeyDown(KeyCode.L))`
	`404`	`+ {`
	`405`	`+ AutoPlayer.EnableAutoplayer(!AutoPlayer.I.IsAutoPlayerEnabled);`
	`406`	`+ MelonLogger.Msg("Auto player is " + (AutoPlayer.I.IsAutoPlayerEnabled ? "enabled" : "disabled"));`
	`407`	`+`
	`408`	`+ }`
	`409`	`+ if (Input.GetKeyDown(KeyCode.P) && MenuState.sState == MenuState.State.Launched)`
	`410`	`+ {`
	`411`	`+ InGameUI.I.GoToPausePage(true);`
	`412`	`+ }*/`
`397`	`413`	`/*if (Input.GetKeyDown(KeyCode.L))`
`398`	`414`	`{`
`399`	`415`	`ApiController.isRunning = true;`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ public static void OnPreferencesSaved()`
`53`	`53`	`else if (fieldInfo.FieldType == typeof(float)) fieldInfo.SetValue(null, MelonPreferences.GetEntryValue<float>(Category, fieldInfo.Name));`
`54`	`54`	`else if (fieldInfo.FieldType == typeof(string)) fieldInfo.SetValue(null, MelonPreferences.GetEntryValue<string>(Category, fieldInfo.Name));`
`55`	`55`	`}`
`56`		`-`
`57`		`- AuthorableModifiersMod.modifiersFound = false;`
`58`	`56`	`}`
`59`	`57`	`}`
`60`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private static class PatchShowPage`
`67`	`67`	`{`
`68`	`68`	`private static void Postfix(OptionsMenu __instance, OptionsMenu.Page page)`
`69`	`69`	`{`
`70`		`- if (page == OptionsMenu.Page.Main)`
	`70`	`+ if (page == OptionsMenu.Page.Main && !AuthorableModifiersMod.modifiersFound)`
`71`	`71`	`AuthorableModifiersMod.SetUserBrightness(RenderSettings.skybox.GetFloat("_Exposure"), RenderSettings.skybox.GetFloat("_Rotation"), RenderSettings.reflectionIntensity);`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -79,6 +79,7 @@ private static void Postfix(MenuState __instance, MenuState.State state)`
`79`	`79`	`{`
`80`	`80`	`if(state == MenuState.State.SongPage)`
`81`	`81`	`{`
	`82`	`+`
`82`	`83`	`AuthorableModifiersMod.SetEndlessActive(false);`
`83`	`84`	`}`
`84`	`85`	`}`