From c46a5d5b08e2ec85a7558bec85ad50fd2fb557f8 Mon Sep 17 00:00:00 2001 From: Jonathon Fitch Date: Mon, 4 Apr 2022 18:44:01 +0100 Subject: [PATCH] Allow Technicolor to be used on maps that use Chroma, but don't define a color for items --- Technicolor/HarmonyPatches/TechniBomb.cs | 2 +- Technicolor/HarmonyPatches/TechniLights.cs | 6 +++--- Technicolor/TechnicolorController.cs | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Technicolor/HarmonyPatches/TechniBomb.cs b/Technicolor/HarmonyPatches/TechniBomb.cs index 235352a..06b1ba9 100644 --- a/Technicolor/HarmonyPatches/TechniBomb.cs +++ b/Technicolor/HarmonyPatches/TechniBomb.cs @@ -19,7 +19,7 @@ private TechniBomb(BombColorizerManager manager, Config config) [AffinityPatch(typeof(BombNoteController), nameof(BombNoteController.Init))] private void Colorize(BombNoteController __instance, NoteData noteData) { - _manager.Colorize(__instance, TechnicolorController.GetTechnicolor( + _manager.GlobalColorize(TechnicolorController.GetTechnicolor( true, noteData.time + __instance.GetInstanceID(), _config.TechnicolorBombsStyle)); diff --git a/Technicolor/HarmonyPatches/TechniLights.cs b/Technicolor/HarmonyPatches/TechniLights.cs index e4ea9f1..93e79b3 100644 --- a/Technicolor/HarmonyPatches/TechniLights.cs +++ b/Technicolor/HarmonyPatches/TechniLights.cs @@ -35,7 +35,7 @@ private bool Colorize(ChromaLightSwitchEventEffect __instance, BasicBeatmapEvent foreach (ILightWithId light in lightColorizer.Lights) { Color color = TechnicolorController.GetTechnicolor(warm, beatmapEventData.time + light.GetHashCode(), _config.TechnicolorLightsStyle); - lightColorizer.Colorize(false, color, color, color, color); + lightColorizer.Colorize(true, color, color, color, color); __instance.Refresh(true, new[] { light }, beatmapEventData); } @@ -53,11 +53,11 @@ private bool Colorize(ChromaLightSwitchEventEffect __instance, BasicBeatmapEvent switch (_config.TechnicolorLightsGrouping) { case TechnicolorLightsGrouping.ISOLATED_GROUP: - lightColorizer.Colorize(false, color, color, color, color); + lightColorizer.Colorize(true, color, color, color, color); break; default: - _manager.GlobalColorize(false, color, color, color, color); + _manager.GlobalColorize(true, color, color, color, color); break; } } diff --git a/Technicolor/TechnicolorController.cs b/Technicolor/TechnicolorController.cs index 66bc31a..3fd37c9 100644 --- a/Technicolor/TechnicolorController.cs +++ b/Technicolor/TechnicolorController.cs @@ -1,4 +1,6 @@ using System.ComponentModel; +using System.Reflection; +using Heck.Module; using Technicolor.Managers; using UnityEngine; using Random = System.Random;