diff --git a/Content.Server/Maps/GameMapManager.cs b/Content.Server/Maps/GameMapManager.cs index ad0ef26ffe..fccd3c5b62 100644 --- a/Content.Server/Maps/GameMapManager.cs +++ b/Content.Server/Maps/GameMapManager.cs @@ -22,10 +22,15 @@ public sealed class GameMapManager : IGameMapManager [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IChatManager _chatManager = default!; + [ViewVariables] private readonly Queue _previousMaps = new Queue(); + [ViewVariables] private GameMapPrototype _currentMap = default!; + [ViewVariables] private bool _currentMapForced; + [ViewVariables] private bool _mapRotationEnabled; + [ViewVariables] private int _mapQueueDepth = 1; public void Initialize() @@ -170,10 +175,12 @@ public sealed class GameMapManager : IGameMapManager public GameMapPrototype? SelectMapInQueue() { + Logger.InfoS("mapsel", string.Join(", ", _previousMaps)); var eligible = CurrentlyEligibleMaps() .Where(x => x.Votable) .Select(x => (proto: x, weight: GetMapQueuePriority(x.ID))) .OrderByDescending(x => x.weight).ToArray(); + Logger.InfoS("mapsel", string.Join(", ", eligible.Select(x => (x.proto.ID, x.weight)))); if (eligible.Length is 0) return null; diff --git a/Resources/Prototypes/Maps/moose.yml b/Resources/Prototypes/Maps/moose.yml index 2207f6372c..a9ac148462 100644 --- a/Resources/Prototypes/Maps/moose.yml +++ b/Resources/Prototypes/Maps/moose.yml @@ -6,7 +6,7 @@ !type:NanotrasenNameGenerator prefixCreator: '14' mapPath: /Maps/moose.yml - minPlayers: 18 + minPlayers: 0 maxPlayers: 35 overflowJobs: - Assistant @@ -35,5 +35,5 @@ Librarian: [ 1, 1 ] Lawyer: [ 1, 1 ] Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 1, 2 ] + SalvageSpecialist: [ 1, 2 ] Musician: [ 1, 1 ]