Skip to content

Clamp pp score params where possible #38219

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

Open
stanriders wants to merge 4 commits into
base: master
Choose a base branch
from
+13 −8
Open

Clamp pp score params where possible #38219

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1768e18
Clamp pp score params where possible
stanriders Jul 3, 2026
7bc33e3
Clamp misses and mania accuracy as well
stanriders Jul 3, 2026
5e4c8cb
`GetValueOrDefault`
stanriders Jul 3, 2026
70bf45a
Missed `using`
stanriders Jul 3, 2026
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
9 changes: 6 additions & 3 deletions osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Difficulty.Utils;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring;
using osu.Game.Scoring.Legacy;
using osu.Game.Utils;
Expand All @@ -31,11 +32,13 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s
{
var catchAttributes = (CatchDifficultyAttributes)attributes;

num300 = score.GetCount300() ?? 0; // HitResult.Great
num300 = score.Statistics[HitResult.Great];
Comment thread
stanriders marked this conversation as resolved.
Outdated
num100 = score.GetCount100() ?? 0; // HitResult.LargeTickHit
num50 = score.GetCount50() ?? 0; // HitResult.SmallTickHit
numKatu = score.GetCountKatu() ?? 0; // HitResult.SmallTickMiss
numMiss = score.GetCountMiss() ?? 0; // HitResult.Miss PLUS HitResult.LargeTickMiss
numMiss = Math.Max(0, score.GetCountMiss() ?? 0); // HitResult.Miss PLUS HitResult.LargeTickMiss

double scoreMaxCombo = Math.Clamp(score.MaxCombo, 0, catchAttributes.MaxCombo);

// We are heavily relying on aim in catch the beat
double value = DiffUtils.Pow(5.0 * Math.Max(1.0, catchAttributes.StarRating / 0.0049) - 4.0, 2.0) / 100000.0;
Expand All @@ -52,7 +55,7 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s

// Combo scaling
if (catchAttributes.MaxCombo > 0)
value *= Math.Min(DiffUtils.Pow(score.MaxCombo, 0.35) / DiffUtils.Pow(catchAttributes.MaxCombo, 0.35), 1.0);
value *= Math.Min(DiffUtils.Pow(scoreMaxCombo, 0.35) / DiffUtils.Pow(catchAttributes.MaxCombo, 0.35), 1.0);

var difficulty = score.BeatmapInfo!.Difficulty.Clone();

Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s
countGood = score.Statistics.GetValueOrDefault(HitResult.Good);
countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
scoreAccuracy = calculateCustomAccuracy();
countMiss = Math.Max(0, score.Statistics.GetValueOrDefault(HitResult.Miss));
scoreAccuracy = Math.Clamp(calculateCustomAccuracy(), 0, 1);

double multiplier = 1.0;

Expand Down
5 changes: 3 additions & 2 deletions osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s
usingClassicSliderAccuracy = score.Mods.OfType<OsuModClassic>().Any(m => m.NoSliderHeadAccuracy.Value);
usingScoreV2 = score.Mods.Any(m => m is ModScoreV2);

accuracy = score.Accuracy;
scoreMaxCombo = score.MaxCombo;
accuracy = Math.Clamp(score.Accuracy, 0, 1);
scoreMaxCombo = Math.Clamp(score.MaxCombo, 0, osuAttributes.MaxCombo);
countGreat = score.Statistics.GetValueOrDefault(HitResult.Great);
countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
Expand Down Expand Up @@ -123,6 +123,7 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s

effectiveMissCount = Math.Max(countMiss, effectiveMissCount);
effectiveMissCount = Math.Min(totalHits, effectiveMissCount);
effectiveMissCount = Math.Max(0, effectiveMissCount);

if (effectiveMissCount > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s
countGreat = score.Statistics.GetValueOrDefault(HitResult.Great);
countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
countMiss = Math.Max(0, score.Statistics.GetValueOrDefault(HitResult.Miss));

clockRate = ModUtils.CalculateRateWithMods(score.Mods);

Expand Down
Loading