h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Code Issues Releases Wiki Activity

Merge pull request #24165 from bdach/generate-ticks-dropped

Browse Source
This commit is contained in:
Dean Herbert 2023-07-09 09:34:34 +09:00 committed by GitHub
commit 40f537ea00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
View File

@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests
[TestCase("uneven-repeat-slider")]
[TestCase("old-stacking")]
[TestCase("multi-segment-slider")]
[TestCase("nan-slider")]
public void Test(string name) => base.Test(name);
protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)

1
osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
View File

@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Osu.Tests
[TestCase(6.7115569159190587d, 206, "diffcalc-test")]
[TestCase(1.4391311903612753d, 45, "zero-length-sliders")]
[TestCase(0.14102693012101306d, 1, "nan-slider")]
public void Test(double expectedStarRating, int expectedMaxCombo, string name)
=> base.Test(expectedStarRating, expectedMaxCombo, name);

1
osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json Executable file
View File

@ -0,0 +1 @@
{"Mappings":[{"StartTime":77497.0,"Objects":[{"StartTime":77497.0,"EndTime":77497.0,"X":298.0,"Y":290.0},{"StartTime":77533.0,"EndTime":77533.0,"X":276.162567,"Y":293.0336}]}]}

18
osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider.osu Executable file
View File

@ -0,0 +1,18 @@
osu file format v14
[Difficulty]
HPDrainRate:5.8
CircleSize:4
OverallDifficulty:9.6
ApproachRate:10
SliderMultiplier:2
SliderTickRate:1
[TimingPoints]
77211,-100,4,3,50,70,0,0
77497,8.40402703648439,4,3,51,70,1,8
77497,NaN,4,3,51,70,0,8
77498,285.714285714286,4,3,51,70,1,0
[HitObjects]
298,290,77497,6,0,B|234:298|192:279|192:279|180:299|180:299|205:311|238:318|238:318|230:347|217:371|217:371|137:370|80:340|80:340|65:259|73:143|102:68|102:68|149:49|199:34|199:34|213:54|213:54|267:38|324:40|324:40|332:18|332:18|385:20|435:27|435:27|480:93|517:204|521:286|521:286|474:329|396:350|396:350|377:329|363:302|363:302|393:287|415:271|415:271|398:254|398:254|362:282|299:290,1,1723.66345596313,10|0,1:0|3:0,3:0:0:0:

4
osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
/// <summary>
/// Legacy osu! Slider-type, used for parsing Beatmaps.
/// </summary>
internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo
internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo, IHasGenerateTicks
{
public Vector2 Position { get; set; }
@ -20,5 +20,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
public bool NewCombo { get; set; }
public int ComboOffset { get; set; }
public bool GenerateTicks { get; set; } = true;
}
}