h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 03:22:55 +08:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xexxar 2021-10-21 21:38:37 +00:00
commit ce8899e7c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
computeSliderCursorPosition(lastSlider); computeSliderCursorPosition(lastSlider);
TravelDistance = 0; TravelDistance = 0;
TravelTime = Math.Max(lastSlider.LazyTravelTime / clockRate, min_delta_time); TravelTime = Math.Max(lastSlider.LazyTravelTime / clockRate, min_delta_time);
MovementTime = Math.Max(StrainTime - TravelTime, min_delta_time); MovementTime = Math.Max(StrainTime - lastSlider.LazyTravelTime / clockRate, min_delta_time);
MovementDistance = Vector2.Subtract(lastSlider.TailCircle.StackedPosition, BaseObject.StackedPosition).Length * scalingFactor; MovementDistance = Vector2.Subtract(lastSlider.TailCircle.StackedPosition, BaseObject.StackedPosition).Length * scalingFactor;
int repeatCount = 0; int repeatCount = 0;
@ -112,13 +112,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
} }
} }
TravelDistance *= Math.Max(0, Math.Min(TravelTime, lastSlider.SpanDuration - 50)) / lastSlider.SpanDuration; TravelDistance *= Math.Pow(1 + repeatCount, 1.0 / 3.0);
TravelDistance *= Math.Max(0, lastSlider.SpanDuration - 37.5) / lastSlider.SpanDuration;
} }
Vector2 lastCursorPosition = getEndCursorPosition(lastObject); Vector2 lastCursorPosition = getEndCursorPosition(lastObject);
JumpDistance = (BaseObject.StackedPosition * scalingFactor - lastCursorPosition * scalingFactor).Length; JumpDistance = (BaseObject.StackedPosition * scalingFactor - lastCursorPosition * scalingFactor).Length;
MovementDistance = Math.Min(JumpDistance, MovementDistance); MovementDistance = Math.Max(0, Math.Min(JumpDistance, MovementDistance) - 50);
if (lastLastObject != null && !(lastLastObject is Spinner)) if (lastLastObject != null && !(lastLastObject is Spinner))
{ {

2
osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
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.0; private const double slider_multiplier = 1.75;
private const double vel_change_multiplier = 0.75; private const double vel_change_multiplier = 0.75;
private double currentStrain = 1; private double currentStrain = 1;