Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc

This commit is contained in:
Xexxar 2021-10-21 19:29:30 +00:00
commit b51a8dead5
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 += 2 * Vector2.Subtract(nextSlider, currSlider).Length * scalingFactor; TravelDistance += Vector2.Subtract(nextSlider, 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 = 1.75; private const double slider_multiplier = 2.5;
private const double vel_change_multiplier = 0.75; private const double vel_change_multiplier = 0.75;
private double currentStrain = 1; private double currentStrain = 1;