Change Opacity function to take in absolute map time rather than rela…

…tive time
Lawtrohux · Nov 30, 2021 · b0dc8bf · b0dc8bf
1 parent 383bf7c
commit b0dc8bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -71,8 +71,11 @@ public OsuDifficultyHitObject(HitObject hitObject, HitObject lastLastObject, Hit
             setDistances(clockRate);
         }
 
-        public double Opacity(double ms, bool hidden)
+        public double Opacity(double T, bool hidden)
         {
+            double ms = (BaseObject.StartTime - T) / clockRate;
+            if (ms < 0)
+                return 0.0;
             double preemptTime = BaseObject.TimePreempt / clockRate;
             double fadeInTime = BaseObject.TimeFadeIn / clockRate;
 

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
@@ -70,7 +70,7 @@ private double strainValueOf(DifficultyHitObject current)
                     double stackNerf = Math.Min(1.0, (osuPrevious.JumpDistance / scalingFactor) / 25.0);
 
                     // Bonus based on how visible the object is.
-                    double opacityBonus = 1.0 + max_opacity_bonus * (1.0 - osuCurrent.Opacity(cumulativeStrainTime, hidden));
+                    double opacityBonus = 1.0 + max_opacity_bonus * (1.0 - osuCurrent.Opacity(osuPreviousHitObject.StartTime, hidden));
 
                     result += Math.Pow(0.8, i) * stackNerf * opacityBonus * scalingFactor * jumpDistance / cumulativeStrainTime;
                 }