diff --git a/Assets/Script/PlayMode/DrumsTrack.cs b/Assets/Script/PlayMode/DrumsTrack.cs index b80d10ca3..99f173c88 100644 --- a/Assets/Script/PlayMode/DrumsTrack.cs +++ b/Assets/Script/PlayMode/DrumsTrack.cs @@ -300,7 +300,7 @@ private void DrumHitAction(int drum, bool cymbal) { // otherwise only play it when actually hitting a kick if (Chart.Count < 1 || CurrentTime < Chart[0].time || CurrentTime >= Chart[^1].time) { commonTrack.kickFlash.PlayAnimation(); - if (shakeOnKick) { + if (shakeOnKick && SettingsManager.Settings.KickBounce.Data) { trackAnims.PlayKickShakeCameraAnim(); } } @@ -333,7 +333,7 @@ private void DrumHitAction(int drum, bool cymbal) { // Play kick flash/shake if (note.fret == kickIndex) { commonTrack.kickFlash.PlayAnimation(); - if (shakeOnKick) { + if (shakeOnKick && SettingsManager.Settings.KickBounce.Data) { trackAnims.PlayKickShakeCameraAnim(); } } diff --git a/Assets/Script/Settings/SettingsManager.Settings.cs b/Assets/Script/Settings/SettingsManager.Settings.cs index b433eed70..4bdfee8a8 100644 --- a/Assets/Script/Settings/SettingsManager.Settings.cs +++ b/Assets/Script/Settings/SettingsManager.Settings.cs @@ -37,6 +37,7 @@ public class SettingContainer { public ToggleSetting UseCymbalModelsInFiveLane { get; private set; } = new(true); public ToggleSetting NoKicks { get; private set; } = new(false); + public ToggleSetting KickBounce { get; private set; } = new(true); public ToggleSetting AntiGhosting { get; private set; } = new(true); public VolumeSetting MasterMusicVolume { get; private set; } = new(0.75f,v => VolumeCallback(SongStem.Master, v)); diff --git a/Assets/Script/Settings/SettingsManager.cs b/Assets/Script/Settings/SettingsManager.cs index a9acf0280..d21539c93 100644 --- a/Assets/Script/Settings/SettingsManager.cs +++ b/Assets/Script/Settings/SettingsManager.cs @@ -38,6 +38,7 @@ public class Tab { new HeaderMetadata("Other"), "ShowHitWindow", "UseCymbalModelsInFiveLane", + "KickBounce", "AmIAwesome" } }, diff --git a/Assets/Settings/Localization/Settings Shared Data.asset b/Assets/Settings/Localization/Settings Shared Data.asset index b900ae90f..c8d82e1d6 100644 --- a/Assets/Settings/Localization/Settings Shared Data.asset +++ b/Assets/Settings/Localization/Settings Shared Data.asset @@ -295,6 +295,10 @@ MonoBehaviour: m_Key: TrackFadeSize m_Metadata: m_Items: [] + - m_Id: 26591864540614656 + m_Key: KickBounce + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Settings_en-US.asset b/Assets/Settings/Localization/Settings_en-US.asset index 5c02f640d..84d9bd672 100644 --- a/Assets/Settings/Localization/Settings_en-US.asset +++ b/Assets/Settings/Localization/Settings_en-US.asset @@ -298,6 +298,10 @@ MonoBehaviour: m_Localized: Fade Size m_Metadata: m_Items: [] + - m_Id: 26591864540614656 + m_Localized: Drum Kick Bounce + m_Metadata: + m_Items: [] references: version: 2 RefIds: []