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

Rewrite drum roll -> hit conversion to match osu-stable.

Browse Source
This commit is contained in:
smoogipooo 2017-04-03 17:20:46 +09:00
parent d7ed392f27
commit 0c57299066
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
View File

@ -18,6 +18,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
{ {
private const float legacy_velocity_scale = 1.4f; private const float legacy_velocity_scale = 1.4f;
private const float bash_convert_factor = 1.65f; private const float bash_convert_factor = 1.65f;
private const float base_scoring_distance = 100;
/// <summary> /// <summary>
/// Drum roll distance that results in a duration of 1 speed-adjusted beat length. /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@ -26,7 +27,6 @@ namespace osu.Game.Modes.Taiko.Beatmaps
public Beatmap<TaikoHitObject> Convert(Beatmap original) public Beatmap<TaikoHitObject> Convert(Beatmap original)
{ {
return new Beatmap<TaikoHitObject>(original) return new Beatmap<TaikoHitObject>(original)
{ {
HitObjects = original.HitObjects.SelectMany(h => convertHitObject(h, original)).ToList() HitObjects = original.HitObjects.SelectMany(h => convertHitObject(h, original)).ToList()
@ -51,17 +51,20 @@ namespace osu.Game.Modes.Taiko.Beatmaps
if (distanceData != null) if (distanceData != null)
{ {
double sv = base_distance * beatmap.BeatmapInfo.Difficulty.SliderMultiplier * beatmap.TimingInfo.BeatLengthAt(obj.StartTime) / 1000;
double l = distanceData.Distance * legacy_velocity_scale;
double v = sv * legacy_velocity_scale;
double bl = beatmap.TimingInfo.BeatLengthAt(obj.StartTime);
int repeats = repeatsData?.RepeatCount ?? 1; int repeats = repeatsData?.RepeatCount ?? 1;
double skipPeriod = Math.Min(bl / beatmap.BeatmapInfo.Difficulty.SliderTickRate, distanceData.Duration / repeats); double speedAdjustedBeatLength = beatmap.TimingInfo.BeatLengthAt(obj.StartTime) * beatmap.TimingInfo.SpeedMultiplierAt(obj.StartTime);
double distance = distanceData.Distance * repeats * legacy_velocity_scale;
if (skipPeriod > 0 && l / v * 1000 < 2 * bl) double taikoVelocity = base_distance * beatmap.BeatmapInfo.Difficulty.SliderMultiplier / speedAdjustedBeatLength * legacy_velocity_scale;
double taikoDuration = distance / taikoVelocity;
double osuVelocity = base_scoring_distance * beatmap.BeatmapInfo.Difficulty.SliderMultiplier / speedAdjustedBeatLength * legacy_velocity_scale;
double osuDuration = distance / osuVelocity;
double skipPeriod = Math.Min(speedAdjustedBeatLength / beatmap.BeatmapInfo.Difficulty.SliderTickRate, taikoDuration / repeats);
if (skipPeriod > 0 && osuDuration < 2 * speedAdjustedBeatLength)
{ {
for (double j = obj.StartTime; j <= distanceData.EndTime + skipPeriod / 8; j += skipPeriod) for (double j = obj.StartTime; j <= distanceData.EndTime + skipPeriod / 8; j += skipPeriod)
{ {