From e31e10d616e02fd0570c0a230f29e2fa30ee5089 Mon Sep 17 00:00:00 2001
From: finadoggie <75299710+Finadoggie@users.noreply.github.com>
Date: Sun, 20 Oct 2024 21:46:12 -0700
Subject: [PATCH] merge effectivemisscount functions having two functions was
 unnecessary

---
 .../Difficulty/OsuPerformanceCalculator.cs    | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 778e80c5c4..2c82df8bec 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             {
                 countSliderEndsDropped = osuAttributes.SliderCount - score.Statistics.GetValueOrDefault(HitResult.SliderTailHit);
                 countLargeTickMiss = score.Statistics.GetValueOrDefault(HitResult.LargeTickMiss);
-                effectiveMissCount = calculateEffectiveLazerMissCount(osuAttributes);
+                effectiveMissCount = calculateEffectiveMissCount(osuAttributes);
             }
 
             double multiplier = PERFORMANCE_BASE_MULTIPLIER;
@@ -259,36 +259,39 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         private double calculateEffectiveMissCount(OsuDifficultyAttributes attributes)
         {
-            // Guess the number of misses + slider breaks from combo
-            double comboBasedMissCount = 0.0;
-
-            if (attributes.SliderCount > 0)
+            if (usingClassicSliderAccuracy)
             {
-                double fullComboThreshold = attributes.MaxCombo - 0.1 * attributes.SliderCount;
-                if (scoreMaxCombo < fullComboThreshold)
-                    comboBasedMissCount = fullComboThreshold / Math.Max(1.0, scoreMaxCombo);
+                // Guess the number of misses + slider breaks from combo
+                double comboBasedMissCount = 0.0;
+
+                if (attributes.SliderCount > 0)
+                {
+                    double fullComboThreshold = attributes.MaxCombo - 0.1 * attributes.SliderCount;
+                    if (scoreMaxCombo < fullComboThreshold)
+                        comboBasedMissCount = fullComboThreshold / Math.Max(1.0, scoreMaxCombo);
+                }
+
+                // Clamp miss count to maximum amount of possible breaks
+                comboBasedMissCount = Math.Min(comboBasedMissCount, countOk + countMeh + countMiss);
+
+                return Math.Max(countMiss, comboBasedMissCount);
             }
-
-            // Clamp miss count to maximum amount of possible breaks
-            comboBasedMissCount = Math.Min(comboBasedMissCount, countOk + countMeh + countMiss);
-
-            return Math.Max(countMiss, comboBasedMissCount);
-        }
-        private double calculateEffectiveLazerMissCount(OsuDifficultyAttributes attributes)
-        {
-            // Cap LargeTickMisses to avoid buzz sliders giving high miss counts
-            // Uses very similar formula to calculateEffectiveMissCount(), but utilizes osu!lazer's extra data
-            double comboBasedMissCount = 0.0;
-
-            if (attributes.SliderCount > 0)
+            else
             {
-                comboBasedMissCount = (attributes.MaxCombo - countSliderEndsDropped) / Math.Max(1.0, scoreMaxCombo);
+                // Cap LargeTickMisses to avoid buzz sliders giving high miss counts
+                // Uses very similar formula to calculateEffectiveMissCount(), but utilizes osu!lazer's extra data
+                double comboBasedMissCount = 0.0;
+
+                if (attributes.SliderCount > 0)
+                {
+                    comboBasedMissCount = (attributes.MaxCombo - countSliderEndsDropped) / Math.Max(1.0, scoreMaxCombo);
+                }
+
+                // Clamp miss count to maximum amount of possible breaks
+                comboBasedMissCount = Math.Min(comboBasedMissCount, countOk + countMeh + countMiss + countLargeTickMiss);
+
+                return Math.Max(countMiss, comboBasedMissCount);
             }
-
-            // Clamp miss count to maximum amount of possible breaks
-            comboBasedMissCount = Math.Min(comboBasedMissCount, countOk + countMeh + countMiss + countLargeTickMiss);
-
-            return Math.Max(countMiss, comboBasedMissCount);
         }
 
         // Miss penalty assumes that a player will miss on the hardest parts of a map,