From af38056d1148cca3196fbc784dda836528109299 Mon Sep 17 00:00:00 2001 From: ivan tkachenko Date: Fri, 23 Jan 2026 00:07:37 +0200 Subject: [PATCH] Merge Config.DisplayLyrics and ReduceVFXIntensity Both are responsible for some sort of VFX. Make the number of options less overwhelming by merging the two into one. --- CHANGELOG.md | 1 + MuzikaGromche/Plugin.cs | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7b2a5d..96cd9ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fixed occasionally broken playback of v1337.9001.67, sorry about that. - Turns out, client-side vanilla-compat mode can never be perfectly timed, so don't expect much without a modded host. - Removed an existing track Yalgaar. +- Merged two config options into one: Reduce Visual Effects & Display Lyrics. ## MuzikaGromche 1337.9001.67 - LocalHost Edition diff --git a/MuzikaGromche/Plugin.cs b/MuzikaGromche/Plugin.cs index 66fdbf8..c12f328 100644 --- a/MuzikaGromche/Plugin.cs +++ b/MuzikaGromche/Plugin.cs @@ -2123,7 +2123,7 @@ namespace MuzikaGromche } // TODO: quick editor - if (Config.DisplayLyrics.Value) + if (!Config.ReduceVFXAndHideLyrics.Value) { var index = loopOffsetSpan.GetLastIndex(track.LyricsTimeSeries); if (index is int i && i < track.LyricsLines.Length) @@ -2141,7 +2141,7 @@ namespace MuzikaGromche if (GetInterpolation(loopOffsetTimestamp, track.DrunknessLoopOffsetTimeSeries, Easing.Linear) is { } drunkness) { - var value = Config.ReduceVFXIntensity.Value ? drunkness * 0.3f : drunkness; + var value = Config.ReduceVFXAndHideLyrics.Value ? drunkness * 0.3f : drunkness; events.Add(new DrunkEvent(value)); } @@ -2531,9 +2531,7 @@ namespace MuzikaGromche class Config { - public static ConfigEntry DisplayLyrics { get; private set; } = null!; - - public static ConfigEntry ReduceVFXIntensity { get; private set; } = null!; + public static ConfigEntry ReduceVFXAndHideLyrics { get; private set; } = null!; public static ConfigEntry AudioOffset { get; private set; } = null!; @@ -2597,13 +2595,9 @@ namespace MuzikaGromche internal Config(ConfigFile configFile) { - DisplayLyrics = configFile.Bind("General", "Display Lyrics", true, - new ConfigDescription("Display lyrics in the HUD tooltip when you hear the music.")); - LethalConfigManager.AddConfigItem(new BoolCheckBoxConfigItem(DisplayLyrics, requiresRestart: false)); - - ReduceVFXIntensity = configFile.Bind("General", "Reduce Visual Effects", false, - new ConfigDescription("Reduce intensity of certain visual effects when you hear the music.")); - LethalConfigManager.AddConfigItem(new BoolCheckBoxConfigItem(ReduceVFXIntensity, requiresRestart: false)); + ReduceVFXAndHideLyrics = configFile.Bind("General", "Reduce Visual Effects, Hide Lyrics", false, + new ConfigDescription("Reduce intensity of certain visual effects, hide lyrics in the HUD tooltip when you hear the music.")); + LethalConfigManager.AddConfigItem(new BoolCheckBoxConfigItem(ReduceVFXAndHideLyrics, requiresRestart: false)); Volume = configFile.Bind("General", "Volume", VolumeDefault, new ConfigDescription("Volume of music played by this mod.", new AcceptableValueRange(VolumeMin, VolumeMax))); @@ -2612,9 +2606,8 @@ namespace MuzikaGromche AudioOffset = configFile.Bind("General", "Audio Offset", 0f, new ConfigDescription( "Adjust audio offset (in seconds).\n\nIf you are playing with Bluetooth headphones and experiencing a visual desync, try setting this to about negative 0.2.\n\nIf your video output has high latency (like a long HDMI cable etc.), try positive values instead.", new AcceptableValueRange(-0.5f, 0.5f))); -#if false // too much configurability - LethalConfigManager.AddConfigItem(new FloatSliderConfigItem(AudioOffset, requiresRestart: false)); -#endif + // too much configurability + LethalConfigManager.SkipAutoGenFor(AudioOffset); SkipExplicitTracks = configFile.Bind("General", "Skip Explicit Tracks", false, new ConfigDescription("When choosing tracks at random, skip the ones with Explicit Content/Lyrics."));