From 21f34be19fe58a3cfaca1f2182dc1054aed0aca4 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 22 Apr 2021 14:42:10 +0900
Subject: [PATCH 1/3] Add support for per-ruleset sample playback when
 switching rulesets (via toolbar)

---
 .../Overlays/Toolbar/ToolbarRulesetSelector.cs     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 905d5b44c681..eb235632e812 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -13,6 +14,8 @@
 using osuTK.Input;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -20,6 +23,8 @@ public class ToolbarRulesetSelector : RulesetSelector
     {
         protected Drawable ModeButtonLine { get; private set; }
 
+        private readonly Dictionary<string, Sample> selectionSamples = new Dictionary<string, Sample>();
+
         public ToolbarRulesetSelector()
         {
             RelativeSizeAxes = Axes.Y;
@@ -27,7 +32,7 @@ public ToolbarRulesetSelector()
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             AddRangeInternal(new[]
             {
@@ -54,6 +59,9 @@ private void load()
                     }
                 }
             });
+
+            foreach (var ruleset in Rulesets.AvailableRulesets)
+                selectionSamples[ruleset.ShortName] = audio.Samples.Get($"UI/ruleset-select-{ruleset.ShortName}");
         }
 
         protected override void LoadComplete()
@@ -72,6 +80,10 @@ private void moveLineToCurrent() => ScheduleAfterChildren(() =>
             if (SelectedTab != null)
             {
                 ModeButtonLine.MoveToX(SelectedTab.DrawPosition.X, !hasInitialPosition ? 0 : 200, Easing.OutQuint);
+
+                if (hasInitialPosition)
+                    selectionSamples[SelectedTab.Value.ShortName]?.Play();
+
                 hasInitialPosition = true;
             }
         });

From d20a8694e47264a5d6363550d8f3582d70cb8d10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 19:55:06 +0900
Subject: [PATCH 2/3] 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 3324af7c51e1..5b779b803f3e 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="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.421.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fcd1ed69871e..da8163a971e4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 34810a310612..dc7a57f9051d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From fbb9cb3f6f6d0a9d6fe0d89aa66ca26b545ec982 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Apr 2021 11:01:48 +0900
Subject: [PATCH 3/3] Fix broken merge resolution

---
 osu.Game/osu.Game.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d3d2de45570f..75a3e45941a9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,6 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />