From 443640a48c8bed53510947240e8337c9350d8d6d Mon Sep 17 00:00:00 2001
From: apollo <83023433+apollo-dw@users.noreply.github.com>
Date: Tue, 4 Jan 2022 16:39:30 +0000
Subject: [PATCH] Revert "Remove abusable 0.66 threshold by averaging"

---
 .../Difficulty/OsuDifficultyAttributes.cs          |  4 ++--
 .../Difficulty/OsuDifficultyCalculator.cs          |  4 ++--
 .../Difficulty/Skills/OsuStrainSkill.cs            | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
index 7ab4232a19..51842f65d5 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
@@ -25,10 +25,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         public double SliderFactor { get; set; }
 
         [JsonProperty("aim_difficult_strain_count")]
-        public double AimDifficultStrainCount { get; set; }
+        public int AimDifficultStrainCount { get; set; }
 
         [JsonProperty("speed_difficult_strain_count")]
-        public double SpeedDifficultStrainCount { get; set; }
+        public int SpeedDifficultStrainCount { get; set; }
 
         [JsonProperty("approach_rate")]
         public double ApproachRate { get; set; }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 3c039c9b7e..27d97e9d75 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -40,8 +40,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
 
-            double aimDifficultyStrainCount = ((OsuStrainSkill)skills[0]).CountDifficultStrains(clockRate);
-            double speedDifficultyStrainCount = ((OsuStrainSkill)skills[2]).CountDifficultStrains(clockRate);
+            int aimDifficultyStrainCount = ((OsuStrainSkill)skills[0]).CountDifficultStrains(clockRate);
+            int speedDifficultyStrainCount = ((OsuStrainSkill)skills[2]).CountDifficultStrains(clockRate);
 
             if (mods.Any(h => h is OsuModRelax))
                 speedRating = 0.0;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
index 46dc9c683b..fd751727a9 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
@@ -59,15 +59,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         }
 
         /// <summary>
-        /// Returns the number of strains above a threshold averaged as the threshold varies.
-        /// The result is scaled by clock rate as it affects the total number of strains.
+        /// Returns the number of difficult strains.
+        /// A strain is considered difficult if it's higher than 66% of the highest strain.
         /// </summary>
-        public double CountDifficultStrains(double clockRate)
+        public int CountDifficultStrains(double clockRate)
         {
-            List<double> strains = GetCurrentStrainPeaks().ToList();
-            // This is the average value of strains.Count(s => s > p * strains.Max()) for p between 0 and 1.
-            double realtimeCount = strains.Sum() / strains.Max();
-            return clockRate * realtimeCount;
+            List<double> strains = GetCurrentStrainPeaks().OrderByDescending(d => d).ToList();
+
+            // Total number of strains in a map can vary by clockrate, and this needs to be corrected for.
+            return (int)(strains.Count(s => s > strains[0] * 0.66) * clockRate);
         }
     }
 }