Push space dungeons into gameset, name dungeons

Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs

@@ -1,3 +1,6 @@
+using Content.Shared.Procedural;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
 namespace Content.Server._NF.GameRule.Components;
 
 [RegisterComponent, Access(typeof(NfAdventureRuleSystem))]
@@ -9,4 +12,7 @@ public sealed partial class AdventureRuleComponent : Component
     public List<EntityUid> RequiredPois = new();
     public List<EntityUid> OptionalPois = new();
     public List<EntityUid> UniquePois = new();
+
+    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<DungeonConfigPrototype>))]
+    public List<string> SpaceDungeons = new();
 }

Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs

@@ -257,11 +257,9 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component,
         // Using invalid entity, we don't have a relevant entity to reference here.
         RaiseLocalEvent(EntityUid.Invalid, new StationsGeneratedEvent(), broadcast: true); // TODO: attach this to a meaningful entity.
 
-        var dungenTypes = _prototypeManager.EnumeratePrototypes<DungeonConfigPrototype>();
-
-        foreach (var dunGen in dungenTypes)
+        foreach (var dungeonProto in component.SpaceDungeons)
         {
-            if (dunGen.SkipDungeonGen)
+            if (!_prototypeManager.TryIndex<DungeonConfigPrototype>(dungeonProto, out var dunGen))
                 continue;
 
             var seed = _random.Next();
@@ -279,6 +277,9 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component,
             _shuttle.AddIFFFlag(grids[0], IFFFlags.HideLabel);
             _console.WriteLine(null, $"dungeon spawned at {offset}");
 
+            string dungeonName = Loc.GetString("adventure-space-dungeon-name", ("dungeonPrototype", dungeonProto));
+            _meta.SetEntityName(grids[0], dungeonName);
+
             //pls fit the grid I beg, this is so hacky
             //its better now but i think i need to do a normalization pass on the dungeon configs
             //because they are all offset. confirmed good size grid, just need to fix all the offsets.

Content.Shared/Procedural/DungeonConfig.cs

@@ -53,9 +53,4 @@ public sealed class DungeonConfigPrototype : DungeonConfig, IPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
-
-    // Frontier: skip dungeon generation
-    [DataField]
-    public bool SkipDungeonGen = false;
-    // End Frontier
 }

Resources/Locale/en-US/_NF/adventure/adventure.ftl

@@ -27,4 +27,6 @@ changelog-tab-title-Upstream = Upstream Changelog
 multiauth-already-connected = Already connected to Frontier Official servers.
 
 public-transit-departure = Now departing for {$destination}. Estimated travel time: {$flytime} seconds.
-public-transit-arrival = Thank you for choosing NT Public Transit. Next transfer to {$destination} departs in {$waittime} seconds.
+public-transit-arrival = Thank you for choosing NT Public Transit. Next transfer to {$destination} departs in {$waittime} seconds.
+
+adventure-space-dungeon-name = Space Dungeon: {$dungeonPrototype}

Resources/Prototypes/Procedural/dungeon_configs.yml

@@ -1,7 +1,6 @@
 # Base configs
 - type: dungeonConfig
   id: PlanetBase
-  skipDungeonGen: true # Frontier
   layers:
   - !type:PrefabDunGen
     presets:

Resources/Prototypes/_NF/GameRules/roundstart.yml

@@ -4,6 +4,17 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: AdventureRule
+    spaceDungeons:
+    - CaveFactory
+    - MedSci
+    - FactoryDorms
+    - LavaMercenary
+    - VirologyLab
+    - SalvageOutpost
+    # Upstream definitions
+    - Experiment
+    - SnowyLabs
+    - LavaBrig # Skipping Mineshaft, Haunted; they're in caves
 
 - type: entity
   id: BluespaceEventScheduler

Resources/Prototypes/_NF/Procedural/dungeon_configs.yml

@@ -1,7 +1,6 @@
 # Base dungeon prototypes
 - type: dungeonConfig
   id: Everything
-  skipDungeonGen: true # Frontier
   layers:
   - !type:PrefabDunGen
     presets: