From 8a73831115ab15eff3059e938786c235646862b6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 7 Apr 2022 13:12:33 +0900
Subject: [PATCH 1/2] Add MP lobby 'warning' SFX for the final seconds of
 countdown

---
 .../Multiplayer/Match/MultiplayerReadyButton.cs  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index d275f309cb..22a0243f8f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -30,13 +30,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private MultiplayerRoom room => multiplayerClient.Room;
 
         private Sample countdownTickSample;
+        private Sample countdownWarnSample;
+        private Sample countdownWarnFinalSample;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             countdownTickSample = audio.Samples.Get(@"Multiplayer/countdown-tick");
-            // disabled for now pending further work on sound effect
-            // countdownTickFinalSample = audio.Samples.Get(@"Multiplayer/countdown-tick-final");
+            countdownWarnSample = audio.Samples.Get(@"Multiplayer/countdown-warn");
+            countdownWarnFinalSample = audio.Samples.Get(@"Multiplayer/countdown-warn-final");
         }
 
         protected override void LoadComplete()
@@ -102,8 +104,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private void playTickSound(int secondsRemaining)
         {
             if (secondsRemaining < 10) countdownTickSample?.Play();
-            // disabled for now pending further work on sound effect
-            // if (secondsRemaining <= 3) countdownTickFinalSample?.Play();
+
+            if (secondsRemaining <= 3)
+            {
+                if (secondsRemaining > 0)
+                    countdownWarnSample?.Play();
+                else
+                    countdownWarnFinalSample?.Play();
+            }
         }
 
         private void updateButtonText()

From 9ed4f310488e9c53223893674d21dea7f2a9617f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Apr 2022 13:35:07 +0900
Subject: [PATCH 2/2] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index f1cbe1c9eb..10685d5990 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.405.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.407.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2022.405.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a009307cfe..7fd2647a8a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.10.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.405.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.405.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.407.0" />
     <PackageReference Include="Sentry" Version="3.14.1" />
     <PackageReference Include="SharpCompress" Version="0.30.1" />
     <PackageReference Include="NUnit" Version="3.13.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6e35fba86f..a5efc40d51 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -62,7 +62,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.405.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.405.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.407.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
   <PropertyGroup>