add new salv loot into the vgroid procgen (#31290)

add new loot into vgroid procgen

Content.Server/Procedural/DungeonJob/DungeonJob.EntityTableDunGen.cs

@@ -0,0 +1,59 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.NPC.Systems;
+using Content.Shared.EntityTable;
+using Content.Shared.Physics;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.DungeonLayers;
+using Robust.Shared.Collections;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    private async Task PostGen(
+        EntityTableDunGen gen,
+        Dungeon dungeon,
+        Random random)
+    {
+        var availableRooms = new ValueList<DungeonRoom>();
+        availableRooms.AddRange(dungeon.Rooms);
+        var availableTiles = new ValueList<Vector2i>(dungeon.AllTiles);
+
+        var count = random.Next(gen.MinCount, gen.MaxCount + 1);
+        var npcs = _entManager.System<NPCSystem>();
+
+        for (var i = 0; i < count; i++)
+        {
+            while (availableTiles.Count > 0)
+            {
+                var tile = availableTiles.RemoveSwap(random.Next(availableTiles.Count));
+
+                if (!_anchorable.TileFree(_grid,
+                        tile,
+                        (int) CollisionGroup.MachineLayer,
+                        (int) CollisionGroup.MachineLayer))
+                {
+                    continue;
+                }
+
+                var entities = _entManager.System<EntityTableSystem>().GetSpawns(gen.Table, random).ToList();
+                foreach (var ent in entities)
+                {
+                    var uid = _entManager.SpawnAtPosition(ent, _maps.GridTileToLocal(_gridUid, _grid, tile));
+                    _entManager.RemoveComponent<GhostRoleComponent>(uid);
+                    _entManager.RemoveComponent<GhostTakeoverAvailableComponent>(uid);
+                    npcs.SleepNPC(uid);
+                }
+
+                break;
+            }
+
+            await SuspendDungeon();
+
+            if (!ValidateResume())
+                return;
+        }
+    }
+}

Content.Server/Procedural/DungeonJob/DungeonJob.cs

@@ -239,6 +239,9 @@ public sealed partial class DungeonJob : Job<List<Dungeon>>
             case MobsDunGen mob:
                 await PostGen(mob, dungeons[^1], random);
                 break;
+            case EntityTableDunGen entityTable:
+                await PostGen(entityTable, dungeons[^1], random);
+                break;
             case NoiseDistanceDunGen distance:
                 dungeons.Add(await GenerateNoiseDistanceDunGen(position, distance, reservedTiles, seed, random));
                 break;

Content.Shared/Procedural/DungeonLayers/EntityTableDunGen.cs

@@ -0,0 +1,21 @@
+using Content.Shared.EntityTable.EntitySelectors;
+
+namespace Content.Shared.Procedural.DungeonLayers;
+
+
+/// <summary>
+/// Spawns entities inside of the dungeon randomly.
+/// </summary>
+public sealed partial class EntityTableDunGen : IDunGenLayer
+{
+    // Counts separate to config to avoid some duplication.
+
+    [DataField]
+    public int MinCount = 1;
+
+    [DataField]
+    public int MaxCount = 1;
+
+    [DataField(required: true)]
+    public EntityTableSelector Table;
+}

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml

@@ -121,21 +121,9 @@
       tableId: SalvageScrapSpawnerValuable
       prob: 0.75
 
-- type: entity
+- type: entityTable
-  parent: MarkerBase
+  id: SalvageTreasureSpawnerCommon
-  id: SalvageSpawnerTreasure
-  name: Salvage Treasure Spawner
-  suffix: Common, 75%
-  components:
-  - type: Sprite
-    layers:
-    - state: pink
-    - sprite: Objects/Materials/materials.rsi
-      state: diamond
-  - type: EntityTableSpawner
-    offset: 0.4
   table: !type:GroupSelector
-      prob: 0.75
     children:
     # 80% chance of some treasure
     - !type:GroupSelector
@@ -183,9 +171,9 @@
 
 - type: entity
   parent: MarkerBase
-  id: SalvageSpawnerTreasureValuable
+  id: SalvageSpawnerTreasure
   name: Salvage Treasure Spawner
-  suffix: Valuable, 75%
+  suffix: Common, 75%
   components:
   - type: Sprite
     layers:
@@ -194,8 +182,13 @@
       state: diamond
   - type: EntityTableSpawner
     offset: 0.4
