RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-25 07:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed curve to linear OD + acc based curve

Browse Source
This commit is contained in:
Xexxar 2020-12-09 11:57:01 -06:00
parent cfc34a63bd
commit 05ad9aae8d
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
View File

@ -121,13 +121,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
: 0.0); : 0.0);
} }
// Scale the aim value with accuracy _alot_ // Scale the aim value with accuracy and OD
if (accuracy > .8) aimValue *= .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
else
aimValue *= accuracy * (.5 / .8);
// It is important to also consider accuracy difficulty when doing that
aimValue *= 0.975 + Math.Pow(Attributes.OverallDifficulty, 2) / 2000;
return aimValue; return aimValue;
} }
@ -157,13 +152,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
if (mods.Any(m => m is OsuModHidden)) if (mods.Any(m => m is OsuModHidden))
speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate); speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
// Scale the speed value with accuracy _alot_ // Scale the speed value with accuracy and OD
if (accuracy > .8) speedValue *= .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
else
speedValue *= accuracy * (.5 / .8);
// It is important to also consider accuracy difficulty when doing that
speedValue *= 0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 1000;
return speedValue; return speedValue;
} }