h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 10:22:54 +08:00
Code Issues Releases Wiki Activity

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

Browse Source 
Change default slider velocity for new beatmaps to match osu!stable
This commit is contained in:
Dean Herbert 2023-12-07 11:52:16 +09:00 committed by GitHub
commit a500f55ec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
View File

@ -63,7 +63,11 @@ namespace osu.Game.Rulesets.Catch.Tests
BeatmapInfo = BeatmapInfo =
{ {
Ruleset = ruleset, Ruleset = ruleset,
Difficulty = new BeatmapDifficulty { CircleSize = 3.6f } Difficulty = new BeatmapDifficulty
{
CircleSize = 3.6f,
SliderMultiplier = 1,
},
} }
}; };

6
osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
View File

@ -507,7 +507,11 @@ namespace osu.Game.Rulesets.Osu.Tests
HitObjects = { slider }, HitObjects = { slider },
BeatmapInfo = BeatmapInfo =
{ {
Difficulty = new BeatmapDifficulty { SliderTickRate = tickRate ?? 3 }, Difficulty = new BeatmapDifficulty
{
SliderTickRate = tickRate ?? 3,
SliderMultiplier = 1,
},
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
}, },
ControlPointInfo = cpi, ControlPointInfo = cpi,

5
osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
View File

@ -31,11 +31,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
/// </summary> /// </summary>
private const float osu_base_scoring_distance = 100; 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; private readonly bool isForCurrentRuleset;
public TaikoBeatmapConverter(IBeatmap beatmap, Ruleset ruleset) public TaikoBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)

16
osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
View File

@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
var beatmap = createBeatmap(); var beatmap = createBeatmap();
beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range }); beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
beatmap.Difficulty.SliderMultiplier = 2; beatmap.BeatmapInfo.Difficulty.SliderMultiplier = 2;
createTest(beatmap); createTest(beatmap);
AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 2000); AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 2000);
@ -237,7 +237,7 @@ namespace osu.Game.Tests.Visual.Gameplay
}); });
private void assertPosition(int index, float relativeY) => AddAssert($"hitobject {index} at {relativeY}", 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) private void setTime(double time)
{ {
@ -251,7 +251,17 @@ namespace osu.Game.Tests.Visual.Gameplay
/// <returns>The <see cref="IBeatmap"/>.</returns> /// <returns>The <see cref="IBeatmap"/>.</returns>
private IBeatmap createBeatmap(Func<int, TestHitObject> createAction = null) 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++) for (int i = 0; i < 10; i++)
{ {

2
osu.Game/Beatmaps/BeatmapDifficulty.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Beatmaps
public float OverallDifficulty { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY; public float OverallDifficulty { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
public float ApproachRate { 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 double SliderTickRate { get; set; } = 1;
public BeatmapDifficulty() public BeatmapDifficulty()

2
osu.Game/Screens/Edit/Setup/DifficultySection.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Screens.Edit.Setup
Description = EditorSetupStrings.BaseVelocityDescription, Description = EditorSetupStrings.BaseVelocityDescription,
Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier) Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier)
{ {
Default = 1, Default = 1.4,
MinValue = 0.4, MinValue = 0.4,
MaxValue = 3.6, MaxValue = 3.6,
Precision = 0.01f, Precision = 0.01f,