-    table: !type:GroupSelector
+    table: !type:NestedSelector
+      tableId: SalvageTreasureSpawnerCommon
       prob: 0.75
+
+- type: entityTable
+  id: SalvageTreasureSpawnerValuable
+  table: !type:GroupSelector
     children:
     # 80% chance of some treasure
     - !type:GroupSelector
@@ -248,19 +241,24 @@
 
 - type: entity
   parent: MarkerBase
-  id: SalvageSpawnerEquipment
+  id: SalvageSpawnerTreasureValuable
-  name: Salvage Equipment Spawner
+  name: Salvage Treasure Spawner
-  suffix: Common, 75%
+  suffix: Valuable, 75%
   components:
   - type: Sprite
     layers:
     - state: pink
-    - sprite: Objects/Devices/communication.rsi
+    - sprite: Objects/Materials/materials.rsi
-      state: walkietalkie
+      state: diamond
   - type: EntityTableSpawner
     offset: 0.4
-    table: !type:GroupSelector
+    table: !type:NestedSelector
+      tableId: SalvageTreasureSpawnerValuable
       prob: 0.75
+
+- type: entityTable
+  id: SalvageEquipmentSpawnerCommon
+  table: !type:GroupSelector
     children:
     # 80% chance of equipment item
     - !type:GroupSelector
@@ -302,9 +300,9 @@
 
 - type: entity
   parent: MarkerBase
-  id: SalvageSpawnerEquipmentValuable
+  id: SalvageSpawnerEquipment
   name: Salvage Equipment Spawner
-  suffix: Valuable, 75%
+  suffix: Common, 75%
   components:
   - type: Sprite
     layers:
@@ -313,8 +311,13 @@
       state: walkietalkie
   - type: EntityTableSpawner
     offset: 0.4
-    table: !type:GroupSelector
+    table: !type:NestedSelector
+      tableId: SalvageEquipmentSpawnerCommon
       prob: 0.75
+
+- type: entityTable
+  id: SalvageEquipmentSpawnerValuable
+  table: !type:GroupSelector
     children:
     # 80% chance of equipment item
     - !type:GroupSelector
@@ -360,6 +363,23 @@
       - !type:NestedSelector
         tableId: SyndieMaintLoot
 
+- type: entity
+  parent: MarkerBase
+  id: SalvageSpawnerEquipmentValuable
+  name: Salvage Equipment Spawner
+  suffix: Valuable, 75%
+  components:
+  - type: Sprite
+    layers:
+    - state: pink
+    - sprite: Objects/Devices/communication.rsi
+      state: walkietalkie
+  - type: EntityTableSpawner
+    offset: 0.4
+    table: !type:NestedSelector
+      tableId: SalvageEquipmentSpawnerValuable
+      prob: 0.75
+
 - type: entity
   name: Salvage Canister Spawner
   id: SalvageCanisterSpawner

Resources/Prototypes/Procedural/vgroid.yml

@@ -141,9 +141,39 @@
   layers:
   - !type:ExteriorDunGen
     proto: Experiment
+  - !type:EntityTableDunGen
+    minCount: 25
+    maxCount: 40
+    table: !type:NestedSelector
+      tableId: SalvageScrapSpawnerCommon
+  - !type:EntityTableDunGen
+    minCount: 30
+    maxCount: 40
+    table: !type:NestedSelector
+      tableId: SalvageScrapSpawnerValuable
+  - !type:EntityTableDunGen
+    minCount: 15
+    maxCount: 25
+    table: !type:NestedSelector
+      tableId: SalvageTreasureSpawnerCommon
+  - !type:EntityTableDunGen
+    minCount: 15
+    maxCount: 25
+    table: !type:NestedSelector
+      tableId: SalvageEquipmentSpawnerCommon
+  - !type:EntityTableDunGen
+    minCount: 15
+    maxCount: 20
+    table: !type:NestedSelector
+      tableId: SalvageTreasureSpawnerValuable
+  - !type:EntityTableDunGen
+    minCount: 15
+    maxCount: 20
+    table: !type:NestedSelector
+      tableId: SalvageEquipmentSpawnerValuable
   - !type:MobsDunGen
-    minCount: 5
+    minCount: 8
-    maxCount: 8
+    maxCount: 15
     groups:
     - id: MobGoliath
       amount: 1