diff --git a/osu.Game/Overlays/Mods/AssistedSection.cs b/osu.Game/Overlays/Mods/AssistedSection.cs index 0d22a259e3..0bb1bc9dff 100644 --- a/osu.Game/Overlays/Mods/AssistedSection.cs +++ b/osu.Game/Overlays/Mods/AssistedSection.cs @@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Mods { public class AssistedSection : ModSection { - protected override Key[] ToggleKeys => new Key[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M }; + protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M }; public override ModType ModType => ModType.Special; [BackgroundDependencyLoader] diff --git a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs index 4d6b300448..4dfb0ba6c2 100644 --- a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs +++ b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs @@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Mods { public class DifficultyIncreaseSection : ModSection { - protected override Key[] ToggleKeys => new Key[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L }; + protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L }; public override ModType ModType => ModType.DifficultyIncrease; [BackgroundDependencyLoader] diff --git a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs index 0b92ed87f7..d92fb541c3 100644 --- a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs +++ b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs @@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Mods { public class DifficultyReductionSection : ModSection { - protected override Key[] ToggleKeys => new Key[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P }; + protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P }; public override ModType ModType => ModType.DifficultyReduction; [BackgroundDependencyLoader] diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs index 2aac55e474..6e3bafbada 100644 --- a/osu.Game/Overlays/Mods/ModButton.cs +++ b/osu.Game/Overlays/Mods/ModButton.cs @@ -179,7 +179,7 @@ namespace osu.Game.Overlays.Mods iconsContainer.Clear(); if (Mods.Length > 1) { - iconsContainer.Add(new ModIcon[] + iconsContainer.Add(new[] { new ModIcon { @@ -187,7 +187,7 @@ namespace osu.Game.Overlays.Mods Anchor = Anchor.Centre, AutoSizeAxes = Axes.Both, Position = new Vector2(1.5f), - Colour = this.ButtonColour + Colour = ButtonColour }, foregroundIcon = new ModIcon { @@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Mods Anchor = Anchor.Centre, AutoSizeAxes = Axes.Both, Position = new Vector2(-1.5f), - Colour = this.ButtonColour + Colour = ButtonColour }, }); } @@ -206,7 +206,7 @@ namespace osu.Game.Overlays.Mods Origin = Anchor.Centre, Anchor = Anchor.Centre, AutoSizeAxes = Axes.Both, - Colour = this.ButtonColour + Colour = ButtonColour }); } } diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs index dd196c7a8a..c07114919e 100644 --- a/osu.Game/Overlays/Mods/ModSection.cs +++ b/osu.Game/Overlays/Mods/ModSection.cs @@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Mods { button.ButtonColour = ButtonColour; button.SelectedColour = selectedColour; - button.Action = this.Action; + button.Action = Action; } ButtonsContainer.Children = value; @@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Mods } } - public ModSection() + protected ModSection() { AutoSizeAxes = Axes.Y;