diff --git a/osu.Game.Rulesets.Mania/Tests/TestCaseManiaPlayfield.cs b/osu.Game.Rulesets.Mania/Tests/TestCaseManiaPlayfield.cs index 2e6cd9208b..7d35ab2f4d 100644 --- a/osu.Game.Rulesets.Mania/Tests/TestCaseManiaPlayfield.cs +++ b/osu.Game.Rulesets.Mania/Tests/TestCaseManiaPlayfield.cs @@ -33,12 +33,10 @@ namespace osu.Game.Rulesets.Mania.Tests { var rng = new Random(1337); - AddStep("1 column", () => createPlayfield(1, SpecialColumnPosition.Normal)); - AddStep("4 columns", () => createPlayfield(4, SpecialColumnPosition.Normal)); - AddStep("Left special style", () => createPlayfield(4, SpecialColumnPosition.Left)); - AddStep("Right special style", () => createPlayfield(4, SpecialColumnPosition.Right)); - AddStep("5 columns", () => createPlayfield(5, SpecialColumnPosition.Normal)); - AddStep("8 columns", () => createPlayfield(8, SpecialColumnPosition.Normal)); + AddStep("1 column", () => createPlayfield(1)); + AddStep("4 columns", () => createPlayfield(4)); + AddStep("5 columns", () => createPlayfield(5)); + AddStep("8 columns", () => createPlayfield(8)); AddStep("4 + 4 columns", () => { var stages = new List @@ -46,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.Tests new StageDefinition { Columns = 4 }, new StageDefinition { Columns = 4 }, }; - createPlayfield(stages, SpecialColumnPosition.Normal); + createPlayfield(stages); }); AddStep("2 + 4 + 2 columns", () => @@ -57,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Tests new StageDefinition { Columns = 4 }, new StageDefinition { Columns = 2 }, }; - createPlayfield(stages, SpecialColumnPosition.Normal); + createPlayfield(stages); }); AddStep("1 + 8 + 1 columns", () => @@ -68,12 +66,10 @@ namespace osu.Game.Rulesets.Mania.Tests new StageDefinition { Columns = 8 }, new StageDefinition { Columns = 1 }, }; - createPlayfield(stages, SpecialColumnPosition.Normal); + createPlayfield(stages); }); - AddStep("Left special style", () => createPlayfield(8, SpecialColumnPosition.Left)); - AddStep("Right special style", () => createPlayfield(8, SpecialColumnPosition.Right)); - AddStep("Reversed", () => createPlayfield(4, SpecialColumnPosition.Normal, true)); + AddStep("Reversed", () => createPlayfield(4, true)); AddStep("Notes with input", () => createPlayfieldWithNotes()); AddStep("Notes with input (reversed)", () => createPlayfieldWithNotes(true)); @@ -82,7 +78,7 @@ namespace osu.Game.Rulesets.Mania.Tests AddStep("Hit explosion", () => { - var playfield = createPlayfield(4, SpecialColumnPosition.Normal); + var playfield = createPlayfield(4); int col = rng.Next(0, 4); @@ -102,17 +98,17 @@ namespace osu.Game.Rulesets.Mania.Tests maniaRuleset = rulesets.GetRuleset(3); } - private ManiaPlayfield createPlayfield(int cols, SpecialColumnPosition specialPos, bool inverted = false) + private ManiaPlayfield createPlayfield(int cols, bool inverted = false) { var stages = new List { new StageDefinition { Columns = cols }, }; - return createPlayfield(stages, specialPos, inverted); + return createPlayfield(stages, inverted); } - private ManiaPlayfield createPlayfield(List stages, SpecialColumnPosition specialPos, bool inverted = false) + private ManiaPlayfield createPlayfield(List stages, bool inverted = false) { Clear(); @@ -127,7 +123,6 @@ namespace osu.Game.Rulesets.Mania.Tests Origin = Anchor.Centre, }); - playfield.SpecialColumnPosition.Value = specialPos; playfield.Inverted.Value = inverted; return playfield; diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs index 3c08b0ff34..c008e71819 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs @@ -22,11 +22,6 @@ namespace osu.Game.Rulesets.Mania.UI /// public readonly Bindable Inverted = new Bindable(true); - /// - /// The style to use for the special column. - /// - public Bindable SpecialColumnPosition = new Bindable(); - public List Columns => stages.SelectMany(x => x.Columns).ToList(); private readonly List stages = new List(); @@ -54,7 +49,6 @@ namespace osu.Game.Rulesets.Mania.UI for (int i = 0; i < stageDefinitions.Count; i++) { var newStage = new ManiaStage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction); - newStage.SpecialColumnPosition.BindTo(SpecialColumnPosition); newStage.VisibleTimeRange.BindTo(VisibleTimeRange); newStage.Inverted.BindTo(Inverted); diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs index 776bd9e556..ebd73d7dca 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs @@ -33,8 +33,6 @@ namespace osu.Game.Rulesets.Mania.UI /// public readonly Bindable Inverted = new Bindable(true); - public readonly Bindable SpecialColumnPosition = new Bindable(); - public IReadOnlyList Columns => columnFlow.Children; private readonly FillFlowContainer columnFlow; @@ -167,19 +165,7 @@ namespace osu.Game.Rulesets.Mania.UI /// /// The 0-based column index. /// Whether the column is a special column. - private bool isSpecialColumn(int column) - { - switch (SpecialColumnPosition.Value) - { - default: - case UI.SpecialColumnPosition.Normal: - return definition.Columns % 2 == 1 && column == definition.Columns / 2; - case UI.SpecialColumnPosition.Left: - return column == 0; - case UI.SpecialColumnPosition.Right: - return column == definition.Columns - 1; - } - } + private bool isSpecialColumn(int column) => definition.Columns % 2 == 1 && column == definition.Columns / 2; public override void Add(DrawableHitObject h) { diff --git a/osu.Game.Rulesets.Mania/UI/SpecialColumnPosition.cs b/osu.Game.Rulesets.Mania/UI/SpecialColumnPosition.cs deleted file mode 100644 index de017294e4..0000000000 --- a/osu.Game.Rulesets.Mania/UI/SpecialColumnPosition.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2007-2018 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -namespace osu.Game.Rulesets.Mania.UI -{ - public enum SpecialColumnPosition - { - /// - /// The special column will lie in the center of the columns. - /// - Normal, - /// - /// The special column will lie to the left of the columns. - /// - Left, - /// - /// The special column will lie to the right of the columns. - /// - Right - } -} diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj index 6f367a0798..c3c0089f14 100644 --- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj +++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj @@ -122,7 +122,6 @@ -