diff --git a/OpenRA.FileFormats/Manifest.cs b/OpenRA.FileFormats/Manifest.cs index 54c46ea58e..363357e333 100644 --- a/OpenRA.FileFormats/Manifest.cs +++ b/OpenRA.FileFormats/Manifest.cs @@ -26,6 +26,7 @@ namespace OpenRA.FileFormats public readonly Dictionary Packages; public readonly MiniYaml LoadScreen; + public readonly MiniYaml LobbyDefaults; public readonly Dictionary> Fonts; public readonly int TileSize = 24; @@ -57,6 +58,7 @@ namespace OpenRA.FileFormats PackageContents = YamlList(yaml, "PackageContents"); LoadScreen = yaml["LoadScreen"]; + LobbyDefaults = yaml["LobbyDefaults"]; Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key, x => Pair.New(x.Value.NodesDict["Font"].Value, int.Parse(x.Value.NodesDict["Size"].Value))); diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 6592c0835c..591e4ade0a 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -106,6 +106,7 @@ namespace OpenRA.Server lobbyInfo.GlobalSettings.Map = settings.Map; lobbyInfo.GlobalSettings.ServerName = settings.Name; lobbyInfo.GlobalSettings.Dedicated = settings.Dedicated; + FieldLoader.Load(lobbyInfo.GlobalSettings, modData.Manifest.LobbyDefaults); foreach (var t in ServerTraits.WithInterface()) t.ServerStarted(this); diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 8aa018e6d4..de89d70c9b 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -52,6 +52,7 @@ Sequences: mods/cnc/sequences/funpark.yaml mods/cnc/sequences/civilian.yaml mods/cnc/sequences/campaign.yaml + Cursors: mods/cnc/cursors.yaml @@ -117,6 +118,8 @@ ServerTraits: PlayerPinger MasterServerPinger +LobbyDefaults: + ChromeMetrics: mods/cnc/metrics.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 10318c4d50..734c68807a 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -104,6 +104,8 @@ ServerTraits: PlayerPinger MasterServerPinger +LobbyDefaults: + ChromeMetrics: mods/d2k/metrics.yaml diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 2756cd7e14..ee61410b09 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -120,6 +120,8 @@ ServerTraits: PlayerPinger MasterServerPinger +LobbyDefaults: + ChromeMetrics: mods/ra/metrics.yaml diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 6dae190fc8..73467ff597 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -143,6 +143,8 @@ ServerTraits: PlayerPinger MasterServerPinger +LobbyDefaults: + ChromeMetrics: mods/ra/metrics.yaml