mirror of
https://github.com/ppy/osu
synced 2024-12-23 23:33:36 +00:00
Remove "allow slider ball tinting" ruleset setting
This commit is contained in:
parent
1b45014ff6
commit
093ed8421e
@ -18,7 +18,6 @@ namespace osu.Game.Rulesets.Osu.Configuration
|
||||
base.InitialiseDefaults();
|
||||
Set(OsuRulesetSetting.SnakingInSliders, true);
|
||||
Set(OsuRulesetSetting.SnakingOutSliders, true);
|
||||
Set(OsuRulesetSetting.AlwaysTintSliderBall, true);
|
||||
Set(OsuRulesetSetting.ShowCursorTrail, true);
|
||||
}
|
||||
}
|
||||
@ -27,7 +26,6 @@ namespace osu.Game.Rulesets.Osu.Configuration
|
||||
{
|
||||
SnakingInSliders,
|
||||
SnakingOutSliders,
|
||||
AlwaysTintSliderBall,
|
||||
ShowCursorTrail
|
||||
}
|
||||
}
|
||||
|
@ -109,7 +109,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
||||
{
|
||||
config?.BindWith(OsuRulesetSetting.SnakingInSliders, Body.SnakingIn);
|
||||
config?.BindWith(OsuRulesetSetting.SnakingOutSliders, Body.SnakingOut);
|
||||
config?.BindWith(OsuRulesetSetting.AlwaysTintSliderBall, alwaysTintSliderBall);
|
||||
|
||||
positionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
|
||||
scaleBindable.BindValueChanged(scale =>
|
||||
@ -124,12 +123,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
||||
|
||||
pathBindable.BindValueChanged(_ => Body.Refresh());
|
||||
|
||||
alwaysTintSliderBall.BindValueChanged(_ => updateSliderBallTint());
|
||||
|
||||
AccentColour.BindValueChanged(colour =>
|
||||
{
|
||||
Body.AccentColour = colour.NewValue;
|
||||
updateSliderBallTint();
|
||||
|
||||
foreach (var drawableHitObject in NestedHitObjects)
|
||||
drawableHitObject.AccentColour.Value = colour.NewValue;
|
||||
@ -181,14 +177,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
||||
Body.AccentColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderTrackOverride)?.Value ?? AccentColour.Value;
|
||||
Body.BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
|
||||
|
||||
allowSliderBallTint = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.AllowSliderBallTint)?.Value ?? false;
|
||||
updateSliderBallTint();
|
||||
bool allowBallTint = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.AllowSliderBallTint)?.Value ?? false;
|
||||
Ball.Colour = allowBallTint ? AccentColour.Value : Color4.White;
|
||||
}
|
||||
|
||||
private void updatePathRadius() => Body.PathRadius = slider.Scale * sliderPathRadius;
|
||||
|
||||
private void updateSliderBallTint() => Ball.Colour = (alwaysTintSliderBall.Value || allowSliderBallTint) ? AccentColour.Value : Color4.White;
|
||||
|
||||
protected override void CheckForResult(bool userTriggered, double timeOffset)
|
||||
{
|
||||
if (userTriggered || Time.Current < slider.EndTime)
|
||||
|
@ -35,11 +35,6 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
Bindable = config.GetBindable<bool>(OsuRulesetSetting.SnakingOutSliders)
|
||||
},
|
||||
new SettingsCheckbox
|
||||
{
|
||||
LabelText = "Always tint slider ball with combo colour",
|
||||
Bindable = config.GetBindable<bool>(OsuRulesetSetting.AlwaysTintSliderBall)
|
||||
},
|
||||
new SettingsCheckbox
|
||||
{
|
||||
LabelText = "Cursor trail",
|
||||
Bindable = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
|
||||
|
Loading…
Reference in New Issue
Block a user