pass mods to reading eval instead of bool

kwotaq · Jan 28, 2025 · a0ec153 · a0ec153
1 parent 5ef9631
commit a0ec153
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs
@@ -3,9 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
@@ -16,7 +18,7 @@ public static class ReadingEvaluator
     {
         private const double reading_window_size = 3000;
 
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, bool hidden)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current, IReadOnlyList<Mod> mods)
         {
             if (current.BaseObject is Spinner || current.Index == 0)
                 return 0;
@@ -44,6 +46,8 @@ public static double EvaluateDifficultyOf(DifficultyHitObject current, bool hidd
 
             double noteDensityDifficulty = Math.Pow(4 * Math.Log(Math.Max(1, pastObjectDifficultyInfluence - 3)), 2.3);
 
+            bool hidden = mods.OfType<OsuModHidden>().Any();
+
             double hiddenDifficulty = 0;
 
             if (hidden)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs
@@ -7,23 +7,20 @@
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Evaluators;
-using osu.Game.Rulesets.Osu.Mods;
 
 namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 {
     public class Reading : Skill
     {
         private readonly List<double> difficulties = new List<double>();
-        private readonly bool hasHiddenMod;
         private const double skill_multiplier = 2.4;
 
         public Reading(Mod[] mods)
             : base(mods)
         {
-            hasHiddenMod = mods.Any(m => m is OsuModHidden);
         }
 
-        public override void Process(DifficultyHitObject current) => difficulties.Add(ReadingEvaluator.EvaluateDifficultyOf(current, hasHiddenMod) * skill_multiplier);
+        public override void Process(DifficultyHitObject current) => difficulties.Add(ReadingEvaluator.EvaluateDifficultyOf(current, Mods) * skill_multiplier);
 
         public override double DifficultyValue()
         {