From f958010d29ae5040c37b89e88f00fc29e1123d12 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 26 Apr 2022 04:52:48 +0300
Subject: [PATCH 1/2] Fix `AccuracyCircle` storing accuracy values in `float`

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs      | 12 ++++++------
 .../Screens/Ranking/Expanded/Accuracy/RankBadge.cs   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index e50520e0ca..b9248bd67e 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -212,12 +212,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     Padding = new MarginPadding { Vertical = -15, Horizontal = -20 },
                     Children = new[]
                     {
-                        new RankBadge(1f, getRank(ScoreRank.X)),
-                        new RankBadge(0.95f, getRank(ScoreRank.S)),
-                        new RankBadge(0.9f, getRank(ScoreRank.A)),
-                        new RankBadge(0.8f, getRank(ScoreRank.B)),
-                        new RankBadge(0.7f, getRank(ScoreRank.C)),
-                        new RankBadge(0.35f, getRank(ScoreRank.D)),
+                        new RankBadge(1, getRank(ScoreRank.X)),
+                        new RankBadge(0.95, getRank(ScoreRank.S)),
+                        new RankBadge(0.9, getRank(ScoreRank.A)),
+                        new RankBadge(0.8, getRank(ScoreRank.B)),
+                        new RankBadge(0.7, getRank(ScoreRank.C)),
+                        new RankBadge(0.35, getRank(ScoreRank.D)),
                     }
                 },
                 rankText = new RankText(score.Rank)
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
index 76cd408daa..d0b79aa4c7 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// <summary>
         /// The accuracy value corresponding to the <see cref="ScoreRank"/> displayed by this badge.
         /// </summary>
-        public readonly float Accuracy;
+        public readonly double Accuracy;
 
         private readonly ScoreRank rank;
 
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// </summary>
         /// <param name="accuracy">The accuracy value corresponding to <paramref name="rank"/>.</param>
         /// <param name="rank">The <see cref="ScoreRank"/> to be displayed in this <see cref="RankBadge"/>.</param>
-        public RankBadge(float accuracy, ScoreRank rank)
+        public RankBadge(double accuracy, ScoreRank rank)
         {
             Accuracy = accuracy;
             this.rank = rank;
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
             base.Update();
 
             // Starts at -90deg (top) and moves counter-clockwise by the accuracy
-            rankContainer.Position = circlePosition(-MathF.PI / 2 - (1 - Accuracy) * MathF.PI * 2);
+            rankContainer.Position = circlePosition(-MathF.PI / 2 - (1 - (float)Accuracy) * MathF.PI * 2);
         }
 
         private Vector2 circlePosition(float t)

From 7d3249019887d1ee8ce62f61c7e17d92e55908e0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 26 Apr 2022 04:55:27 +0300
Subject: [PATCH 2/2] Change score accuracy grading logic to be inclusive

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 1e268bb2eb..1dd1d1aeb6 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -375,13 +375,13 @@ namespace osu.Game.Rulesets.Scoring
         {
             if (acc == 1)
                 return ScoreRank.X;
-            if (acc > 0.95)
+            if (acc >= 0.95)
                 return ScoreRank.S;
-            if (acc > 0.9)
+            if (acc >= 0.9)
                 return ScoreRank.A;
-            if (acc > 0.8)
+            if (acc >= 0.8)
                 return ScoreRank.B;
-            if (acc > 0.7)
+            if (acc >= 0.7)
                 return ScoreRank.C;
 
             return ScoreRank.D;