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

Jump to bottom

Include sliders in accuracy pp if slider head accuracy is in use #27063

Merged
merged 10 commits into from
Oct 7, 2024
+6 −0
Merged

Include sliders in accuracy pp if slider head accuracy is in use #27063

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ccb14f
include slider count in accuracy pp if slider head accuracy is in use
tsunyoku Feb 6, 2024
b272252
Merge branch 'master' into account-for-sliders-in-accuracy-pp
bdach May 31, 2024
fcc8e7b
Invert condition to reduce number of brain flips required
smoogipoo Jul 16, 2024
ced11e6
Even better readability
smoogipoo Jul 16, 2024
132931f
Create variable to check if using slideracc
Finadoggie Sep 27, 2024
7a849c7
Fix formatting
Finadoggie Sep 27, 2024
9b1ae2f
fix the code such that it actually works when testing it
Finadoggie Sep 27, 2024
7cfc389
remove double-negative on `usingClassicSliderHeadAccuracy`
tsunyoku Oct 4, 2024
2d26941
Merge pull request #2 from Finadoggie/patch-1
tsunyoku Oct 4, 2024
707c237
Merge branch 'master' into account-for-sliders-in-accuracy-pp
bdach Oct 7, 2024
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: 6 additions & 0 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 @@ -16,6 +16,8 @@ public class OsuPerformanceCalculator : PerformanceCalculator
{
public const double PERFORMANCE_BASE_MULTIPLIER = 1.15; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things.

private bool usingClassicSliderAccuracy;

private double accuracy;
private int scoreMaxCombo;
private int countGreat;
Expand All @@ -34,6 +36,8 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s
{
var osuAttributes = (OsuDifficultyAttributes)attributes;

usingClassicSliderAccuracy = score.Mods.OfType<OsuModClassic>().Any(m => m.NoSliderHeadAccuracy.Value);

accuracy = score.Accuracy;
scoreMaxCombo = score.MaxCombo;
countGreat = score.Statistics.GetValueOrDefault(HitResult.Great);
Expand Down Expand Up @@ -193,6 +197,8 @@ private double computeAccuracyValue(ScoreInfo score, OsuDifficultyAttributes att
// This percentage only considers HitCircles of any value - in this part of the calculation we focus on hitting the timing hit window.
double betterAccuracyPercentage;
int amountHitObjectsWithAccuracy = attributes.HitCircleCount;
if (!usingClassicSliderAccuracy)
amountHitObjectsWithAccuracy += attributes.SliderCount;

if (amountHitObjectsWithAccuracy > 0)
betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countOk * 2 + countMeh) / (double)(amountHitObjectsWithAccuracy * 6);
Expand Down
Loading