diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index ed0fe17e27..90cf09dce1 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.MenuParallax, true);
// Gameplay
- SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.8f, 0, 1);
+ SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.2f, 0, 1);
SetDefault(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
SetDefault(OsuSetting.LightenDuringBreaks, true);
@@ -109,7 +109,6 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.ShowHealthDisplayWhenCantFail, true);
SetDefault(OsuSetting.FadePlayfieldWhenHealthLow, true);
SetDefault(OsuSetting.KeyOverlay, false);
- SetDefault(OsuSetting.PositionalHitSounds, true);
SetDefault(OsuSetting.AlwaysPlayFirstComboBreak, true);
SetDefault(OsuSetting.FloatingComments, false);
@@ -254,7 +253,6 @@ namespace osu.Game.Configuration
ShowStoryboard,
PositionalHitsoundsLevel,
KeyOverlay,
- PositionalHitSounds,
AlwaysPlayFirstComboBreak,
FloatingComments,
HUDVisibilityMode,
diff --git a/osu.Game/Localisation/AudioSettingsStrings.cs b/osu.Game/Localisation/AudioSettingsStrings.cs
index a55816b401..ba48c412c4 100644
--- a/osu.Game/Localisation/AudioSettingsStrings.cs
+++ b/osu.Game/Localisation/AudioSettingsStrings.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Localisation
///
/// "Master"
///
- public static LocalisableString PositionalLevel => new TranslatableString(getKey(@"positional_hitsound_audio_level"), @"Positional hitsound audio level.");
+ public static LocalisableString PositionalLevel => new TranslatableString(getKey(@"positional_hitsound_audio_level"), @"Positional hitsound audio level");
///
/// "Level"
diff --git a/osu.Game/Localisation/GameplaySettingsStrings.cs b/osu.Game/Localisation/GameplaySettingsStrings.cs
index fa92187650..84c3704e26 100644
--- a/osu.Game/Localisation/GameplaySettingsStrings.cs
+++ b/osu.Game/Localisation/GameplaySettingsStrings.cs
@@ -84,11 +84,6 @@ namespace osu.Game.Localisation
///
public static LocalisableString AlwaysShowKeyOverlay => new TranslatableString(getKey(@"key_overlay"), @"Always show key overlay");
- ///
- /// "Positional hitsounds"
- ///
- public static LocalisableString PositionalHitsounds => new TranslatableString(getKey(@"positional_hitsounds"), @"Positional hitsounds");
-
///
/// "Always play first combo break sound"
///
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs
index 9e677943c2..a5c5399e98 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs
@@ -24,12 +24,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
{
positionalHitsoundsLevel = osuConfig.GetBindable(OsuSetting.PositionalHitsoundsLevel);
Children = new Drawable[]
- {
- new SettingsCheckbox
- {
- LabelText = GameplaySettingsStrings.PositionalHitsounds,
- Current = config.GetBindable(OsuSetting.PositionalHitSounds)
- },
+ {
positionalHitsoundsSettings = new FillFlowContainer>
{
Direction = FillDirection.Vertical,
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 601756485b..ea153bd0e6 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -124,10 +124,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
public readonly Bindable StartTimeBindable = new Bindable();
private readonly BindableList samplesBindable = new BindableList();
- private readonly Bindable userPositionalHitSounds = new Bindable();
- private readonly Bindable positionalHitsoundsLevel = new Bindable();
- private readonly Bindable comboIndexBindable = new Bindable();
+ private readonly Bindable positionalHitsoundsLevel = new Bindable(); private readonly Bindable comboIndexBindable = new Bindable();
private readonly Bindable comboIndexWithOffsetsBindable = new Bindable();
protected override bool RequiresChildrenUpdate => true;
@@ -170,7 +168,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, ISkinSource skinSource)
{
- config.BindWith(OsuSetting.PositionalHitSounds, userPositionalHitSounds);
config.BindWith(OsuSetting.PositionalHitsoundsLevel, positionalHitsoundsLevel);
// Explicit non-virtual function call.
@@ -535,9 +532,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// The lookup X position. Generally should be .
protected double CalculateSamplePlaybackBalance(double position)
{
+ double returnedvalue;
float balance_adjust_amount = positionalHitsoundsLevel.Value*2;
-
- return balance_adjust_amount * (true ? position - 0.5f : 0);
+ returnedvalue = balance_adjust_amount *(position - 0.5f );
+
+ return returnedvalue;
}
///