From e9745a3ac41c93ec5860505cf833ec5618c5a177 Mon Sep 17 00:00:00 2001
From: MBmasher <mbmasher@gmail.com>
Date: Mon, 22 Nov 2021 08:32:35 +1100
Subject: [PATCH] Fix wrong opacity formula

---
 .../Difficulty/Preprocessing/OsuDifficultyHitObject.cs       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index cc699aa3f9..4109c068ea 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -74,11 +74,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         public double Opacity(double ms, bool hidden)
         {
             double preemptTime = BaseObject.TimePreempt / clockRate;
+            double fadeInTime = BaseObject.TimeFadeIn / clockRate;
 
             if (hidden)
-                return Math.Clamp(Math.Min((1 - ms / preemptTime) * 2.5, (ms / preemptTime) * (1.0 / 0.3)), 0.0, 1.0);
+                return Math.Clamp(Math.Min((1.0 - ms / preemptTime) * 2.5, (ms / preemptTime - 0.3) * (1.0 / 0.3)), 0.0, 1.0);
             else
-                return Math.Clamp((1.0 - ms / preemptTime) * 1.5, 0.0, 1.0);
+                return Math.Clamp((preemptTime - ms) / fadeInTime, 0.0, 1.0);
         }
 
         private void setDistances(double clockRate)