tweaks (#888)

new-frontiers-14 · Jan 18, 2024 · 6cc2e44 · 6cc2e44
1 parent 37ea0dd
commit 6cc2e44
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
@@ -1,4 +1,4 @@
-using Content.Client.NewFrontier.Latejoin;
+using Content.Client._NF.Latejoin;
 using Content.Client.Chat.Managers;
 using Content.Client.GameTicking.Managers;
 using Content.Client.LateJoin;

diff --git a/...t/NewFrontier/Latejoin/NFLateJoinGui.xaml → ...nt.Client/_NF/Latejoin/NFLateJoinGui.xaml b/...t/NewFrontier/Latejoin/NFLateJoinGui.xaml → ...nt.Client/_NF/Latejoin/NFLateJoinGui.xaml
@@ -1,6 +1,6 @@
 <controls:FancyWindow
                  xmlns="https://spacestation14.io"
-                 xmlns:lateJoin="clr-namespace:Content.Client.NewFrontier.Latejoin"
+                 xmlns:lateJoin="clr-namespace:Content.Client._NF.Latejoin"
                  xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
                  xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                  Title="Join Game"

diff --git a/...ewFrontier/Latejoin/NFLateJoinGui.xaml.cs → ...Client/_NF/Latejoin/NFLateJoinGui.xaml.cs b/...ewFrontier/Latejoin/NFLateJoinGui.xaml.cs → ...Client/_NF/Latejoin/NFLateJoinGui.xaml.cs
@@ -11,7 +11,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Client.NewFrontier.Latejoin;
+namespace Content.Client._NF.Latejoin;
 
 [GenerateTypedNameReferences]
 public sealed partial class NFLateJoinGui : FancyWindow

diff --git a/...atejoin/NewFrontierLateJoinJobButton.xaml → ...atejoin/NewFrontierLateJoinJobButton.xaml b/...atejoin/NewFrontierLateJoinJobButton.xaml → ...atejoin/NewFrontierLateJoinJobButton.xaml
diff --git a/...join/NewFrontierLateJoinJobButton.xaml.cs → ...join/NewFrontierLateJoinJobButton.xaml.cs b/...join/NewFrontierLateJoinJobButton.xaml.cs → ...join/NewFrontierLateJoinJobButton.xaml.cs
@@ -8,7 +8,7 @@
 using Robust.Client.Utility;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.NewFrontier.Latejoin;
+namespace Content.Client._NF.Latejoin;
 
 [GenerateTypedNameReferences]
 public sealed partial class NewFrontierLateJoinJobButton : Button

diff --git a/...wFrontier/Latejoin/VesselListControl.xaml → ...lient/_NF/Latejoin/VesselListControl.xaml b/...wFrontier/Latejoin/VesselListControl.xaml → ...lient/_NF/Latejoin/VesselListControl.xaml
diff --git a/...ontier/Latejoin/VesselListControl.xaml.cs → ...nt/_NF/Latejoin/VesselListControl.xaml.cs b/...ontier/Latejoin/VesselListControl.xaml.cs → ...nt/_NF/Latejoin/VesselListControl.xaml.cs
@@ -3,8 +3,9 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Player;
 
-namespace Content.Client.NewFrontier.Latejoin;
+namespace Content.Client._NF.Latejoin;
 
 [GenerateTypedNameReferences]
 public sealed partial class VesselListControl : BoxContainer
@@ -24,6 +25,7 @@ public NetEntity? Selected
             return (NetEntity) i.Metadata!;
         }
     }
+    private IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>>? _lastJobState;
 
     public VesselListControl()
     {
@@ -34,6 +36,12 @@ public VesselListControl()
         UpdateUi(_gameTicker.JobsAvailable);
 
         Comparison = DefaultComparison;
+
+        FilterLineEdit.OnTextChanged += _ =>
+        {
+            if (_lastJobState != null)
+                UpdateUi(_lastJobState);
+        };
     }
 
     protected override void Dispose(bool disposing)
@@ -44,7 +52,8 @@ protected override void Dispose(bool disposing)
 
     private int DefaultComparison(NetEntity x, NetEntity y)
     {
-        return (int)(_gameTicker.JobsAvailable[x].Values.Sum(a => a ?? 0) - _gameTicker.JobsAvailable[y].Values.Sum(b => b ?? 0));
+        // Negated to enforce descending order
+        return -(int)(_gameTicker.JobsAvailable[x].Values.Sum(a => a ?? 0) - _gameTicker.JobsAvailable[y].Values.Sum(b => b ?? 0));
     }
 
     public void Sort()
@@ -55,27 +64,18 @@ public void Sort()
 
     private void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>> obj)
     {
-        var itemsToRemove = new List<ItemList.Item>();
-        foreach (var (key, item) in VesselItemList.Select(x => ((NetEntity)x.Metadata!, x)))
-        {
-            if (!_gameTicker.StationNames.ContainsKey(key))
-                itemsToRemove.Add(item);
-        }
-
-        foreach (var item in itemsToRemove)
-        {
-            VesselItemList.Remove(item);
-        }
+        VesselItemList.Clear();
 
         foreach (var (key, name) in _gameTicker.StationNames)
         {
             if (VesselItemList.Any(x => ((NetEntity)x.Metadata!) == key))
                 continue;
 
+            var jobsAvailable = _gameTicker.JobsAvailable[key].Values.Sum(a => a ?? 0).ToString();
             var item = new ItemList.Item(VesselItemList)
             {
                 Metadata = key,
-                Text = name
+                Text = name + $" ({jobsAvailable})"
             };
 
             if (!string.IsNullOrEmpty(FilterLineEdit.Text) &&
@@ -88,5 +88,7 @@ private void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>>
         }
 
         Sort();
+
+        _lastJobState = obj;
     }
 }