h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Fix enum not being at end (and adjust naming)

Browse Source
This commit is contained in:
Dean Herbert 2024-05-22 12:03:48 +08:00
parent 99d99cede0
commit 02a388cba6
No known key found for this signature in database
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Input/Bindings/GlobalActionContainer.cs
View File

@ -182,8 +182,8 @@ namespace osu.Game.Input.Bindings
new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.SelectPreviousRandom), new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.SelectPreviousRandom),
new KeyBinding(InputKey.F3, GlobalAction.ToggleBeatmapOptions), new KeyBinding(InputKey.F3, GlobalAction.ToggleBeatmapOptions),
new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods), new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
new KeyBinding(new[] { InputKey.Control, InputKey.Up }, GlobalAction.IncreaseSpeed), new KeyBinding(new[] { InputKey.Control, InputKey.Up }, GlobalAction.IncreaseModSpeed),
new KeyBinding(new[] { InputKey.Control, InputKey.Down }, GlobalAction.DecreaseSpeed), new KeyBinding(new[] { InputKey.Control, InputKey.Down }, GlobalAction.DecreaseModSpeed),
}; };
private static IEnumerable<KeyBinding> audioControlKeyBindings => new[] private static IEnumerable<KeyBinding> audioControlKeyBindings => new[]
@ -411,12 +411,6 @@ namespace osu.Game.Input.Bindings
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))] [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
EditorToggleRotateControl, EditorToggleRotateControl,
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.IncreaseSpeed))]
IncreaseSpeed,
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.DecreaseSpeed))]
DecreaseSpeed,
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.IncreaseOffset))] [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.IncreaseOffset))]
IncreaseOffset, IncreaseOffset,
@ -428,6 +422,12 @@ namespace osu.Game.Input.Bindings
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.StepReplayBackward))] [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.StepReplayBackward))]
StepReplayBackward, StepReplayBackward,
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.IncreaseModSpeed))]
IncreaseModSpeed,
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.DecreaseModSpeed))]
DecreaseModSpeed,
} }
public enum GlobalActionCategory public enum GlobalActionCategory

8
osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
View File

@ -370,14 +370,14 @@ namespace osu.Game.Localisation
public static LocalisableString EditorToggleRotateControl => new TranslatableString(getKey(@"editor_toggle_rotate_control"), @"Toggle rotate control"); public static LocalisableString EditorToggleRotateControl => new TranslatableString(getKey(@"editor_toggle_rotate_control"), @"Toggle rotate control");
/// <summary> /// <summary>
/// "Increase Speed" /// "Increase mod speed"
/// </summary> /// </summary>
public static LocalisableString IncreaseSpeed => new TranslatableString(getKey(@"increase_speed"), @"Increase Speed"); public static LocalisableString IncreaseModSpeed => new TranslatableString(getKey(@"increase_mod_speed"), @"Increase mod speed");
/// <summary> /// <summary>
/// "Decrease Speed" /// "Decrease mod speed"
/// </summary> /// </summary>
public static LocalisableString DecreaseSpeed => new TranslatableString(getKey(@"decrease_speed"), @"Decrease Speed"); public static LocalisableString DecreaseModSpeed => new TranslatableString(getKey(@"decrease_mod_speed"), @"Decrease mod speed");
private static string getKey(string key) => $@"{prefix}:{key}"; private static string getKey(string key) => $@"{prefix}:{key}";
} }

4
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -757,11 +757,11 @@ namespace osu.Game.Overlays.Mods
return true; return true;
} }
case GlobalAction.IncreaseSpeed: case GlobalAction.IncreaseModSpeed:
songSelect!.ChangeSpeed(0.05); songSelect!.ChangeSpeed(0.05);
return true; return true;
case GlobalAction.DecreaseSpeed: case GlobalAction.DecreaseModSpeed:
songSelect!.ChangeSpeed(-0.05); songSelect!.ChangeSpeed(-0.05);
return true; return true;
} }

2
osu.Game/Overlays/OSD/SpeedChangeToast.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.OSD
public partial class SpeedChangeToast : Toast public partial class SpeedChangeToast : Toast
{ {
public SpeedChangeToast(OsuConfigManager config, double delta) public SpeedChangeToast(OsuConfigManager config, double delta)
: base(CommonStrings.Beatmaps, ToastStrings.SpeedChanged, config.LookupKeyBindings(GlobalAction.IncreaseSpeed) + " / " + config.LookupKeyBindings(GlobalAction.DecreaseSpeed)) : base(CommonStrings.Beatmaps, ToastStrings.SpeedChanged, config.LookupKeyBindings(GlobalAction.IncreaseModSpeed) + " / " + config.LookupKeyBindings(GlobalAction.DecreaseModSpeed))
{ {
} }
} }

4
osu.Game/Screens/Select/SongSelect.cs
View File

@ -1144,11 +1144,11 @@ namespace osu.Game.Screens.Select
switch (e.Action) switch (e.Action)
{ {
case GlobalAction.IncreaseSpeed: case GlobalAction.IncreaseModSpeed:
ChangeSpeed(0.05); ChangeSpeed(0.05);
return true; return true;
case GlobalAction.DecreaseSpeed: case GlobalAction.DecreaseModSpeed:
ChangeSpeed(-0.05); ChangeSpeed(-0.05);
return true; return true;
} }