Cherry-picked commit a41772a from space-wizards/space-station-14/master

Simple-Station · Apr 21, 2024 · 7a3349e · 7a3349e
1 parent 3bf08c7
commit 7a3349e
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 9 deletions.
diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
@@ -318,18 +318,22 @@ private void RebuildMapObjects()
 
             foreach (var grid in _mapManager.GetAllMapGrids(mapComp.MapId))
             {
+                _entManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp);
+
                 var gridObj = new GridMapObject()
                 {
                     Name = _entManager.GetComponent<MetaDataComponent>(grid.Owner).EntityName,
-                    Entity = grid.Owner
+                    Entity = grid.Owner,
+                    HideButton = iffComp != null && (iffComp.Flags & IFFFlags.HideLabel) != 0x0,
                 };
 
                 // Always show our shuttle immediately
                 if (grid.Owner == _shuttleEntity)
                 {
                     AddMapObject(mapComp.MapId, gridObj);
                 }
-                else
+                else if (iffComp == null ||
+                         (iffComp.Flags & IFFFlags.Hide) == 0x0)
                 {
                     _pendingMapObjects.Add((mapComp.MapId, gridObj));
                 }
@@ -423,10 +427,14 @@ public void SetMap(MapId mapId, Vector2 position)
     /// </summary>
     private void AddMapObject(MapId mapId, IMapObject mapObj)
     {
-        var gridContents = _mapHeadings[mapId];
         var existing = _mapObjects.GetOrNew(mapId);
         existing.Add(mapObj);
 
+        if (mapObj.HideButton)
+            return;
+
+        var gridContents = _mapHeadings[mapId];
+
         var gridButton = new Button()
         {
             Text = mapObj.Name,

diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -345,7 +345,7 @@ protected override void Draw(DrawingHandleScreen handle)
             // Rudimentary IFF for now, if IFF hiding on then we don't show on the map at all
             if (grid.Owner != _shuttleEntity &&
                 EntManager.TryGetComponent(grid, out iffComp) &&
-                (iffComp.Flags & (IFFFlags.Hide | IFFFlags.HideLabel)) != 0x0)
+                (iffComp.Flags & IFFFlags.Hide) != 0x0)
             {
                 continue;
             }
@@ -367,6 +367,9 @@ protected override void Draw(DrawingHandleScreen handle)
             AddMapObject(existingEdges, existingVerts, mapObject);
 
             // Text
+            if (iffComp != null && (iffComp.Flags & IFFFlags.HideLabel) != 0x0)
+                continue;
+
             // Force drawing it at this point.
             var iffText = _shuttles.GetIFFLabel(grid, self: true, component: iffComp);
 

diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
@@ -60,7 +60,7 @@ public void SetIFFColor(EntityUid gridUid, Color color, IFFComponent? component
             return;
 
         component.Color = color;
-        Dirty(component);
+        Dirty(gridUid, component);
         UpdateIFFInterfaces(gridUid, component);
     }
 
@@ -73,7 +73,7 @@ public void AddIFFFlag(EntityUid gridUid, IFFFlags flags, IFFComponent? componen
             return;
 
         component.Flags |= flags;
-        Dirty(component);
+        Dirty(gridUid, component);
         UpdateIFFInterfaces(gridUid, component);
     }
 
@@ -87,7 +87,7 @@ public void RemoveIFFFlag(EntityUid gridUid, IFFFlags flags, IFFComponent? compo
             return;
 
         component.Flags &= ~flags;
-        Dirty(component);
+        Dirty(gridUid, component);
         UpdateIFFInterfaces(gridUid, component);
     }
 }
diff --git a/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs b/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs
@@ -3,5 +3,6 @@ namespace Content.Shared.Shuttles.UI.MapObjects;
 public record struct GridMapObject : IMapObject
 {
     public string Name { get; set; }
+    public bool HideButton { get; init; }
     public EntityUid Entity;
 }
diff --git a/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs b/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs
@@ -6,4 +6,9 @@ namespace Content.Shared.Shuttles.UI.MapObjects;
 public interface IMapObject
 {
     string Name { get; }
+
+    /// <summary>
+    /// Should we hide the button from being shown (AKA just draw it).
+    /// </summary>
+    bool HideButton { get; }
 }
diff --git a/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs b/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs
@@ -4,4 +4,7 @@
 namespace Content.Shared.Shuttles.UI.MapObjects;
 
 [Serializable, NetSerializable]
-public readonly record struct ShuttleBeaconObject(NetEntity Entity, NetCoordinates Coordinates, string Name) : IMapObject;
+public readonly record struct ShuttleBeaconObject(NetEntity Entity, NetCoordinates Coordinates, string Name) : IMapObject
+{
+    public bool HideButton => false;
+}
diff --git a/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs b/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs
@@ -4,4 +4,7 @@
 namespace Content.Shared.Shuttles.UI.MapObjects;
 
 [Serializable, NetSerializable]
-public record struct ShuttleExclusionObject(NetCoordinates Coordinates, float Range, string Name = "") : IMapObject;
+public record struct ShuttleExclusionObject(NetCoordinates Coordinates, float Range, string Name = "") : IMapObject
+{
+    public bool HideButton => false;
+}