Merge pull request #35 from Corvax-Frontier/Patch

Админы теперь следят за вами
Corvax-Frontier · Apr 18, 2024 · 2451d6f · 2451d6f
2 parents 6a0175d + 4b83905
commit 2451d6f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
@@ -2,8 +2,12 @@
          xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label HorizontalExpand="True" SizeFlagsStretchRatio="0.50"
-                   Text="{Loc Object type:}" />
+            <Label Name="ShuttlesCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.15"
+                   Text="{Loc Shuttles Count}" />
+            <Label Name="DebrisCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.15"
+                   Text="{Loc Debris Count}" />
+            <Label Name="ExpeditionCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.15"
+                   Text="{Loc Expedition Count}" />
             <OptionButton Name="ObjectTypeOptions" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"/>
         </BoxContainer>
         <cc:HSeparator/>

diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -1,4 +1,7 @@
+using Content.Client.Salvage;
 using Content.Client.Station;
+using Content.Server.Worldgen.Components.Debris;
+using Content.Shared.Shipyard.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
@@ -95,6 +98,33 @@ private void RefreshObjectList(ObjectsTabSelection selection)
             ObjectList.AddChild(ctrl);
             ctrl.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(ctrl, args);
         }
+
+        var shuttlesCount = 0;
+        var shuttlesQuery = _entityManager.AllEntityQueryEnumerator<ShuttleDeedComponent, MapGridComponent>();
+        while (shuttlesQuery.MoveNext(out var uid, out _, out _))
+        {
+            shuttlesCount++;
+        }
+
+        ShuttlesCount.Text = $"Шаттлы: {shuttlesCount}";
+
+        var debrisCount = 0;
+        var debrisQuery = _entityManager.AllEntityQueryEnumerator<SpaceDebrisComponent, MetaDataComponent>();
+        while (debrisQuery.MoveNext(out var uid, out _, out _))
+        {
+            debrisCount++;
+        }
+
+        DebrisCount.Text = $"Обломки: {debrisCount}";
+
+        var expeditionCount = 0;
+        var expeditionQuery = _entityManager.AllEntityQueryEnumerator<SalvageExpeditionComponent, MetaDataComponent>();
+        while (expeditionQuery.MoveNext(out var uid, out _, out _))
+        {
+            expeditionCount++;
+        }
+
+        ExpeditionCount.Text = $"Экспедиции: {expeditionCount}";
     }
 
     protected override void FrameUpdate(FrameEventArgs args)

diff --git a/Content.Server/Worldgen/Systems/Debris/DebrisFeaturePlacerSystem.cs b/Content.Server/Worldgen/Systems/Debris/DebrisFeaturePlacerSystem.cs
@@ -227,6 +227,7 @@ private void OnChunkLoaded(EntityUid uid, DebrisFeaturePlacerControllerComponent
             var owned = EnsureComp<OwnedDebrisComponent>(ent);
             owned.OwningController = uid;
             owned.LastKey = point;
+            EnsureComp<SpaceDebrisComponent>(ent);
         }
 
         if (failures > 0)

diff --git a/Content.Shared/SpaceDebrisComponent.cs b/Content.Shared/SpaceDebrisComponent.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Worldgen.Components.Debris;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SpaceDebrisComponent : Component
+{
+}