Merge pull request #25688 from peppy/match-default-sv

Change default slider velocity for new beatmaps to match osu!stable
ppy · Dec 7, 2023 · a500f55 · a500f55
2 parents 6d64538 + 43dc908
commit a500f55
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -63,7 +63,11 @@ protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
                 BeatmapInfo =
                 {
                     Ruleset = ruleset,
-                    Difficulty = new BeatmapDifficulty { CircleSize = 3.6f }
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 3.6f,
+                        SliderMultiplier = 1,
+                    },
                 }
             };
 

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -507,7 +507,11 @@ private void performTest(List<ReplayFrame> frames, Slider? slider = null, double
                     HitObjects = { slider },
                     BeatmapInfo =
                     {
-                        Difficulty = new BeatmapDifficulty { SliderTickRate = tickRate ?? 3 },
+                        Difficulty = new BeatmapDifficulty
+                        {
+                            SliderTickRate = tickRate ?? 3,
+                            SliderMultiplier = 1,
+                        },
                         Ruleset = new OsuRuleset().RulesetInfo,
                     },
                     ControlPointInfo = cpi,

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -31,11 +31,6 @@ internal class TaikoBeatmapConverter : BeatmapConverter<TaikoHitObject>
         /// </summary>
         private const float osu_base_scoring_distance = 100;
 
-        /// <summary>
-        /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
-        /// </summary>
-        private const float taiko_base_distance = 100;
-
         private readonly bool isForCurrentRuleset;
 
         public TaikoBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -198,7 +198,7 @@ public void TestSliderMultiplierAffectsNonRelativeBeatLength()
         {
             var beatmap = createBeatmap();
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            beatmap.Difficulty.SliderMultiplier = 2;
+            beatmap.BeatmapInfo.Difficulty.SliderMultiplier = 2;
 
             createTest(beatmap);
             AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 2000);
@@ -237,7 +237,7 @@ private void assertChildPosition(int index) => AddAssert($"hitobject {index} chi
         });
 
         private void assertPosition(int index, float relativeY) => AddAssert($"hitobject {index} at {relativeY}",
-            () => Precision.AlmostEquals(getDrawableHitObject(index)?.DrawPosition.Y ?? -1, yScale * relativeY));
+            () => getDrawableHitObject(index)?.DrawPosition.Y / yScale ?? -1, () => Is.EqualTo(relativeY).Within(Precision.FLOAT_EPSILON));
 
         private void setTime(double time)
         {
@@ -251,7 +251,17 @@ private void setTime(double time)
         /// <returns>The <see cref="IBeatmap"/>.</returns>
         private IBeatmap createBeatmap(Func<int, TestHitObject> createAction = null)
         {
-            var beatmap = new Beatmap<TestHitObject> { BeatmapInfo = { Ruleset = new OsuRuleset().RulesetInfo } };
+            var beatmap = new Beatmap<TestHitObject>
+            {
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        SliderMultiplier = 1
+                    },
+                    Ruleset = new OsuRuleset().RulesetInfo
+                }
+            };
 
             for (int i = 0; i < 10; i++)
             {

diff --git a/osu.Game/Beatmaps/BeatmapDifficulty.cs b/osu.Game/Beatmaps/BeatmapDifficulty.cs
@@ -18,7 +18,7 @@ public class BeatmapDifficulty : EmbeddedObject, IBeatmapDifficultyInfo
         public float OverallDifficulty { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
         public float ApproachRate { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
 
-        public double SliderMultiplier { get; set; } = 1;
+        public double SliderMultiplier { get; set; } = 1.4;
         public double SliderTickRate { get; set; } = 1;
 
         public BeatmapDifficulty()

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -88,7 +88,7 @@ private void load()
                     Description = EditorSetupStrings.BaseVelocityDescription,
                     Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier)
                     {
-                        Default = 1,
+                        Default = 1.4,
                         MinValue = 0.4,
                         MaxValue = 3.6,
                         Precision = 0.01f,