Refactor GetMaxCombo

ppy · Oct 23, 2024 · 6edaf21 · 6edaf21
1 parent 156867c
commit 6edaf21
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 10 deletions.
diff --git a/PerformanceCalculator/Simulate/CatchSimulateCommand.cs b/PerformanceCalculator/Simulate/CatchSimulateCommand.cs
@@ -35,9 +35,6 @@ public class CatchSimulateCommand : SimulateCommand
 
         public override Ruleset Ruleset => new CatchRuleset();
 
-        protected override int GetMaxCombo(IBeatmap beatmap) => beatmap.HitObjects.Count(h => h is Fruit)
-                                                                + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet));
-
         protected override Dictionary<HitResult, int> GenerateHitResults(double accuracy, IBeatmap beatmap, int countMiss, int? countMeh, int? countGood)
         {
             var maxCombo = GetMaxCombo(beatmap);

diff --git a/PerformanceCalculator/Simulate/ManiaSimulateCommand.cs b/PerformanceCalculator/Simulate/ManiaSimulateCommand.cs
@@ -35,8 +35,6 @@ public class ManiaSimulateCommand : SimulateCommand
 
         public override Ruleset Ruleset => new ManiaRuleset();
 
-        protected override int GetMaxCombo(IBeatmap beatmap) => 0;
-
         protected override Dictionary<HitResult, int> GenerateHitResults(double accuracy, IBeatmap beatmap, int countMiss, int? countMeh, int? countGood)
         {
             // One judgement per normal note. Two judgements per hold note (head + tail).

diff --git a/PerformanceCalculator/Simulate/OsuSimulateCommand.cs b/PerformanceCalculator/Simulate/OsuSimulateCommand.cs
@@ -43,8 +43,6 @@ public class OsuSimulateCommand : SimulateCommand
 
         public override Ruleset Ruleset => new OsuRuleset();
 
-        protected override int GetMaxCombo(IBeatmap beatmap) => beatmap.GetMaxCombo();
-
         protected override Dictionary<HitResult, int> GenerateHitResults(double accuracy, IBeatmap beatmap, int countMiss, int? countMeh, int? countGood)
         {
             int countGreat;

diff --git a/PerformanceCalculator/Simulate/SimulateCommand.cs b/PerformanceCalculator/Simulate/SimulateCommand.cs
@@ -83,7 +83,7 @@ public override void Execute()
             OutputPerformance(scoreInfo, performanceAttributes, difficultyAttributes);
         }
 
-        protected abstract int GetMaxCombo(IBeatmap beatmap);
+        protected static int GetMaxCombo(IBeatmap beatmap) => beatmap.GetMaxCombo();
 
         protected abstract Dictionary<HitResult, int> GenerateHitResults(double accuracy, IBeatmap beatmap, int countMiss, int? countMeh, int? countGood);
 

diff --git a/PerformanceCalculator/Simulate/TaikoSimulateCommand.cs b/PerformanceCalculator/Simulate/TaikoSimulateCommand.cs
@@ -31,8 +31,6 @@ public class TaikoSimulateCommand : SimulateCommand
 
         public override Ruleset Ruleset => new TaikoRuleset();
 
-        protected override int GetMaxCombo(IBeatmap beatmap) => beatmap.HitObjects.OfType<Hit>().Count();
-
         protected override Dictionary<HitResult, int> GenerateHitResults(double accuracy, IBeatmap beatmap, int countMiss, int? countMeh, int? countGood)
         {
             var totalResultCount = GetMaxCombo(beatmap);