diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs index 4106556ee1..e459bb60c6 100644 --- a/osu.Game.Tournament.Tests/TournamentTestScene.cs +++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs @@ -66,7 +66,7 @@ namespace osu.Game.Tournament.Tests Acronym = { Value = "JPN" }, FlagName = { Value = "JP" }, FullName = { Value = "Japan" }, - LastYearPlacing = { Value = 10 }, + LastYearPlacing = { Value = "#10" }, Seed = { Value = "#12" }, SeedingResults = { diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs index 95858240a8..b6d9486b68 100644 --- a/osu.Game.Tournament/Models/TournamentTeam.cs +++ b/osu.Game.Tournament/Models/TournamentTeam.cs @@ -49,11 +49,7 @@ namespace osu.Game.Tournament.Models public Bindable Seed = new Bindable(string.Empty); - public Bindable LastYearPlacing = new BindableInt - { - MinValue = 0, - MaxValue = 256 - }; + public Bindable LastYearPlacing = new Bindable("N/A"); [JsonProperty] public BindableList Players { get; } = new BindableList(); diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs index 162379f4aa..05ffaf710d 100644 --- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs +++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs @@ -10,9 +10,7 @@ using osu.Framework.Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; -using osu.Framework.Localisation; using osu.Game.Graphics; -using osu.Game.Graphics.UserInterface; using osu.Game.Overlays; using osu.Game.Overlays.Settings; using osu.Game.Tournament.Models; @@ -132,7 +130,7 @@ namespace osu.Game.Tournament.Screens.Editors Width = 0.2f, Current = Model.Seed }, - new SettingsSlider + new SettingsTextBox { LabelText = "Last Year Placement", Width = 0.33f, @@ -200,11 +198,6 @@ namespace osu.Game.Tournament.Screens.Editors }, true); } - private partial class LastYearPlacementSlider : RoundedSliderBar - { - public override LocalisableString TooltipText => Current.Value == 0 ? "N/A" : base.TooltipText; - } - public partial class PlayerEditor : CompositeDrawable { private readonly TournamentTeam team; diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs index 899d462e4e..ddfff54ded 100644 --- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs +++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs @@ -274,7 +274,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro new TeamDisplay(team) { Margin = new MarginPadding { Bottom = 30 } }, new RowDisplay("Average Rank:", $"#{team.AverageRank:#,0}"), new RowDisplay("Seed:", team.Seed.Value), - new RowDisplay("Last year's placing:", team.LastYearPlacing.Value > 0 ? $"#{team.LastYearPlacing:#,0}" : "N/A"), + new RowDisplay("Last year's placing:", team.LastYearPlacing.Value), new Container { Margin = new MarginPadding { Bottom = 30 } }, } },