initial dual stations prototype

Author: Happyrobot33

Content.Server/GameTicking/GameTicker.RoundFlow.cs

@@ -94,8 +94,8 @@ public bool CanUpdateMap()
         /// </remarks>
         private void LoadMaps()
         {
-            if (_map.MapExists(DefaultMap))
-                return;
+            /* if (_map.MapExists(DefaultMap))
+                return; */
 
             AddGamePresetRules();
 
@@ -113,9 +113,18 @@ private void LoadMaps()
 
             // Small chance the above could return no map.
             // ideally SelectMapByConfigRules will always find a valid map
+            //starlight start
+            var defaultMaps = new List<GameMapPrototype>();
             if (mainStationMap != null)
             {
+                var elligibleMaps = _gameMapManager.CurrentlyEligibleMaps();
+                //select a random
+                var selected = _robustRandom.Pick(elligibleMaps.ToList());
                 maps.Add(mainStationMap);
+                maps.Add(selected);
+                defaultMaps.Add(mainStationMap);
+                defaultMaps.Add(selected);
+                //starlight end
             }
             else
             {
@@ -139,7 +148,8 @@ private void LoadMaps()
             if (maps.Count == 0)
             {
                 _map.CreateMap(out var mapId, runMapInit: false);
-                DefaultMap = mapId;
+                //starlight
+                DefaultMap.Add(mapId);
                 return;
             }
 
@@ -148,8 +158,11 @@ private void LoadMaps()
                 LoadGameMap(maps[i], out var mapId);
                 DebugTools.Assert(!_map.IsInitialized(mapId));
 
-                if (i == 0)
-                    DefaultMap = mapId;
+                //starlight account for list format
+                if (defaultMaps.Contains(maps[i]))
+                {
+                    DefaultMap.Add(mapId);
+                }
             }
         }
 
@@ -419,7 +432,11 @@ public void StartRound(bool force = false)
             }
 
             // MapInitialize *before* spawning players, our codebase is too shit to do it afterwards...
-            _map.InitializeMap(DefaultMap);
+            //starlight for each loop
+            foreach (var map in DefaultMap)
+            {
+                _map.InitializeMap(map);
+            }
 
             SpawnPlayers(readyPlayers, readyPlayerIds, force);
 

Content.Server/GameTicking/GameTicker.Spawning.cs

@@ -568,11 +568,15 @@ public EntityCoordinates GetObserverSpawnPoint()
                 return spawn;
             }
 
-            if (_map.MapExists(DefaultMap))
+            //starlight for loop added
+            foreach (var map in DefaultMap)
             {
-                var mapUid = _map.GetMapOrInvalid(DefaultMap);
-                if (!TerminatingOrDeleted(mapUid))
-                    return new EntityCoordinates(mapUid, Vector2.Zero);
+                if (_map.MapExists(map))
+                {
+                    var mapUid = _map.GetMapOrInvalid(map);
+                    if (!TerminatingOrDeleted(mapUid))
+                        return new EntityCoordinates(mapUid, Vector2.Zero);
+                }
             }
 
             // Just pick a point at this point I guess.

Content.Server/GameTicking/GameTicker.cs

@@ -71,7 +71,7 @@ public sealed partial class GameTicker : SharedGameTicker
         [ViewVariables] private bool _initialized;
         [ViewVariables] private bool _postInitialized;
 
-        [ViewVariables] public MapId DefaultMap { get; private set; }
+        [ViewVariables] public List<MapId> DefaultMap = new(); //starlight, made into a list
 
         private ISawmill _sawmill = default!;
 

Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs

@@ -73,13 +73,17 @@ private void OnLoadingMaps(RoundStartingEvent ev)
         if (_enabled == false)
             return;
 
-        var target = _map.GetMapOrInvalid(_gameTicker.DefaultMap);
-        Log.Debug($"Trying to configure {_gameTicker.DefaultMap}, aka {ToPrettyString(target)} aka {target}");
-        var cfg = _proto.Index<WorldgenConfigPrototype>(_worldgenConfig);
+        //starlight, foreach loop added
+        foreach (var map in _gameTicker.DefaultMap)
+        {
+            var target = _map.GetMapOrInvalid(map);
+            Log.Debug($"Trying to configure {map}, aka {ToPrettyString(target)} aka {target}");
+            var cfg = _proto.Index<WorldgenConfigPrototype>(_worldgenConfig);
 
-        cfg.Apply(target, _ser, EntityManager); // Apply the config to the map.
+            cfg.Apply(target, _ser, EntityManager); // Apply the config to the map.
 
-        DebugTools.Assert(HasComp<WorldControllerComponent>(target));
+            DebugTools.Assert(HasComp<WorldControllerComponent>(target));
+        }
     }
 }