Everything works!

ekrixi-14 · Jul 9, 2024 · a0a27a5 · a0a27a5
1 parent e8bbf2b
commit a0a27a5
Show file tree

Hide file tree

Showing 38 changed files with 1,981 additions and 180 deletions.
diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -194,7 +194,6 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profil
         humanoid.Sex = profile.Sex;
         humanoid.Gender = profile.Gender;
         humanoid.Age = profile.Age;
-        humanoid.Height = profile.Height;
         humanoid.Species = profile.Species;
         humanoid.SkinColor = profile.Appearance.SkinColor;
         humanoid.EyeColor = profile.Appearance.EyeColor;

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -327,16 +327,16 @@ public HumanoidProfileEditor(
 
             #region SpawnPriority
 
-            foreach (var value in Enum.GetValues<SpawnPriorityPreference>())
-            {
-                SpawnPriorityButton.AddItem(Loc.GetString($"humanoid-profile-editor-preference-spawn-priority-{value.ToString().ToLower()}"), (int) value);
-            }
-
-            SpawnPriorityButton.OnItemSelected += args =>
-            {
-                SpawnPriorityButton.SelectId(args.Id);
-                SetSpawnPriority((SpawnPriorityPreference) args.Id);
-            };
+            // foreach (var value in Enum.GetValues<SpawnPriorityPreference>())
+            // {
+            //     SpawnPriorityButton.AddItem(Loc.GetString($"humanoid-profile-editor-preference-spawn-priority-{value.ToString().ToLower()}"), (int) value);
+            // }
+            //
+            // SpawnPriorityButton.OnItemSelected += args =>
+            // {
+            //     SpawnPriorityButton.SelectId(args.Id);
+            //     SetSpawnPriority((SpawnPriorityPreference) args.Id);
+            // };
 
             #endregion SpawnPriority
 
@@ -1367,7 +1367,7 @@ private void UpdateSpawnPriorityControls()
                 return;
             }
 
-            SpawnPriorityButton.SelectId((int) Profile.SpawnPriority);
+            // SpawnPriorityButton.SelectId((int) Profile.SpawnPriority);
         }
 
         private void UpdateHairPickers()

diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -146,6 +146,8 @@
                     <Label Name="StationTime" Access="Public" FontColorOverride="{x:Static maths:Color.LightGray}"
                            Margin="3 3 3 3" HorizontalAlignment="Left" />
                     <controls:HSpacer Spacing="5" />
+                    <lobbyUi:LobbyCharacterPreviewPanel Name="CharacterPreview" Access="Public" />
+                    <controls:HSpacer Spacing="5" />
                     <BoxContainer MinHeight="10" />
                     <!-- Gold line -->
                     <controls:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2" Access="Public" />

diff --git a/Content.Client/_FTL/FtlPoints/StarmapConsole.xaml.cs b/Content.Client/_FTL/FtlPoints/StarmapConsole.xaml.cs
@@ -44,6 +44,7 @@ public void UpdateState(StarmapConsoleBoundUserInterfaceState state)
     {
         UpdateStars(state.Stars);
         Stars.Range = state.Range;
+
         var currentStar = state.Stars.Find(star => star.Position == Vector2.Zero);
         CurrentStarName.Text = currentStar.Name;
     }

diff --git a/Content.Client/_FTL/ShipWeapons/GunnerConsoleBoundUserInterface.cs b/Content.Client/_FTL/ShipWeapons/GunnerConsoleBoundUserInterface.cs
@@ -70,7 +70,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
         if (state is not GunnerConsoleBoundInterfaceState cState)
             return;
 
-        _window?.SetMatrix(_entityManager.GetCoordinates(cState.Coordinates), cState.Angle);
+        _window?.SetMatrix(_entityManager.GetCoordinates(cState.State.Coordinates), cState.State.Angle);
         _window?.UpdateState(cState);
     }
 }
diff --git a/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml b/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml
@@ -11,7 +11,7 @@
                         HorizontalAlignment = "Stretch"
                         HorizontalExpand = "True"
                         VerticalExpand = "True">
-            <ui:RadarControl Name="RadarScreen"
+            <ui:ShuttleNavControl Name="RadarScreen"
                              MouseFilter="Stop"
                              Margin="4"
                              HorizontalExpand = "True"

diff --git a/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs b/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs
@@ -47,16 +47,10 @@ 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
-        );
-        RadarScreen.UpdateState(radarState);
+        RadarScreen.UpdateState(scc.State);
 
         // update ammo text
         AmmoCounter.Text = scc.CurrentAmmo <= 0 ? Loc.GetString("gunner-console-no-ammo") : $"{scc.CurrentAmmo}/{scc.MaxAmmo}";
-        MaxRadarRange.Text = $"{scc.MaxRange:0}";
+        // MaxRadarRange.Text = $"{scc.MaxRange:0}";
     }
 }