h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00
Code Issues Releases Wiki Activity

Fix CI issues

Browse Source
This commit is contained in:
smoogipoo 2021-09-16 14:20:42 +09:00
parent 2dd9d457e8
commit 7976442aec
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
View File

@ -43,6 +43,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
return 0; return 0;
var osuCurrent = (OsuDifficultyHitObject)current; var osuCurrent = (OsuDifficultyHitObject)current;
var osuPrevious = Previous.Count > 0 ? (OsuDifficultyHitObject)Previous[0] : null;
double distance = Math.Min(single_spacing_threshold, osuCurrent.TravelDistance + osuCurrent.JumpDistance); double distance = Math.Min(single_spacing_threshold, osuCurrent.TravelDistance + osuCurrent.JumpDistance);
double strainTime = osuCurrent.StrainTime; double strainTime = osuCurrent.StrainTime;
@ -51,10 +52,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
double speedWindowRatio = strainTime / greatWindowFull; double speedWindowRatio = strainTime / greatWindowFull;
// Aim to nerf cheesy rhythms (Very fast consecutive doubles with large deltatimes between) // Aim to nerf cheesy rhythms (Very fast consecutive doubles with large deltatimes between)
if (Previous.Count > 0 && strainTime < greatWindowFull && (Previous[0] as OsuDifficultyHitObject).StrainTime > strainTime) if (osuPrevious != null && strainTime < greatWindowFull && osuPrevious.StrainTime > strainTime)
{ strainTime = Interpolation.Lerp(osuPrevious.StrainTime, strainTime, speedWindowRatio);
strainTime = Interpolation.Lerp((Previous[0] as OsuDifficultyHitObject).StrainTime, strainTime, speedWindowRatio);
}
// Cap deltatime to the OD 300 hitwindow. // Cap deltatime to the OD 300 hitwindow.
// 0.93 is derived from making sure 260bpm OD8 streams aren't nerfed harshly, whilst 0.92 limits the effect of the cap. // 0.93 is derived from making sure 260bpm OD8 streams aren't nerfed harshly, whilst 0.92 limits the effect of the cap.
@ -81,9 +80,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
} }
return (1 + (speedBonus - 1) * 0.75) return (1 + (speedBonus - 1) * 0.75)
* angleBonus * angleBonus
* (0.95 + speedBonus * Math.Pow(distance / single_spacing_threshold, 3.5)) * (0.95 + speedBonus * Math.Pow(distance / single_spacing_threshold, 3.5))
/ strainTime; / strainTime;
} }
} }
} }