From 55d66d4615e65bdbcc794d385da3210aa130d7cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Mar 2024 11:45:46 +0800
Subject: [PATCH] Add sounds to countdown

---
 osu.Game/Screens/Play/DelayedResumeOverlay.cs | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/DelayedResumeOverlay.cs b/osu.Game/Screens/Play/DelayedResumeOverlay.cs
index 8bb3ae8182..147d48ae02 100644
--- a/osu.Game/Screens/Play/DelayedResumeOverlay.cs
+++ b/osu.Game/Screens/Play/DelayedResumeOverlay.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -47,6 +49,8 @@ namespace osu.Game.Screens.Play
         private SpriteText countdownText = null!;
         private CircularProgress countdownProgress = null!;
 
+        private Sample? sampleCountdown;
+
         public DelayedResumeOverlay()
         {
             Anchor = Anchor.Centre;
@@ -54,7 +58,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             Add(outerContent = new Circle
             {
@@ -103,6 +107,8 @@ namespace osu.Game.Screens.Play
                     }
                 }
             });
+
+            sampleCountdown = audio.Samples.Get(@"Gameplay/resume-countdown");
         }
 
         protected override void PopIn()
@@ -164,13 +170,24 @@ namespace osu.Game.Screens.Play
             countdownProgress.Progress = amountTimePassed;
             countdownProgress.InnerRadius = progress_stroke_width / progress_size / countdownProgress.Scale.X;
 
-            if (countdownCount != newCount && newCount > 0)
+            if (countdownCount != newCount)
             {
-                countdownText.Text = Math.Max(1, newCount).ToString();
-                countdownText.ScaleTo(0.25f).Then().ScaleTo(1, 200, Easing.OutQuint);
-                outerContent.Delay(25).Then().ScaleTo(1.05f, 100).Then().ScaleTo(1f, 200, Easing.Out);
+                if (newCount > 0)
+                {
+                    countdownText.Text = Math.Max(1, newCount).ToString();
+                    countdownText.ScaleTo(0.25f).Then().ScaleTo(1, 200, Easing.OutQuint);
+                    outerContent.Delay(25).Then().ScaleTo(1.05f, 100).Then().ScaleTo(1f, 200, Easing.Out);
 
-                countdownBackground.FlashColour(colourProvider.Background3, 400, Easing.Out);
+                    countdownBackground.FlashColour(colourProvider.Background3, 400, Easing.Out);
+                }
+
+                var chan = sampleCountdown?.GetChannel();
+
+                if (chan != null)
+                {
+                    chan.Frequency.Value = newCount == 0 ? 0.5f : 1;
+                    chan.Play();
+                }
             }
 
             countdownCount = newCount;