and more

ekrixi-14 · Nov 9, 2023 · c70133f · c70133f
1 parent 886a399
commit c70133f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/Content.Client/Shuttles/UI/RadarControl.cs b/Content.Client/Shuttles/UI/RadarControl.cs
@@ -195,17 +195,20 @@ protected override void Draw(DrawingHandleScreen handle)
             DrawDocks(handle, ourGridId.Value, matrix);
         }
 
-        var invertedPosition = _coordinates.Value.Position - offset;
-        invertedPosition.Y = -invertedPosition.Y;
+        var padPosition = _coordinates.Value.Position;
+        var consolePosition = _coordinates.Value.Position - padPosition;
+        padPosition.Y = -padPosition.Y;
+        consolePosition.Y = -consolePosition.Y;
         // Don't need to transform the InvWorldMatrix again as it's already offset to its position.
 
         // Draw radar position on the station
-        handle.DrawCircle(ScalePosition(invertedPosition), 5f, Color.Lime);
+        handle.DrawCircle(ScalePosition(padPosition), 5f, Color.Blue);
+        handle.DrawCircle(ScalePosition(consolePosition), 5f, Color.BlueViolet);
         if (_clickedCoordinates.HasValue)
         {
             var cc = _clickedCoordinates.Value.Position - offset;
             cc.Y = -cc.Y;
-            handle.DrawCircle(ScalePosition(cc), 5f, Color.Lime);
+            handle.DrawCircle(ScalePosition(cc), 5f, Color.Orange);
         }
 
         var shown = new HashSet<EntityUid>();

diff --git a/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs b/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs
@@ -42,7 +42,12 @@ public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
     public void UpdateState(GunnerConsoleBoundInterfaceState scc)
     {
         // update the radar
-        var radarState = new RadarConsoleBoundInterfaceState(scc.MaxRange, scc.Coordinates, scc.Angle, scc.Weapons);
+        var radarState = new RadarConsoleBoundInterfaceState(
+            scc.MaxRange,
+            scc.Coordinates,
+            scc.Angle,
+            scc.Weapons
+        );
         RadarScreen.UpdateState(radarState);
 
         // update ammo text

diff --git a/Content.Server/_FTL/ShipWeapons/ShipWeaponsSystem.cs b/Content.Server/_FTL/ShipWeapons/ShipWeaponsSystem.cs
@@ -69,7 +69,6 @@ private void OnPerformActionWeapon(EntityUid uid, GunnerConsoleComponent compone
                     case ShipWeaponAction.Chamber:
                         break;
                 }
-
             }
         }
         UpdateUserInterface(uid, component);
@@ -115,7 +114,6 @@ private void UpdateUserInterface(EntityUid uid, GunnerConsoleComponent? componen
             return;
 
         var consoleTransform = Transform(uid);
-        Log.Info(consoleTransform.Coordinates.Position.ToString());
         TryComp<RadarConsoleComponent>(uid, out var radar);
 
         var totalAmmo = 0;

diff --git a/Resources/Locale/en-US/_ftl/ship-weapons.ftl b/Resources/Locale/en-US/_ftl/ship-weapons.ftl
@@ -14,8 +14,8 @@ gunner-console-button-fire-text = Fire
 gunner-console-button-chamber-text = Chamber Guns
 gunner-console-button-eject-text = Eject Mags
 
-signal-port-name-weapons-output = Weapon Output Port
+signal-port-name-weapons-output = Pad Control Port
 signal-port-name-weapons-output-description = Link the output port to the input port here.
 
-signal-port-name-weapons-input = Weapon Input Port
+signal-port-name-weapons-input = Weapon Control Port
 signal-port-name-weapons-input-description = Link the input port to the output port here.