sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix distance object conversion not calculating end time.

Browse Source
This commit is contained in:
smoogipooo
2017-05-18 14:08:32 +09:00
parent 6010243736
commit 6dae5cbacf
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Rulesets.Mania/Beatmaps/DistanceObjectConversion.cs
View File

@ -17,6 +17,11 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
{ {
internal class DistanceObjectConversion : ObjectConversion internal class DistanceObjectConversion : ObjectConversion
{ {
/// <summary>
/// Base osu! slider scoring distance.
/// </summary>
private const float osu_base_scoring_distance = 100;
private readonly HitObject originalObject; private readonly HitObject originalObject;
private readonly double endTime; private readonly double endTime;
@ -39,8 +44,20 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
var distanceData = originalObject as IHasDistance; var distanceData = originalObject as IHasDistance;
var repeatsData = originalObject as IHasRepeats; var repeatsData = originalObject as IHasRepeats;
endTime = distanceData?.EndTime ?? 0;
repeatCount = repeatsData?.RepeatCount ?? 1; repeatCount = repeatsData?.RepeatCount ?? 1;
double speedAdjustment = beatmap.TimingInfo.SpeedMultiplierAt(originalObject.StartTime);
double speedAdjustedBeatLength = beatmap.TimingInfo.BeatLengthAt(originalObject.StartTime) * speedAdjustment;
// The true distance, accounting for any repeats. This ends up being the drum roll distance later
double distance = distanceData.Distance * repeatCount;
// The velocity of the osu! hit object - calculated as the velocity of a slider
double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.Difficulty.SliderMultiplier / speedAdjustedBeatLength;
// The duration of the osu! hit object
double osuDuration = distance / osuVelocity;
endTime = originalObject.StartTime + osuDuration;
} }
public override ObjectList Generate() public override ObjectList Generate()