From e8eaaa2189bedf91083efef6d25c35bd5e24edc2 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 21 Jul 2022 15:16:14 -0700 Subject: [PATCH] Research Servers now have proper IDs, and can be selected in lathe menu (#9949) * rd servers now increment properly when added * remove debug message --- .../Research/UI/ResearchClientServerSelectionMenu.xaml.cs | 6 ++---- .../Research/Components/ResearchServerComponent.cs | 2 +- Content.Server/Research/Systems/ResearchSystem.cs | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs index 755e277b7f..ceaa965e59 100644 --- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs @@ -2,8 +2,6 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Robust.Shared.IoC; -using Robust.Shared.Localization; namespace Content.Client.Research.UI { @@ -11,8 +9,8 @@ namespace Content.Client.Research.UI public sealed partial class ResearchClientServerSelectionMenu : DefaultWindow { private int _serverCount; - private string[] _serverNames = System.Array.Empty(); - private int[] _serverIds = System.Array.Empty(); + private string[] _serverNames = Array.Empty(); + private int[] _serverIds = Array.Empty(); private int _selectedServerId = -1; private ResearchClientBoundUserInterface Owner { get; } diff --git a/Content.Server/Research/Components/ResearchServerComponent.cs b/Content.Server/Research/Components/ResearchServerComponent.cs index 268dc9b84b..4a9460cf8f 100644 --- a/Content.Server/Research/Components/ResearchServerComponent.cs +++ b/Content.Server/Research/Components/ResearchServerComponent.cs @@ -11,7 +11,7 @@ namespace Content.Server.Research.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("points")] public int Points = 0; - [ViewVariables(VVAccess.ReadOnly)] public int Id { get; private set; } + [ViewVariables(VVAccess.ReadOnly)] public int Id { get; set; } [ViewVariables(VVAccess.ReadOnly)] public List PointSources { get; } = new(); diff --git a/Content.Server/Research/Systems/ResearchSystem.cs b/Content.Server/Research/Systems/ResearchSystem.cs index 1d67fcaa71..41266c7349 100644 --- a/Content.Server/Research/Systems/ResearchSystem.cs +++ b/Content.Server/Research/Systems/ResearchSystem.cs @@ -31,6 +31,7 @@ namespace Content.Server.Research { if (_servers.Contains(server)) return false; _servers.Add(server); + _servers[^1].Id = _servers.Count - 1; return true; }