надо решить че с подарками делать

Signed-off-by: pacable <[email protected]>
space-sunrise · Nov 10, 2024 · 0841a4f · 0841a4f
1 parent 78c0277
commit 0841a4f
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 16 deletions.
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
@@ -27,5 +27,8 @@
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Sunrise\Content.Sunrise.Interfaces.Server\Content.Sunrise.Interfaces.Server.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="_Sunrise\Administration\Commands\" />
+  </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Server/_Sunrise/CentCom/CentComCargoConsoleSystem.cs b/Content.Server/_Sunrise/CentCom/CentComCargoConsoleSystem.cs
@@ -1,8 +1,11 @@
 using Content.Server._Sunrise.StationCentComm;
 using Content.Server.GameTicking;
 using Content.Server.Station.Systems;
+using Content.Server.StationEvents.Components;
 using Content.Shared._Sunrise.CentCom;
 using Content.Shared._Sunrise.CentCom.BUIStates;
+using Content.Shared.EntityTable;
+using Content.Shared.EntityTable.EntitySelectors;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -15,6 +18,8 @@ public sealed class CentComCargoConsoleSystem : EntitySystem
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly IPrototypeManager _prototypeMan = default!;
     [Dependency] private readonly GameTicker _ticker = default!;
+    [Dependency] private readonly EntityTableSystem _entityTable = default!;
+
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -25,7 +30,19 @@ public override void Initialize()
 
     private void OnCargoInit(EntityUid uid, CentComCargoConsoleComponent component, ComponentInit args)
     {
+        // Init gifts
+        if (component.Gifts.Count != 0) // используют кастомные подарки
+            return;
+
+        var proto = _prototypeMan.Index<EntityTablePrototype>("CargoGiftsTable");
+        foreach (var entProtoId in _entityTable.GetSpawns(proto.Table))
+        {
+            var i = _prototypeMan.Index<EntityPrototype>(entProtoId);
+
+            var pr = _prototypeMan.GetPrototypeData(i);
 
+            var name = pr["name"].ToString();
+        }
     }
 
     private void OnSendGift(EntityUid uid, CentComCargoConsoleComponent component, CentComCargoSendGiftMessage args)

diff --git a/Content.Server/_Sunrise/CentCom/CentComGiftsTableComponent.cs b/Content.Server/_Sunrise/CentCom/CentComGiftsTableComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._Sunrise.CentCom;
+
+/// <summary>
+/// This is used for...
+/// </summary>
+[RegisterComponent]
+public sealed partial class CentComGiftsTableComponent : Component
+{
+    [DataField]
+    public List<ProtoId<EntityPrototype>> Gifts;
+}
diff --git a/Content.Shared/_Sunrise/CentCom/CentComCargoConsoleComponent.cs b/Content.Shared/_Sunrise/CentCom/CentComCargoConsoleComponent.cs
@@ -23,5 +23,5 @@ public sealed partial class CentComCargoConsoleComponent : Component
     public CargoLinkedStation? LinkedStation;
 
     [DataField]
-    public List<CentComGift> Gifts;
+    public List<CentComGift> Gifts = [];
 }
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -11,12 +11,12 @@
     - id: GiftsPizzaPartyLarge
     - id: GiftsPizzaPartySmall
     - id: GiftsSecurityGuns
-    - id: GiftsSecurityRiot
+    - id: GiftsSecurityRiot+
     - id: GiftsSpacingSupplies
     - id: GiftsVendingRestock
 
 # Game Rules
-    
+
 - type: entity
   id: CargoGiftsBase
   parent: BaseGameRule

diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/Computers/computers.yml
@@ -89,21 +89,26 @@
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: CentComCargoConsole
-    gifts:
-    - title: TEST TITLE
-      description: TEST DESCRIPTION
-      contents:
-      - Some contents
-      - Some other contents
-      - Some contents
-      - Some other contents
-      - Some contents
-      - Some other contents
-      - Some contents
-      - Some other contents
-      event: GiftsEngineering
+    targetTable: CargoGiftsTable
     # TODO: gifts
 
+- type: entity
+  abstract: true
+  id: CentComGiftsTable
+  components:
+  - type: CentComGiftsTable
+    gifts:
+    - id: GiftsEngineering
+    - id: GiftsFireProtection
+    - id: GiftsJanitor
+    - id: GiftsMedical
+    - id: GiftsPizzaPartyLarge
+    - id: GiftsPizzaPartySmall
+    - id: GiftsSecurityGuns
+    - id: GiftsSecurityRiot
+    - id: GiftsSpacingSupplies
+    - id: GiftsVendingRestock
+
 - type: entity
   parent: BaseComputerShuttle
   id: ComputerShuttleCentComm