From 2765ffa19093b796b38e8bf0efe3bcd2d7ebb486 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 19 Feb 2019 17:42:24 +0900
Subject: [PATCH] Update with PopulateAttributes() removal

---
 .../Difficulty/CatchDifficultyCalculator.cs   | 25 +++++++++++--------
 .../Preprocessing/CatchDifficultyHitObject.cs |  4 +--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index f8ca066a4f..d29dd4591e 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -12,6 +12,7 @@
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
@@ -30,19 +31,23 @@ public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
             halfCatchWidth = catcher.CatchWidth * 0.5f;
         }
 
-        protected override void PopulateAttributes(DifficultyAttributes attributes, IBeatmap beatmap, Skill[] skills, double timeRate)
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
         {
-            var catchAttributes = (CatchDifficultyAttributes)attributes;
+            if (beatmap.HitObjects.Count == 0)
+                return new CatchDifficultyAttributes();
 
             // this is the same as osu!, so there's potential to share the implementation... maybe
-            double preempt = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / timeRate;
+            double preempt = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / clockRate;
 
-            catchAttributes.StarRating = Math.Sqrt(skills[0].DifficultyValue()) * star_scaling_factor;
-            catchAttributes.ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0;
-            catchAttributes.MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet));
+            return new CatchDifficultyAttributes
+            {
+                StarRating = Math.Sqrt(skills[0].DifficultyValue()) * star_scaling_factor,
+                ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
+                MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet))
+            };
         }
 
-        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double timeRate)
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
             CatchHitObject lastObject = null;
 
@@ -58,13 +63,13 @@ protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(I
                 {
                     // We want to only consider fruits that contribute to the combo. Droplets are addressed as accuracy and spinners are not relevant for "skill" calculations.
                     case Fruit fruit:
-                        yield return new CatchDifficultyHitObject(fruit, lastObject, timeRate, halfCatchWidth);
+                        yield return new CatchDifficultyHitObject(fruit, lastObject, clockRate, halfCatchWidth);
                         lastObject = hitObject;
                         break;
                     case JuiceStream _:
                         foreach (var nested in hitObject.NestedHitObjects.OfType<CatchHitObject>().Where(o => !(o is TinyDroplet)))
                         {
-                            yield return new CatchDifficultyHitObject(nested, lastObject, timeRate, halfCatchWidth);
+                            yield return new CatchDifficultyHitObject(nested, lastObject, clockRate, halfCatchWidth);
                             lastObject = nested;
                         }
                         break;
@@ -76,7 +81,5 @@ protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(I
         {
             new Movement(),
         };
-
-        protected override DifficultyAttributes CreateDifficultyAttributes() => new CatchDifficultyAttributes();
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index 6ce45bbbde..6d00bb27b5 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -24,8 +24,8 @@ public class CatchDifficultyHitObject : DifficultyHitObject
         /// </summary>
         public readonly double StrainTime;
 
-        public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double timeRate, float halfCatcherWidth)
-            : base(hitObject, lastObject, timeRate)
+        public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, float halfCatcherWidth)
+            : base(hitObject, lastObject, clockRate)
         {
             // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
             var scalingFactor = normalized_hitobject_radius / halfCatcherWidth;