ratijas
/
muzika-gromche
forked from nikita/muzika-gromche
1
0
Fork 0
Code Pull Requests Activity

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.
This commit is contained in:
ivan tkachenko 2026-01-23 00:07:37 +02:00
parent 567597e353
commit af38056d11
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
- Fixed occasionally broken playback of v1337.9001.67, sorry about that. - 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. - 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. - Removed an existing track Yalgaar.
- Merged two config options into one: Reduce Visual Effects & Display Lyrics.
## MuzikaGromche 1337.9001.67 - LocalHost Edition ## MuzikaGromche 1337.9001.67 - LocalHost Edition

23
MuzikaGromche/Plugin.cs
View File

@ -2123,7 +2123,7 @@ namespace MuzikaGromche
} }
// TODO: quick editor // TODO: quick editor
if (Config.DisplayLyrics.Value) if (!Config.ReduceVFXAndHideLyrics.Value)
{ {
var index = loopOffsetSpan.GetLastIndex(track.LyricsTimeSeries); var index = loopOffsetSpan.GetLastIndex(track.LyricsTimeSeries);
if (index is int i && i < track.LyricsLines.Length) if (index is int i && i < track.LyricsLines.Length)
@ -2141,7 +2141,7 @@ namespace MuzikaGromche
if (GetInterpolation(loopOffsetTimestamp, track.DrunknessLoopOffsetTimeSeries, Easing.Linear) is { } drunkness) 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)); events.Add(new DrunkEvent(value));
} }
@ -2531,9 +2531,7 @@ namespace MuzikaGromche
class Config class Config
{ {
public static ConfigEntry<bool> DisplayLyrics { get; private set; } = null!; public static ConfigEntry<bool> ReduceVFXAndHideLyrics { get; private set; } = null!;
public static ConfigEntry<bool> ReduceVFXIntensity { get; private set; } = null!;
public static ConfigEntry<float> AudioOffset { get; private set; } = null!; public static ConfigEntry<float> AudioOffset { get; private set; } = null!;
@ -2597,13 +2595,9 @@ namespace MuzikaGromche
internal Config(ConfigFile configFile) internal Config(ConfigFile configFile)
{ {
DisplayLyrics = configFile.Bind("General", "Display Lyrics", true, ReduceVFXAndHideLyrics = configFile.Bind("General", "Reduce Visual Effects, Hide Lyrics", false,
new ConfigDescription("Display lyrics in the HUD tooltip when you hear the music.")); new ConfigDescription("Reduce intensity of certain visual effects, hide lyrics in the HUD tooltip when you hear the music."));
LethalConfigManager.AddConfigItem(new BoolCheckBoxConfigItem(DisplayLyrics, requiresRestart: false)); LethalConfigManager.AddConfigItem(new BoolCheckBoxConfigItem(ReduceVFXAndHideLyrics, 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));
Volume = configFile.Bind("General", "Volume", VolumeDefault, Volume = configFile.Bind("General", "Volume", VolumeDefault,
new ConfigDescription("Volume of music played by this mod.", new AcceptableValueRange<float>(VolumeMin, VolumeMax))); new ConfigDescription("Volume of music played by this mod.", new AcceptableValueRange<float>(VolumeMin, VolumeMax)));
@ -2612,9 +2606,8 @@ namespace MuzikaGromche
AudioOffset = configFile.Bind("General", "Audio Offset", 0f, new ConfigDescription( 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.", "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<float>(-0.5f, 0.5f))); new AcceptableValueRange<float>(-0.5f, 0.5f)));
#if false // too much configurability // too much configurability
LethalConfigManager.AddConfigItem(new FloatSliderConfigItem(AudioOffset, requiresRestart: false)); LethalConfigManager.SkipAutoGenFor(AudioOffset);
#endif
SkipExplicitTracks = configFile.Bind("General", "Skip Explicit Tracks", false, SkipExplicitTracks = configFile.Bind("General", "Skip Explicit Tracks", false,
new ConfigDescription("When choosing tracks at random, skip the ones with Explicit Content/Lyrics.")); new ConfigDescription("When choosing tracks at random, skip the ones with Explicit Content/Lyrics."));