Implemented IFF search (#826)

new-frontiers-14 · Jan 4, 2024 · b466e22 · b466e22
1 parent 3c404f7
commit b466e22
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/Content.Client/Shuttles/UI/RadarControl.cs b/Content.Client/Shuttles/UI/RadarControl.cs
@@ -45,6 +45,11 @@ public sealed class RadarControl : MapGridControl
     public bool ShowIFFShuttles { get; set; } = true;
     public bool ShowDocks { get; set; } = true;
 
+    /// <summary>
+    ///   If present, called for every IFF. Must determine if it should or should not be shown.
+    /// </summary>
+    public Func<EntityUid, MapGridComponent, IFFComponent?, bool>? IFFFilter { get; set; } = null;
+
     /// <summary>
     /// Currently hovered docked to show on the map.
     /// </summary>
@@ -286,19 +291,11 @@ protected override void Draw(DrawingHandleScreen handle)
                     uiPosition = new Vector2(uiX + uiXCentre, uiY + uiYCentre);
                 }
 
-                if (!ShowIFFShuttles)
-                {
-                    if (iff != null && (iff.Flags & IFFFlags.IsPlayerShuttle) != 0x0)
-                    {
-                        label.Visible = false;
-                    }
-                    else
-                        label.Visible = true;
-                }
-                else
-                {
-                    label.Visible = true;
-                }
+                label.Visible = ShowIFFShuttles
+                                || iff == null || (iff.Flags & IFFFlags.IsPlayerShuttle) == 0x0;
+
+                if (IFFFilter != null)
+                    label.Visible &= IFFFilter(gUid, grid.Comp, iff);
 
                 label.Text = Loc.GetString("shuttle-console-iff-label", ("name", name), ("distance", $"{distance:0.0}"));
                 LayoutContainer.SetPosition(label, uiPosition);

diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
@@ -103,6 +103,7 @@
                            Align="Right"/>
                 </GridContainer>
             </BoxContainer>
+
             <Button Name="IFFToggle"
                     Text="{Loc 'shuttle-console-iff-toggle'}"
                     TextAlign="Center"
@@ -119,6 +120,13 @@
                     Text="{Loc 'shuttle-console-undock'}"
                     TextAlign="Center"
                     Disabled="True"/>
+
+            <!-- Frontier - IFF search -->
+            <BoxContainer Orientation="Vertical" HorizontalExpand="True" Name="IffSearchBox">
+                <Label Text="{Loc 'shuttle-console-iff-search'}"></Label>
+
+                <LineEdit Name="IffSearchCriteria" Access="Public" HorizontalExpand="True"></LineEdit>
+            </BoxContainer>
         </BoxContainer>
     </GridContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -65,6 +65,9 @@ public ShuttleConsoleWindow()
         DockToggle.Pressed = RadarScreen.ShowDocks;
 
         UndockButton.OnPressed += OnUndockPressed;
+
+        // Frontier - IFF search
+        IffSearchCriteria.OnTextChanged += args => OnIffSearchChanged(args.Text);
     }
 
     private void WorldRangeChange(float value)
@@ -95,6 +98,19 @@ private void OnUndockPressed(BaseButton.ButtonEventArgs args)
         UndockPressed?.Invoke(DockingScreen.ViewedDock.Value);
     }
 
+    private void OnIffSearchChanged(string text)
+    {
+        text = text.Trim();
+
+        RadarScreen.IFFFilter = text.Length == 0
+            ? null // If empty, do not filter
+            : (entity, grid, iff) => // Otherwise use simple search criteria
+            {
+                _entManager.TryGetComponent<MetaDataComponent>(entity, out var metadata);
+                return metadata != null && metadata.EntityName.Contains(text, StringComparison.OrdinalIgnoreCase);
+            };
+    }
+
     public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
     {
         _shuttleEntity = coordinates?.EntityId;

diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl
@@ -34,6 +34,8 @@ shuttle-console-hyperspace-none = No destinations found
 shuttle-console-unknown = Unknown
 shuttle-console-iff-label = {$name} ({$distance}m)
 
+shuttle-console-iff-search = Search IFF
+
 # Buttons
 shuttle-console-strafing = Strafing mode
 shuttle-console-iff-toggle = Show IFF