Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change key overlay to use the ordering provided by rulesets #26589

Merged
merged 3 commits into from Jan 17, 2024
Merged

Change key overlay to use the ordering provided by rulesets #26589

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45e5285
Change key overlay to use the ordering provided by rulesets
peppy Jan 17, 2024
a4c0bfd
Change taiko's default key ordering to better match display order
peppy Jan 17, 2024
a8970d7
Jiggle ordering a bit further to fix revert-to-default buttons showin…
bdach Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Taiko/TaikoRuleset.cs
View file
Open in desktop
Expand Up @@ -69,11 +69,11 @@ public class TaikoRuleset : Ruleset, ILegacyRuleset

public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
{
new KeyBinding(InputKey.MouseLeft, TaikoAction.LeftCentre),
new KeyBinding(InputKey.MouseRight, TaikoAction.LeftRim),
new KeyBinding(InputKey.D, TaikoAction.LeftRim),
new KeyBinding(InputKey.F, TaikoAction.LeftCentre),
new KeyBinding(InputKey.MouseLeft, TaikoAction.LeftCentre),
new KeyBinding(InputKey.J, TaikoAction.RightCentre),
new KeyBinding(InputKey.MouseRight, TaikoAction.LeftRim),
Copy link
Collaborator

@bdach bdach Jan 17, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing this in this way causes revert-to-default buttons to appear in the settings overlay in the taiko section:

osu_2024-01-17_12-11-08

Something like the following:

diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index b80d8218f5..24b0ec5d57 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -69,11 +69,11 @@ public class TaikoRuleset : Ruleset, ILegacyRuleset
 
         public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
         {
+            new KeyBinding(InputKey.MouseRight, TaikoAction.LeftRim),
             new KeyBinding(InputKey.D, TaikoAction.LeftRim),
-            new KeyBinding(InputKey.F, TaikoAction.LeftCentre),
             new KeyBinding(InputKey.MouseLeft, TaikoAction.LeftCentre),
+            new KeyBinding(InputKey.F, TaikoAction.LeftCentre),
             new KeyBinding(InputKey.J, TaikoAction.RightCentre),
-            new KeyBinding(InputKey.MouseRight, TaikoAction.LeftRim),
             new KeyBinding(InputKey.K, TaikoAction.RightRim),
         };

fixes that, without regressing #10545. Think it's worth it?

This would also fix the test failures, by the way.

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a feeling that would be the case. I last minute reordered them for visual appeal without retesting.

Applying the change sounds fine.

new KeyBinding(InputKey.K, TaikoAction.RightRim),
};

Expand Down
1 change: 0 additions & 1 deletion osu.Game/Rulesets/UI/RulesetInputManager.cs
View file
Open in desktop
Expand Up @@ -167,7 +167,6 @@ public void Attach(InputCountController inputCountController)
var triggers = KeyBindingContainer.DefaultKeyBindings
.Select(b => b.GetAction<T>())
.Distinct()
.OrderBy(action => action)
.Select(action => new KeyCounterActionTrigger<T>(action))
.ToArray();

Expand Down