Organized a bunch of settings to put them in more obvious locations

YARC-Official · Jan 6, 2025 · 6adff0d · 6adff0d
1 parent 6036757
commit 6adff0d
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 37 deletions.
diff --git a/Assets/Script/Settings/SettingsManager.Settings.cs b/Assets/Script/Settings/SettingsManager.Settings.cs
@@ -66,6 +66,11 @@ public void OpenVenueFolder()
             public ToggleSetting DisablePerSongBackgrounds { get; } = new(false);
             public ToggleSetting WaitForSongVideo { get; } = new(true);
 
+
+            public ToggleSetting VoiceActivatedVocalStarPower { get; } = new(true);
+            public ToggleSetting EnablePracticeSP { get; } = new(false);
+            public SliderSetting PracticeRestartDelay { get; } = new(2f, 0.5f, 5f);
+
             public ToggleSetting ShowBattery { get; } = new(false, ShowBatteryCallback);
             public ToggleSetting ShowTime { get; } = new(false, ShowTimeCallback);
             public ToggleSetting MemoryStats { get; } = new(false, MemoryStatsCallback);
@@ -74,14 +79,8 @@ public void OpenVenueFolder()
 
             public ToggleSetting ReconnectProfiles { get; } = new(true);
 
-            public ToggleSetting UseCymbalModelsInFiveLane { get; } = new(true);
-
             public ToggleSetting ReduceNoteSpeedByDifficulty { get; } = new(true);
-            public SliderSetting KickBounceMultiplier { get; } = new(1f, 0f, 2f);
-
-            public ToggleSetting VoiceActivatedVocalStarPower { get; } = new(true);
 
-            public SliderSetting PracticeRestartDelay { get; } = new(2f, 0.5f, 5f);
             public SliderSetting ShowCursorTimer      { get; } = new(2f, 0f, 5f);
 
             public ToggleSetting PauseOnDeviceDisconnect { get; } = new(true);
@@ -219,9 +218,11 @@ public void OpenVenueFolder()
 
             public SliderSetting SongBackgroundOpacity { get; } = new(1f, 0f, 1f);
 
+            public ToggleSetting UseCymbalModelsInFiveLane { get; } = new(true);
+            public SliderSetting KickBounceMultiplier { get; } = new(1f, 0f, 2f);
+
             public ToggleSetting ShowHitWindow { get; } = new(false, ShowHitWindowCallback);
             public ToggleSetting DisableTextNotifications { get; } = new(false);
-            public ToggleSetting EnablePracticeSP { get; } = new(false);
 
             public DropdownSetting<NoteStreakFrequencyMode> NoteStreakFrequency { get; }
                 = new(NoteStreakFrequencyMode.Frequent)
@@ -231,18 +232,15 @@ public void OpenVenueFolder()
                     NoteStreakFrequencyMode.Disabled
                 };
 
-            public DropdownSetting<SongProgressMode> SongTimeOnScoreBox { get; }
-                = new(SongProgressMode.CountUpOnly)
+            public DropdownSetting<CountdownDisplayMode> CountdownDisplay { get; }
+                = new(CountdownDisplayMode.Measures)
                 {
-                    SongProgressMode.None,
-                    SongProgressMode.CountUpAndTotal,
-                    SongProgressMode.CountDownAndTotal,
-                    SongProgressMode.CountUpOnly,
-                    SongProgressMode.CountDownOnly,
-                    SongProgressMode.TotalOnly
+                    CountdownDisplayMode.Measures,
+                    CountdownDisplayMode.Seconds,
+                    CountdownDisplayMode.Disabled
                 };
 
-            public ToggleSetting GraphicalProgressOnScoreBox { get; } = new(true);
+            public ToggleSetting ShowPlayerNameWhenStartingSong { get; } = new(true);
 
             public DropdownSetting<LyricDisplayMode> LyricDisplay { get; }
                 = new(LyricDisplayMode.Normal)
@@ -255,17 +253,20 @@ public void OpenVenueFolder()
 
             public SliderSetting UpcomingLyricsTime { get; } = new(3f, 0f, 10f);
 
-            public ToggleSetting KeepSongInfoVisible { get; } = new(false);
-
-            public DropdownSetting<CountdownDisplayMode> CountdownDisplay { get; }
-                = new(CountdownDisplayMode.Measures)
+            public DropdownSetting<SongProgressMode> SongTimeOnScoreBox { get; }
+                = new(SongProgressMode.CountUpOnly)
                 {
-                    CountdownDisplayMode.Measures,
-                    CountdownDisplayMode.Seconds,
-                    CountdownDisplayMode.Disabled
+                    SongProgressMode.None,
+                    SongProgressMode.CountUpAndTotal,
+                    SongProgressMode.CountDownAndTotal,
+                    SongProgressMode.CountUpOnly,
+                    SongProgressMode.CountDownOnly,
+                    SongProgressMode.TotalOnly
                 };
 
