Merge pull request ppy#30423 from nekodex/ruleset-selection-duck-tweak

Increase ducking duration when selecting Mania ruleset
peppy · Nov 6, 2024 · 35397d9 · 35397d9
2 parents 2699ebb + da95a1a
commit 35397d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -122,7 +122,10 @@ private void playRulesetSelectionSample(ValueChangedEvent<RulesetInfo> r)
 
             rulesetSelectionChannel[r.NewValue] = channel;
             channel.Play();
-            musicController?.DuckMomentarily(500, new DuckParameters { DuckDuration = 0 });
+
+            // Longer unduck delay for Mania sample
+            int unduckDelay = r.NewValue.OnlineID == 3 ? 750 : 500;
+            musicController?.DuckMomentarily(unduckDelay, new DuckParameters { DuckDuration = 0 });
         }
 
         public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput;

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2024.1025.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.1003.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.1106.0" />
     <PackageReference Include="Sentry" Version="4.12.1" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.38.0" />