Fix health animation affecting failing tint

ppy · Oct 6, 2023 · 58448d3 · 58448d3
1 parent 1a60e6d
commit 58448d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -29,6 +29,8 @@ public partial class FailingLayer : HealthDisplay
         /// </summary>
         public readonly Bindable<bool> ShowHealth = new Bindable<bool>();
 
+        protected override bool PlayInitialIncreaseAnimation => false;
+
         private const float max_alpha = 0.4f;
         private const int fade_time = 400;
         private const float gradient_size = 0.2f;

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -25,6 +25,8 @@ public abstract partial class HealthDisplay : CompositeDrawable
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; } = null!;
 
+        protected virtual bool PlayInitialIncreaseAnimation => true;
+
         public Bindable<double> Current { get; } = new BindableDouble
         {
             MinValue = 0,
@@ -74,7 +76,10 @@ protected override void LoadComplete()
             // this probably shouldn't be operating on `this.`
             showHealthBar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
 
-            startInitialAnimation();
+            if (PlayInitialIncreaseAnimation)
+                startInitialAnimation();
+            else
+                Current.Value = 1;
         }
 
         private void startInitialAnimation()