-            public ToggleSetting ShowPlayerNameWhenStartingSong { get; } = new(true);
+            public ToggleSetting GraphicalProgressOnScoreBox { get; } = new(true);
+
+            public ToggleSetting KeepSongInfoVisible { get; } = new(false);
 
             #endregion
 

diff --git a/Assets/Script/Settings/SettingsManager.cs b/Assets/Script/Settings/SettingsManager.cs
@@ -42,6 +42,11 @@ public static partial class SettingsManager
                 nameof(Settings.DisablePerSongBackgrounds),
                 nameof(Settings.WaitForSongVideo),
 
+                new HeaderMetadata("Gameplay"),
+                nameof(Settings.VoiceActivatedVocalStarPower),
+                nameof(Settings.EnablePracticeSP),
+                nameof(Settings.PracticeRestartDelay),
+
                 new HeaderMetadata("StatusBar"),
                 nameof(Settings.ShowBattery),
                 nameof(Settings.ShowTime),
@@ -52,11 +57,7 @@ public static partial class SettingsManager
 
                 new HeaderMetadata("Other"),
                 nameof(Settings.ReconnectProfiles),
-                nameof(Settings.UseCymbalModelsInFiveLane),
                 nameof(Settings.ReduceNoteSpeedByDifficulty),
-                nameof(Settings.KickBounceMultiplier),
-                nameof(Settings.VoiceActivatedVocalStarPower),
-                nameof(Settings.PracticeRestartDelay),
                 nameof(Settings.ShowCursorTimer),
                 nameof(Settings.PauseOnDeviceDisconnect),
                 nameof(Settings.PauseOnFocusLoss),
@@ -97,16 +98,18 @@ public static partial class SettingsManager
                 new HeaderMetadata("Input"),
                 nameof(Settings.MicrophoneSensitivity),
 
-                new HeaderMetadata("Other"),
+                new HeaderMetadata("Gameplay"),
                 nameof(Settings.MuteOnMiss),
                 nameof(Settings.UseStarpowerFx),
-                // nameof(Settings.UseWhammyFx),
-                // nameof(Settings.WhammyPitchShiftAmount),
-                // nameof(Settings.WhammyOversampleFactor),
                 nameof(Settings.ClapsInStarpower),
                 nameof(Settings.OverstrumAndOverhitSoundEffects),
                 nameof(Settings.AlwaysOnDrumSFX),
+                // nameof(Settings.UseWhammyFx),
+                // nameof(Settings.WhammyPitchShiftAmount),
+                // nameof(Settings.WhammyOversampleFactor),
                 // nameof(Settings.ReverbInStarpower),
+
+                new HeaderMetadata("Other"),
                 nameof(Settings.UseChipmunkSpeed),
                 nameof(Settings.ApplyVolumesInMusicLibrary),
             },
@@ -125,18 +128,21 @@ public static partial class SettingsManager
                 nameof(Settings.StarPowerHighwayFx),
                 nameof(Settings.SongBackgroundOpacity),
 
-                new HeaderMetadata("Other"),
+                new HeaderMetadata("Gameplay"),
+                nameof(Settings.UseCymbalModelsInFiveLane),
+                nameof(Settings.KickBounceMultiplier),
+
+                new HeaderMetadata("HUD"),
                 nameof(Settings.ShowHitWindow),
                 nameof(Settings.DisableTextNotifications),
-                nameof(Settings.EnablePracticeSP),
                 nameof(Settings.NoteStreakFrequency),
+                nameof(Settings.CountdownDisplay),
+                nameof(Settings.ShowPlayerNameWhenStartingSong),
                 nameof(Settings.LyricDisplay),
                 nameof(Settings.UpcomingLyricsTime),
                 nameof(Settings.SongTimeOnScoreBox),
                 nameof(Settings.GraphicalProgressOnScoreBox),
                 nameof(Settings.KeepSongInfoVisible),
-                nameof(Settings.CountdownDisplay),
-                nameof(Settings.ShowPlayerNameWhenStartingSong)
             },
             new PresetsTab("Presets", icon: "Customization"),
             new AllSettingsTab(),

diff --git a/Assets/StreamingAssets/lang/en-US.json b/Assets/StreamingAssets/lang/en-US.json
@@ -480,7 +480,9 @@
             "AdvancedDMXChannels": "Advanced DMX Channels",
             "StatusBar": "Status Bar",
             "AdvancedDMXSettings": "Advanced sACN and DMX settings",
-			"Experimental": "Experimental"
+            "Experimental": "Experimental",
+            "HUD": "HUD",
+            "Gameplay": "Gameplay"
         },
         "Button": {
             "CopyCurrentSongJsonFilePath": "Copy Current Song Json File Path",