sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-27 14:18:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

new slider travel dist algorithm

Browse Source
This commit is contained in:
Xexxar 2021-10-21 16:08:35 +00:00
parent bef6e100fa
commit 4fe007aa2e
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,10 +86,36 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
if (lastObject is Slider lastSlider) if (lastObject is Slider lastSlider)
{ {
computeSliderCursorPosition(lastSlider); computeSliderCursorPosition(lastSlider);
TravelDistance = lastSlider.LazyTravelDistance * scalingFactor; 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 - TravelTime, 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;
for (int i = 1; i < lastSlider.NestedHitObjects.Count; i++)
{
if ((OsuHitObject)lastSlider.NestedHitObjects[i] is SliderRepeat)
repeatCount++;
Vector2 currSlider = Vector2.Subtract(((OsuHitObject)lastSlider.NestedHitObjects[i]).StackedPosition, ((OsuHitObject)lastSlider.NestedHitObjects[i - 1]).StackedPosition);
if ((OsuHitObject)lastSlider.NestedHitObjects[i] is SliderRepeat && (OsuHitObject)lastSlider.NestedHitObjects[i - 1] is SliderRepeat)
TravelDistance += Math.Max(0, currSlider.Length * scalingFactor - 240);
else if ((OsuHitObject)lastSlider.NestedHitObjects[i] is SliderEndCircle || (OsuHitObject)lastSlider.NestedHitObjects[i] is SliderRepeat)
TravelDistance += Math.Max(0, currSlider.Length * scalingFactor - 100);
else
TravelDistance += Vector2.Subtract(((OsuHitObject)lastSlider.NestedHitObjects[i]).StackedPosition, ((OsuHitObject)lastSlider.NestedHitObjects[i - 1]).StackedPosition).Length * scalingFactor;
if ((OsuHitObject)lastSlider.NestedHitObjects[i] is SliderTick && i != lastSlider.NestedHitObjects.Count - 1) // For some unknown reason to me sliders can have a tick as the last object
{
Vector2 nextSlider = Vector2.Subtract(((OsuHitObject)lastSlider.NestedHitObjects[i + 1]).StackedPosition, ((OsuHitObject)lastSlider.NestedHitObjects[i]).StackedPosition);
TravelDistance += 2 * Vector2.Subtract(nextSlider, currSlider).Length * scalingFactor;
}
}
TravelDistance *= Math.Sqrt(1 + repeatCount);
TravelDistance *= Math.Max(0, Math.Min(TravelTime, lastSlider.SpanDuration - 50)) / lastSlider.SpanDuration;
} }
Vector2 lastCursorPosition = getEndCursorPosition(lastObject); Vector2 lastCursorPosition = getEndCursorPosition(lastObject);

4
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.75; private const double slider_multiplier = 1.75;
private double currentStrain = 1; private double currentStrain = 1;
@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
} }
} }
if (osuCurrObj.TravelDistance != 0) if (osuCurrObj.TravelTime != 0)
{ {
sliderBonus = osuCurrObj.TravelDistance / osuCurrObj.TravelTime; // add some slider rewards sliderBonus = osuCurrObj.TravelDistance / osuCurrObj.TravelTime; // add some slider rewards
} }