Merge pull request #12528 from nekodex/ruleset-switch-sounds

Add support for playing a per-ruleset sound when switching rulesets
ppy · Apr 23, 2021 · 8ee881b · 8ee881b
2 parents 8de8856 + fbb9cb3
commit 8ee881b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git 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.422.1" />
   </ItemGroup>
 </Project>
diff --git 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,21 +14,25 @@
 using osuTK.Input;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Overlays.Toolbar
 {
     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;
             AutoSizeAxes = Axes.X;
         }
 
         [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;
             }
         });

diff --git 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.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" />
     <PackageReference Include="NUnit" Version="3.13.1" />

diff --git 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.422.1" />
-    <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>