Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix taiko slider multiplier being applied twice #2568

Merged
merged 3 commits into from May 18, 2018
Merged

Fix taiko slider multiplier being applied twice #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9ed976
Fix taiko slider multiplier being applied twice
smoogipoo May 17, 2018
532d65f
Re-enable basic taiko beatmap conversion tests
smoogipoo May 17, 2018
14d67e0
Merge branch 'master' into fix-taiko-slider-multiplier
peppy May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@ internal class TaikoBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
protected override string ResourceAssembly => "osu.Game.Rulesets.Taiko";

[NonParallelizable]
[TestCase("basic", false), Ignore("See: https://github.com/ppy/osu/issues/2152")]
[TestCase("slider-generating-drumroll", false)]
[TestCase("basic")]
[TestCase("slider-generating-drumroll")]
public new void Test(string name)
{
base.Test(name);
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
View file
Open in desktop
Expand Up @@ -98,12 +98,12 @@ protected override IEnumerable<TaikoHitObject> ConvertHitObject(HitObject obj, I
double distance = distanceData.Distance * spans * legacy_velocity_multiplier;

// The velocity of the taiko hit object - calculated as the velocity of a drum roll
double taikoVelocity = taiko_base_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * legacy_velocity_multiplier / speedAdjustedBeatLength;
double taikoVelocity = taiko_base_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / speedAdjustedBeatLength;
// The duration of the taiko hit object
double taikoDuration = distance / taikoVelocity;

// The velocity of the osu! hit object - calculated as the velocity of a slider
double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * legacy_velocity_multiplier / speedAdjustedBeatLength;
double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / speedAdjustedBeatLength;
// The duration of the osu! hit object
double osuDuration = distance / osuVelocity;

Expand Down