diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs index 88d295561e..283fe594ea 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs @@ -93,9 +93,9 @@ namespace osu.Game.Tests.Visual.Gameplay private IList testControlPoints => new List { - new MultiplierControlPoint(time_range) { EffectPoint = { ApproachRate = 1.25 } }, - new MultiplierControlPoint(1.5 * time_range) { EffectPoint = { ApproachRate = 1 } }, - new MultiplierControlPoint(2 * time_range) { EffectPoint = { ApproachRate = 1.5 } } + new MultiplierControlPoint(time_range) { EffectPoint = { ScrollSpeed = 1.25 } }, + new MultiplierControlPoint(1.5 * time_range) { EffectPoint = { ScrollSpeed = 1 } }, + new MultiplierControlPoint(2 * time_range) { EffectPoint = { ScrollSpeed = 1.5 } } }; [Test] diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs index a7423e4710..7f550a52fc 100644 --- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs +++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs @@ -13,7 +13,7 @@ namespace osu.Game.Beatmaps.ControlPoints { KiaiModeBindable = { Disabled = true }, OmitFirstBarLineBindable = { Disabled = true }, - ApproachRateBindable = { Disabled = true } + ScrollSpeedBindable = { Disabled = true } }; /// @@ -22,9 +22,9 @@ namespace osu.Game.Beatmaps.ControlPoints public readonly BindableBool OmitFirstBarLineBindable = new BindableBool(); /// - /// The relative approach rate at this control point. + /// The relative scroll speed at this control point. /// - public readonly BindableDouble ApproachRateBindable = new BindableDouble(1) + public readonly BindableDouble ScrollSpeedBindable = new BindableDouble(1) { Precision = 0.01, Default = 1, @@ -33,12 +33,12 @@ namespace osu.Game.Beatmaps.ControlPoints }; /// - /// The relative approach rate. + /// The relative scroll speed. /// - public double ApproachRate + public double ScrollSpeed { - get => ApproachRateBindable.Value; - set => ApproachRateBindable.Value = value; + get => ScrollSpeedBindable.Value; + set => ScrollSpeedBindable.Value = value; } public override Color4 GetRepresentingColour(OsuColour colours) => colours.Purple; @@ -71,13 +71,13 @@ namespace osu.Game.Beatmaps.ControlPoints && existing is EffectControlPoint existingEffect && KiaiMode == existingEffect.KiaiMode && OmitFirstBarLine == existingEffect.OmitFirstBarLine - && ApproachRate == existingEffect.ApproachRate; + && ScrollSpeed == existingEffect.ScrollSpeed; public override void CopyFrom(ControlPoint other) { KiaiMode = ((EffectControlPoint)other).KiaiMode; OmitFirstBarLine = ((EffectControlPoint)other).OmitFirstBarLine; - ApproachRate = ((EffectControlPoint)other).ApproachRate; + ScrollSpeed = ((EffectControlPoint)other).ScrollSpeed; base.CopyFrom(other); } diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs index c19ab0fca9..d075af291c 100644 --- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs +++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs @@ -387,7 +387,7 @@ namespace osu.Game.Beatmaps.Formats { KiaiMode = kiaiMode, OmitFirstBarLine = omitFirstBarSignature, - ApproachRate = speedMultiplier, + ScrollSpeed = speedMultiplier, }, timingChange); addControlPoint(time, new LegacySampleControlPoint diff --git a/osu.Game/Rulesets/Timing/MultiplierControlPoint.cs b/osu.Game/Rulesets/Timing/MultiplierControlPoint.cs index d5d1c849ec..23325bcd13 100644 --- a/osu.Game/Rulesets/Timing/MultiplierControlPoint.cs +++ b/osu.Game/Rulesets/Timing/MultiplierControlPoint.cs @@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Timing /// /// The aggregate multiplier which this provides. /// - public double Multiplier => Velocity * EffectPoint.ApproachRate * BaseBeatLength / TimingPoint.BeatLength; + public double Multiplier => Velocity * EffectPoint.ScrollSpeed * BaseBeatLength / TimingPoint.BeatLength; /// /// The base beat length to scale the provided multiplier relative to.