1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 06:43:21 +08:00

merged sliders

This commit is contained in:
Xexxar 2021-10-21 19:58:41 +00:00
commit 534d1e72ce
2 changed files with 2 additions and 2 deletions

View File

@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
if ((OsuHitObject)lastSlider.NestedHitObjects[i] is SliderTick && i != lastSlider.NestedHitObjects.Count - 1) // Check for tick && not last object is necessary for 2007 bugged sliders. if ((OsuHitObject)lastSlider.NestedHitObjects[i] is SliderTick && i != lastSlider.NestedHitObjects.Count - 1) // Check for tick && not last object is necessary for 2007 bugged sliders.
{ {
Vector2 nextSlider = Vector2.Subtract(((OsuHitObject)lastSlider.NestedHitObjects[i + 1]).StackedPosition, ((OsuHitObject)lastSlider.NestedHitObjects[i]).StackedPosition); Vector2 nextSlider = Vector2.Subtract(((OsuHitObject)lastSlider.NestedHitObjects[i + 1]).StackedPosition, ((OsuHitObject)lastSlider.NestedHitObjects[i]).StackedPosition);
TravelDistance += Vector2.Subtract(nextSlider, currSlider).Length * scalingFactor; TravelDistance += 3 * Math.Max(0, Vector2.Subtract(nextSlider, currSlider).Length - Math.Max(nextSlider.Length, currSlider.Length)) * scalingFactor;
} }
} }

View File

@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private const double wide_angle_multiplier = 1.5; private const double wide_angle_multiplier = 1.5;
private const double acute_angle_multiplier = 1.5; private const double acute_angle_multiplier = 1.5;
private const double slider_multiplier = 2.5; private const double slider_multiplier = 2.0;
private const double vel_change_multiplier = 0.75; private const double vel_change_multiplier = 0.75;
private double currentStrain = 1; private double currentStrain = 1;