Merge pull request #29640 from smoogipoo/mania-imperfect-ss

Make mania award SS even if there are GREAT judgements
ppy · Nov 22, 2024 · 6a0ac4c · 6a0ac4c
2 parents 66be38b + d97a94a
commit 6a0ac4c
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 1 deletion.
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaScoreProcessorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaScoreProcessorTest.cs
@@ -0,0 +1,39 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class ManiaScoreProcessorTest
+    {
+        [TestCase(ScoreRank.X, 1, HitResult.Perfect)]
+        [TestCase(ScoreRank.X, 0.99, HitResult.Great)]
+        [TestCase(ScoreRank.D, 0.1, HitResult.Great)]
+        [TestCase(ScoreRank.X, 0.99, HitResult.Perfect, HitResult.Great)]
+        [TestCase(ScoreRank.X, 0.99, HitResult.Great, HitResult.Great)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Good)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Ok)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Meh)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Miss)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Good)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Ok)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Meh)]
+        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Miss)]
+        public void TestRanks(ScoreRank expected, double accuracy, params HitResult[] results)
+        {
+            var scoreProcessor = new ManiaScoreProcessor();
+
+            Dictionary<HitResult, int> resultsDict = new Dictionary<HitResult, int>();
+            foreach (var result in results)
+                resultsDict[result] = resultsDict.GetValueOrDefault(result) + 1;
+
+            Assert.That(scoreProcessor.RankFromScore(accuracy, resultsDict), Is.EqualTo(expected));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -9,6 +9,7 @@
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
 {
@@ -58,6 +59,24 @@ private int getBaseComboScoreForResult(HitResult result)
             return GetBaseScoreForResult(result);
         }
 
+        public override ScoreRank RankFromScore(double accuracy, IReadOnlyDictionary<HitResult, int> results)
+        {
+            ScoreRank rank = base.RankFromScore(accuracy, results);
+
+            if (rank != ScoreRank.S)
+                return rank;
+
+            // SS is expected as long as all hitobjects have been hit with either a GREAT or PERFECT result.
+
+            bool anyImperfect =
+                results.GetValueOrDefault(HitResult.Good) > 0
+                || results.GetValueOrDefault(HitResult.Ok) > 0
+                || results.GetValueOrDefault(HitResult.Meh) > 0
+                || results.GetValueOrDefault(HitResult.Miss) > 0;
+
+            return anyImperfect ? rank : ScoreRank.X;
+        }
+
         private class JudgementOrderComparer : IComparer<HitObject>
         {
             public static readonly JudgementOrderComparer DEFAULT = new JudgementOrderComparer();

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -298,7 +298,7 @@ protected override void LoadComplete()
                 {
                     foreach (var badge in badges)
                     {
-                        if (badge.Accuracy > score.Accuracy)
+                        if (badge.Rank > score.Rank)
                             continue;
 
                         using (BeginDelayedSequence(