Add drum kick bounce toggle to general settings (#437)

* Update Credits.txt * Added `dev` branch warning to README * add kick bounce toggle --------- Co-authored-by: EliteAsian <lavasnakegaming@gmail.com> Co-authored-by: EliteAsian <29520859+EliteAsian123@users.noreply.github.com>
YARC-Official · Jun 7, 2023 · 56bfba1 · 56bfba1
1 parent 3e5227b
commit 56bfba1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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: []