Move preempt back to CreateDifficultyAttributes

Lawtrohux · Nov 21, 2021 · a57c277 · a57c277
1 parent afbec94
commit a57c277
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -22,7 +22,6 @@ public class OsuDifficultyCalculator : DifficultyCalculator
     {
         private const double difficulty_multiplier = 0.0675;
         private double hitWindowGreat;
-        private double preempt;
 
         public OsuDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
             : base(ruleset, beatmap)
@@ -60,6 +59,7 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
 
             double starRating = basePerformance > 0.00001 ? Math.Cbrt(1.12) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4) : 0;
 
+            double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
             double drainRate = beatmap.Difficulty.DrainRate;
 
             int maxCombo = beatmap.HitObjects.Count;
@@ -110,14 +110,12 @@ protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clo
 
             hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
 
-            preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
-
             return new Skill[]
             {
                 new Aim(mods, true),
                 new Aim(mods, false),
                 new Speed(mods, hitWindowGreat),
-                new Flashlight(mods, preempt)
+                new Flashlight(mods)
             };
         }
 

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
@@ -16,11 +16,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// </summary>
     public class Flashlight : OsuStrainSkill
     {
-        public Flashlight(Mod[] mods, double preemptTime)
+        public Flashlight(Mod[] mods)
             : base(mods)
         {
             this.mods = mods;
-            this.preemptTime = preemptTime;
         }
 
         private double skillMultiplier => 0.09;
@@ -30,7 +29,6 @@ public Flashlight(Mod[] mods, double preemptTime)
 
         private readonly Mod[] mods;
         private bool hidden;
-        private readonly double preemptTime;
 
         private const double max_opacity_bonus = 0.7;
         private const double hidden_bonus = 0.5;