Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement total SR formula that better correlates with pp #13986

Merged
merged 10 commits into from
Sep 15, 2021
Merged

Implement total SR formula that better correlates with pp #13986

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b31fef7
Implement total SR formula that better correlates with pp
Fr0stium Jul 22, 2021
5b5cf30
Fix incorrect performance formula
Fr0stium Jul 31, 2021
ea2ef55
Remove unnecessary whitespace
bdach Aug 1, 2021
c371e67
Update diffcalc test to match ground-truth formula
bdach Aug 1, 2021
db1f43f
Multiply star rating by a constant
Fr0stium Aug 3, 2021
2196ae9
Merge branch 'master' into display-sr-changes
smoogipoo Aug 11, 2021
0d2ab55
Update SR values in tests
smoogipoo Aug 11, 2021
81ced68
Merge branch 'master' into display-sr-changes
smoogipoo Sep 14, 2021
3df4cbc
Reduce precision of difficulty calculator tests
smoogipoo Sep 14, 2021
5ea1924
Merge branch 'master' into display-sr-changes
smoogipoo Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat

double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier;
double speedRating = Math.Sqrt(skills[1].DifficultyValue()) * difficulty_multiplier;
double starRating = aimRating + speedRating + Math.Abs(aimRating - speedRating) / 2;

double baseAimPerformance = Math.Pow(5 * Math.Max(1, aimRating) - 4, 3) / 100000;
double baseSpeedPerformance = Math.Pow(5 * Math.Max(1, speedRating) - 4, 3) / 100000;
Fr0stium marked this conversation as resolved.
Show resolved Hide resolved
double basePerformance = Math.Pow(Math.Pow(baseAimPerformance, 1.1) + Math.Pow(baseSpeedPerformance, 1.1), 1 / 1.1);
double starRating = basePerformance > 0.00001 ? 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4) : 0;

HitWindows hitWindows = new OsuHitWindows();
hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
Expand Down