Merge pull request #17324 from frenzibyte/score-panel-max-combo

Display beatmap maximum combo next to score combo in results panel

osu.Game.Tests/Resources/TestResources.cs

@@ -133,6 +133,7 @@ namespace osu.Game.Tests.Resources
                         StarRating = diff,
                         Length = length,
                         BPM = bpm,
+                        MaxCombo = 1000,
                         Hash = Guid.NewGuid().ToString().ComputeMD5Hash(),
                         Ruleset = rulesetInfo,
                         Metadata = metadata,

osu.Game/Rulesets/Scoring/HitResult.cs

@@ -122,19 +122,33 @@ namespace osu.Game.Rulesets.Scoring
     public static class HitResultExtensions
     {
         /// <summary>
-        /// Whether a <see cref="HitResult"/> increases/decreases the combo, and affects the combo portion of the score.
+        /// Whether a <see cref="HitResult"/> increases the combo.
         /// </summary>
-        public static bool AffectsCombo(this HitResult result)
+        public static bool IncreasesCombo(this HitResult result)
         {
             switch (result)
             {
-                case HitResult.Miss:
                 case HitResult.Meh:
                 case HitResult.Ok:
                 case HitResult.Good:
                 case HitResult.Great:
                 case HitResult.Perfect:
                 case HitResult.LargeTickHit:
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> breaks the combo and resets it back to zero.
+        /// </summary>
+        public static bool BreaksCombo(this HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Miss:
                 case HitResult.LargeTickMiss:
                     return true;
 
@@ -143,6 +157,12 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> increases/breaks the combo, and affects the combo portion of the score.
+        /// </summary>
+        public static bool AffectsCombo(this HitResult result)
+            => IncreasesCombo(result) || BreaksCombo(result);
+
         /// <summary>
         /// Whether a <see cref="HitResult"/> affects the accuracy portion of the score.
         /// </summary>

osu.Game/Rulesets/Scoring/ScoreProcessor.cs

@@ -166,20 +166,10 @@ namespace osu.Game.Rulesets.Scoring
             if (!result.Type.IsScorable())
                 return;
 
-            if (result.Type.AffectsCombo())
+            if (result.Type.IncreasesCombo())
-            {
+                Combo.Value++;
-                switch (result.Type)
+            else if (result.Type.BreaksCombo())
-                {
+                Combo.Value = 0;
-                    case HitResult.Miss:
-                    case HitResult.LargeTickMiss:
-                        Combo.Value = 0;
-                        break;
-
-                    default:
-                        Combo.Value++;
-                        break;
-                }
-            }
 
             double scoreIncrease = result.Type.IsHit() ? result.Judgement.NumericResultFor(result) : 0;
 

osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs

@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             var topStatistics = new List<StatisticDisplay>
             {
                 new AccuracyStatistic(score.Accuracy),
-                new ComboStatistic(score.MaxCombo, !score.Statistics.TryGetValue(HitResult.Miss, out int missCount) || missCount == 0),
+                new ComboStatistic(score.MaxCombo, beatmap.MaxCombo, score.Statistics.All(stat => !stat.Key.BreaksCombo() || stat.Value == 0)),
                 new PerformanceStatistic(score),
             };
 

osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs

@@ -25,9 +25,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         /// Creates a new <see cref="ComboStatistic"/>.
         /// </summary>
         /// <param name="combo">The combo to be displayed.</param>
+        /// <param name="maxCombo">The maximum value of <paramref name="combo"/>.</param>
         /// <param name="isPerfect">Whether this is a perfect combo.</param>
-        public ComboStatistic(int combo, bool isPerfect)
+        public ComboStatistic(int combo, int? maxCombo, bool isPerfect)
-            : base("combo", combo)
+            : base("combo", combo, maxCombo)
         {
             this.isPerfect = isPerfect;
         }