h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-05 09:42:54 +08:00
Code Issues Releases Wiki Activity

Add hitwindow-based aim velocity decrease

Browse Source
This commit is contained in:
StanR 2024-11-28 02:54:07 +05:00
parent d58be00a6e
commit bcebe9662c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
View File

@ -38,9 +38,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
const int radius = OsuDifficultyHitObject.NORMALISED_RADIUS;
const int diameter = OsuDifficultyHitObject.NORMALISED_DIAMETER;
// We take only half of the hitwindow since hitting an object earlier is actually harder
double hitWindow = ((OsuDifficultyHitObject)current).HitWindowGreat * 0.5;
// Calculate the velocity to the current hitobject, which starts with a base distance / time assuming the last object is a hitcircle.
double currVelocity = osuCurrObj.LazyJumpDistance / osuCurrObj.StrainTime;
// Calculate velocity with hitwindow leeway added to the strain time
double currHitWindowPenalizedVelocity = osuCurrObj.LazyJumpDistance / (osuCurrObj.StrainTime + hitWindow);
// But if the last object is a slider, then we extend the travel velocity through the slider into the current object.
if (osuLastObj.BaseObject is Slider && withSliderTravelDistance)
{
@ -52,6 +58,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
// As above, do the same for the previous hitobject.
double prevVelocity = osuLastObj.LazyJumpDistance / osuLastObj.StrainTime;
double prevHitWindowPenalizedVelocity = osuLastObj.LazyJumpDistance / (osuCurrObj.StrainTime + hitWindow);
if (osuLastLastObj.BaseObject is Slider && withSliderTravelDistance)
{
@ -78,7 +85,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
double lastLastAngle = osuLastLastObj.Angle.Value;
// Rewarding angles, take the smaller velocity as base.
double angleBonus = Math.Min(currVelocity, prevVelocity);
// This includes hitwindow-penalized velocity since you can always hit one object earlier and another later withing the bounds of the 300 hitwindow
double angleBonus = Math.Min(Math.Min(currHitWindowPenalizedVelocity, prevHitWindowPenalizedVelocity), Math.Min(currVelocity, prevVelocity));
wideAngleBonus = calcWideAngleBonus(currAngle);