diff --git a/MuzikaGromche/Plugin.cs b/MuzikaGromche/Plugin.cs index 93f17b0..329713a 100644 --- a/MuzikaGromche/Plugin.cs +++ b/MuzikaGromche/Plugin.cs @@ -63,7 +63,8 @@ namespace MuzikaGromche public static void StopLightSwitching(MonoBehaviour __instance) { - if (JesterLightSwitching != null) { + if (JesterLightSwitching != null) + { __instance.StopCoroutine(JesterLightSwitching); JesterLightSwitching = null; } @@ -95,9 +96,12 @@ namespace MuzikaGromche Debug.Log("Chose color " + color); SetLightColor(color); i = (i + 1) % colors.Count; - if (CurrentTrack != null) { + if (CurrentTrack != null) + { yield return new WaitForSeconds(60f / CurrentTrack.Bpm); - } else { + } + else + { yield break; } } @@ -107,7 +111,8 @@ namespace MuzikaGromche { string text = Info.Location.TrimEnd((PluginInfo.PLUGIN_NAME + ".dll").ToCharArray()); UnityWebRequest[] requests = new UnityWebRequest[Tracks.Length * 2]; - for (int i = 0; i < Tracks.Length; i++) { + for (int i = 0; i < Tracks.Length; i++) + { Track track = Tracks[i]; requests[i * 2] = UnityWebRequestMultimedia.GetAudioClip($"File://{text}{track.FileNameStart}", track.AudioType); requests[i * 2 + 1] = UnityWebRequestMultimedia.GetAudioClip($"File://{text}{track.FileNameLoop}", track.AudioType); @@ -117,14 +122,18 @@ namespace MuzikaGromche while (!requests.All(request => request.isDone)) { } - if (requests.All(request => request.result == UnityWebRequest.Result.Success)) { - for (int i = 0; i < Tracks.Length; i++) { + if (requests.All(request => request.result == UnityWebRequest.Result.Success)) + { + for (int i = 0; i < Tracks.Length; i++) + { Track track = Tracks[i]; track.LoadedStart = DownloadHandlerAudioClip.GetContent(requests[i * 2]); track.LoadedLoop = DownloadHandlerAudioClip.GetContent(requests[i * 2 + 1]); } new Harmony(PluginInfo.PLUGIN_NAME).PatchAll(typeof(JesterPatch)); - } else { + } + else + { Logger.LogError("Could not load audio file"); } } @@ -177,7 +186,8 @@ namespace MuzikaGromche { __state = new State(); __state.prevStateindex = __instance.previousState; - if (__instance.currentBehaviourStateIndex == 2 && __instance.previousBehaviourStateIndex != 2) { + if (__instance.currentBehaviourStateIndex == 2 && __instance.previousBehaviourStateIndex != 2) + { // if just popped out // then override farAudio so that vanilla logic does not stop the music __state.farAudio = __instance.farAudio;