Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add drum kick bounce toggle to general settings #437

Merged
merged 8 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Assets/Script/PlayMode/DrumsTrack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down Expand Up @@ -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();
}
}
Expand Down
1 change: 1 addition & 0 deletions Assets/Script/Settings/SettingsManager.Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 1 addition & 0 deletions Assets/Script/Settings/SettingsManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class Tab {
new HeaderMetadata("Other"),
"ShowHitWindow",
"UseCymbalModelsInFiveLane",
"KickBounce",
"AmIAwesome"
}
},
Expand Down
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Settings Shared Data.asset
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Settings_en-US.asset
Original file line number Diff line number Diff line change
Expand Up @@ -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: []