From 860db2bd148524b964acfb13eefc2558c863e547 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 9 Jul 2022 19:25:32 +1000
Subject: [PATCH] Specifiable dock colours + stripeback displays (#9566)

---
 Content.Client/Shuttles/UI/RadarControl.cs     |  2 +-
 .../Shuttles/UI/ShuttleConsoleWindow.xaml      | 18 ++++++++++++------
 .../Shuttles/UI/ShuttleConsoleWindow.xaml.cs   |  1 +
 .../Shuttles/Components/DockingComponent.cs    | 12 ++++++++++++
 .../Shuttles/Systems/ShuttleConsoleSystem.cs   |  3 ++-
 .../RadarConsoleBoundInterfaceState.cs         |  2 ++
 Resources/Locale/en-US/shuttles/console.ftl    |  3 +++
 7 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/Content.Client/Shuttles/UI/RadarControl.cs b/Content.Client/Shuttles/UI/RadarControl.cs
index 6d69fd809a..d93c051d23 100644
--- a/Content.Client/Shuttles/UI/RadarControl.cs
+++ b/Content.Client/Shuttles/UI/RadarControl.cs
@@ -293,7 +293,7 @@ public sealed class RadarControl : Control
 
                 if (uiPosition.Length > RadarRange - DockScale) continue;
 
-                var color = HighlightedDock == ent ? Color.Magenta : Color.DarkViolet;
+                var color = HighlightedDock == ent ? state.HighlightedColor : state.Color;
 
                 uiPosition.Y = -uiPosition.Y;
 
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
index 58d06e575a..868bed16dc 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
@@ -1,7 +1,8 @@
 <userInterface:FancyWindow xmlns="https://spacestation14.io"
                            xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
                            xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
-               Title="{Loc 'shuttle-console-window-title'}">
+                           xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
+                           Title="{Loc 'shuttle-console-window-title'}">
     <GridContainer Columns="3"
                   HorizontalAlignment="Stretch">
         <BoxContainer Name="LeftDisplay"
@@ -10,11 +11,14 @@
                       MinWidth="256"
                       Align="Center"
                       Orientation="Vertical">
-            <PanelContainer StyleClasses="BorderedWindowPanel">
+            <BoxContainer Orientation="Vertical">
+                <ui1:StripeBack>
+                    <Label Name="DockingPortsLabel" Text="{Loc 'shuttle-console-dock-label'}" HorizontalAlignment="Center"/>
+                </ui1:StripeBack>
                 <BoxContainer Name="DockPorts"
                               Orientation="Vertical">
                 </BoxContainer>
-            </PanelContainer>
+            </BoxContainer>
         </BoxContainer>
         <PanelContainer>
             <ui:RadarControl Name="RadarScreen"
@@ -29,8 +33,10 @@
                       MinWidth="256"
                       Align="Center"
                       Orientation="Vertical">
-            <PanelContainer Name="ReadonlyDisplay"
-                            StyleClasses="BorderedWindowPanel">
+            <ui1:StripeBack>
+                <Label Name="DisplayLabel" Text="{Loc 'shuttle-console-display-label'}" HorizontalAlignment="Center"/>
+            </ui1:StripeBack>
+            <BoxContainer Name="ReadonlyDisplay">
                 <GridContainer Columns="2"
                                HorizontalAlignment="Stretch"
                                VerticalAlignment="Top">
@@ -59,7 +65,7 @@
                            Text="0.0"
                            Align="Right"/>
                 </GridContainer>
-            </PanelContainer>
+            </BoxContainer>
             <Button Name="ShuttleModeDisplay"
                     Text="{Loc 'shuttle-console-strafing'}"
                     TextAlign="Center"
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
index 0a52fa33ae..b486f72b6e 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -139,6 +139,7 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
                     Text = Loc.GetString("shuttle-console-dock-button", ("suffix", suffix)),
                     ToggleMode = true,
                     Pressed = pressed,
+                    Margin = new Thickness(0f, 1f),
                 };
 
                 if (pressed)
diff --git a/Content.Server/Shuttles/Components/DockingComponent.cs b/Content.Server/Shuttles/Components/DockingComponent.cs
index df3ae888b1..1bbfb0fb79 100644
--- a/Content.Server/Shuttles/Components/DockingComponent.cs
+++ b/Content.Server/Shuttles/Components/DockingComponent.cs
@@ -15,5 +15,17 @@ namespace Content.Server.Shuttles.Components
 
         [ViewVariables]
         public override bool Docked => DockedWith != null;
+
+        /// <summary>
+        /// Color that gets shown on the radar screen.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite), DataField("radarColor")]
+        public Color RadarColor = Color.DarkViolet;
+
+        /// <summary>
+        /// Color that gets shown on the radar screen when the dock is highlighted.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite), DataField("highlightedRadarColor")]
+        public Color HighlightedRadarColor = Color.Magenta;
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index e4c2d84c4f..3b7bf163b8 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -22,7 +22,6 @@ namespace Content.Server.Shuttles.Systems
 {
     public sealed class ShuttleConsoleSystem : SharedShuttleConsoleSystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly ActionBlockerSystem _blocker = default!;
         [Dependency] private readonly AlertsSystem _alertsSystem = default!;
         [Dependency] private readonly TagSystem _tags = default!;
@@ -211,6 +210,8 @@ namespace Content.Server.Shuttles.Systems
                     Angle = xform.LocalRotation,
                     Entity = comp.Owner,
                     Connected = comp.Docked,
+                    Color = comp.RadarColor,
+                    HighlightedColor = comp.HighlightedRadarColor,
                 };
                 result.Add(state);
             }
diff --git a/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
index bb16f9bdbc..4fb3e62e5f 100644
--- a/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
+++ b/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
@@ -44,6 +44,8 @@ public sealed class DockingInterfaceState
     public Angle Angle;
     public EntityUid Entity;
     public bool Connected;
+    public Color Color;
+    public Color HighlightedColor;
 }
 
 [Serializable, NetSerializable]
diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl
index bd77157087..2cda20531c 100644
--- a/Resources/Locale/en-US/shuttles/console.ftl
+++ b/Resources/Locale/en-US/shuttles/console.ftl
@@ -2,6 +2,8 @@ shuttle-pilot-start = Piloting ship
 shuttle-pilot-end = Stopped piloting
 
 # Display
+shuttle-console-display-label = Display
+
 shuttle-console-max-radar = Max radar range:
 shuttle-console-radar = Radar range:
 shuttle-console-position = Position:
@@ -9,6 +11,7 @@ shuttle-console-orientation = Orientation:
 shuttle-console-linear-velocity = Linear velocity:
 shuttle-console-angular-velocity = Angular velocity:
 
+shuttle-console-dock-label = Docking ports
 shuttle-console-docked = {$index} (Docked)
 shuttle-console-dock-button = Dock {$suffix}