diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs index e68aac57e9..10920b9019 100644 --- a/OpenRA.Editor/Form1.cs +++ b/OpenRA.Editor/Form1.cs @@ -426,8 +426,7 @@ namespace OpenRA.Editor pd.TitleBox.Text = surface1.Map.Title; pd.DescBox.Text = surface1.Map.Description; pd.AuthorBox.Text = surface1.Map.Author; - pd.SelectableCheckBox.Checked = surface1.Map.Selectable; - pd.ShellmapCheckBox.Checked = surface1.Map.UseAsShellmap; + pd.mapVisibilityComboBox.SelectedIndex = pd.mapVisibilityComboBox.FindStringExact(Enum.GetName(typeof(MapVisibility), surface1.Map.Visibility)); if (DialogResult.OK != pd.ShowDialog()) return; @@ -435,8 +434,7 @@ namespace OpenRA.Editor surface1.Map.Title = pd.TitleBox.Text; surface1.Map.Description = pd.DescBox.Text; surface1.Map.Author = pd.AuthorBox.Text; - surface1.Map.Selectable = pd.SelectableCheckBox.Checked; - surface1.Map.UseAsShellmap = pd.ShellmapCheckBox.Checked; + surface1.Map.Visibility = (MapVisibility)Enum.Parse(typeof(MapVisibility), pd.mapVisibilityComboBox.SelectedItem.ToString()); } } diff --git a/OpenRA.Editor/PropertiesDialog.Designer.cs b/OpenRA.Editor/PropertiesDialog.Designer.cs index 1a9ef94881..465294649f 100644 --- a/OpenRA.Editor/PropertiesDialog.Designer.cs +++ b/OpenRA.Editor/PropertiesDialog.Designer.cs @@ -43,10 +43,10 @@ namespace OpenRA.Editor this.TitleBox = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.DescBox = new System.Windows.Forms.TextBox(); - this.SelectableCheckBox = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.AuthorBox = new System.Windows.Forms.TextBox(); - this.ShellmapCheckBox = new System.Windows.Forms.CheckBox(); + this.mapVisibilityComboBox = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // button2 @@ -103,16 +103,6 @@ namespace OpenRA.Editor this.DescBox.Size = new System.Drawing.Size(286, 20); this.DescBox.TabIndex = 17; // - // selectable - // - this.SelectableCheckBox.AutoSize = true; - this.SelectableCheckBox.Location = new System.Drawing.Point(118, 138); - this.SelectableCheckBox.Name = "selectable"; - this.SelectableCheckBox.Size = new System.Drawing.Size(130, 17); - this.SelectableCheckBox.TabIndex = 18; - this.SelectableCheckBox.Text = "Show in Map Chooser"; - this.SelectableCheckBox.UseVisualStyleBackColor = true; - // // label3 // this.label3.AutoSize = true; @@ -129,16 +119,27 @@ namespace OpenRA.Editor this.AuthorBox.Size = new System.Drawing.Size(286, 20); this.AuthorBox.TabIndex = 17; // - // checkBox1 - // - this.ShellmapCheckBox.AutoSize = true; - this.ShellmapCheckBox.Location = new System.Drawing.Point(118, 161); - this.ShellmapCheckBox.Name = "checkBox1"; - this.ShellmapCheckBox.Size = new System.Drawing.Size(105, 17); - this.ShellmapCheckBox.TabIndex = 18; - this.ShellmapCheckBox.Text = "Use as Shellmap"; - this.ShellmapCheckBox.UseVisualStyleBackColor = true; // + // mapVisibilityComboBox + // + this.mapVisibilityComboBox.FormattingEnabled = true; + this.mapVisibilityComboBox.Items.AddRange(new object[] { + "Lobby", + "Shellmap", + "MissionSelector"}); + this.mapVisibilityComboBox.Location = new System.Drawing.Point(150, 137); + this.mapVisibilityComboBox.Name = "mapVisibilityComboBox"; + this.mapVisibilityComboBox.Size = new System.Drawing.Size(121, 21); + this.mapVisibilityComboBox.TabIndex = 19; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(90, 140); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(58, 13); + this.label4.TabIndex = 20; + this.label4.Text = "Map class:"; // PropertiesDialog // this.AcceptButton = this.button2; @@ -146,8 +147,8 @@ namespace OpenRA.Editor this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.button1; this.ClientSize = new System.Drawing.Size(370, 228); - this.Controls.Add(this.ShellmapCheckBox); - this.Controls.Add(this.SelectableCheckBox); + this.Controls.Add(this.label4); + this.Controls.Add(this.mapVisibilityComboBox); this.Controls.Add(this.AuthorBox); this.Controls.Add(this.label3); this.Controls.Add(this.DescBox); @@ -173,9 +174,9 @@ namespace OpenRA.Editor public System.Windows.Forms.TextBox TitleBox; private System.Windows.Forms.Label label2; public System.Windows.Forms.TextBox DescBox; - public System.Windows.Forms.CheckBox SelectableCheckBox; private System.Windows.Forms.Label label3; public System.Windows.Forms.TextBox AuthorBox; - public System.Windows.Forms.CheckBox ShellmapCheckBox; + public System.Windows.Forms.ComboBox mapVisibilityComboBox; + private System.Windows.Forms.Label label4; } } diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 1fbb6d8683..e0f52eb772 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -383,7 +383,7 @@ namespace OpenRA static string ChooseShellmap() { var shellmaps = modData.MapCache - .Where(m => m.Status == MapStatus.Available && m.Map.UseAsShellmap) + .Where(m => m.Status == MapStatus.Available && m.Map.Visibility.HasFlag(MapVisibility.Shellmap)) .Select(m => m.Uid); if (!shellmaps.Any()) diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs index c065d6a657..76a40e0f1f 100644 --- a/OpenRA.Game/Map/Map.cs +++ b/OpenRA.Game/Map/Map.cs @@ -100,6 +100,14 @@ namespace OpenRA public string GameLost; } + [Flags] + public enum MapVisibility + { + Lobby = 1, + Shellmap = 2, + MissionSelector = 4 + } + public class Map { [FieldLoader.Ignore] public IFolder Container; @@ -108,8 +116,7 @@ namespace OpenRA // Yaml map data public string Uid { get; private set; } public int MapFormat; - public bool Selectable = true; - public bool UseAsShellmap; + public MapVisibility Visibility = MapVisibility.Lobby; public string RequiresMod; public string Title; @@ -218,6 +225,7 @@ namespace OpenRA Author = "Your name here", MapSize = new int2(size), Tileset = tileset.Id, + Videos = new MapVideos(), Options = new MapOptions(), MapResources = Exts.Lazy(() => new CellLayer(tileShape, size)), MapTiles = makeMapTiles, @@ -225,6 +233,7 @@ namespace OpenRA Actors = Exts.Lazy(() => new Dictionary()), Smudges = Exts.Lazy(() => new List()) }; + map.PostInit(); return map; @@ -242,11 +251,7 @@ namespace OpenRA public Map() { } // The standard constructor for most purposes - public Map(string path) : this(path, null) { } - - // Support upgrading format 5 maps to a more - // recent version by defining upgradeForMod. - public Map(string path, string upgradeForMod) + public Map(string path) { Path = path; Container = GlobalFileSystem.OpenPackage(path, null, int.MaxValue); @@ -260,24 +265,22 @@ namespace OpenRA // Support for formats 1-3 dropped 2011-02-11. // Use release-20110207 to convert older maps to format 4 // Use release-20110511 to convert older maps to format 5 - if (MapFormat < 5) + // Use release-20141029 to convert older maps to format 6 + if (MapFormat < 6) throw new InvalidDataException("Map format {0} is not supported.\n File: {1}".F(MapFormat, path)); - // Format 5 -> 6 enforces the use of RequiresMod - if (MapFormat == 5) - { - if (upgradeForMod == null) - throw new InvalidDataException("Map format {0} is not supported, but can be upgraded.\n File: {1}".F(MapFormat, path)); - - Console.WriteLine("Upgrading {0} from Format 5 to Format 6", path); - - // TODO: This isn't very nice, but there is no other consistent way - // of finding the mod early during the engine initialization. - RequiresMod = upgradeForMod; - } - var nd = yaml.ToDictionary(); + // Format 6 -> 7 combined the Selectable and UseAsShellmap flags into the Class enum + if (MapFormat < 7) + { + MiniYaml useAsShellmap; + if (nd.TryGetValue("UseAsShellmap", out useAsShellmap) && bool.Parse(useAsShellmap.Value)) + Visibility = MapVisibility.Shellmap; + else if (Type == "Mission" || Type == "Campaign") + Visibility = MapVisibility.MissionSelector; + } + // Load players foreach (var my in nd["Players"].ToDictionary().Values) { @@ -327,19 +330,19 @@ namespace OpenRA LastSubCell = (SubCell)(SubCellOffsets.Length - 1); DefaultSubCell = (SubCell)Game.modData.Manifest.SubCellDefaultIndex; - // The Uid is calculated from the data on-disk, so - // format changes must be flushed to disk. - // TODO: this isn't very nice - if (MapFormat < 6) - Save(path); - - Uid = ComputeHash(); - if (Container.Exists("map.png")) using (var dataStream = Container.GetContent("map.png")) CustomPreview = new Bitmap(dataStream); PostInit(); + + // The Uid is calculated from the data on-disk, so + // format changes must be flushed to disk. + // TODO: this isn't very nice + if (MapFormat < 7) + Save(path); + + Uid = ComputeHash(); } void PostInit() @@ -385,12 +388,11 @@ namespace OpenRA public void Save(string toPath) { - MapFormat = 6; + MapFormat = 7; var root = new List(); var fields = new[] { - "Selectable", "MapFormat", "RequiresMod", "Title", @@ -399,7 +401,7 @@ namespace OpenRA "Tileset", "MapSize", "Bounds", - "UseAsShellmap", + "Visibility", "Type", }; diff --git a/OpenRA.Game/Map/MapCache.cs b/OpenRA.Game/Map/MapCache.cs index 2621808439..b02adcdf8b 100644 --- a/OpenRA.Game/Map/MapCache.cs +++ b/OpenRA.Game/Map/MapCache.cs @@ -51,7 +51,7 @@ namespace OpenRA { using (new Support.PerfTimer(path.Key)) { - var map = new Map(path.Key, modData.Manifest.Mod.Id); + var map = new Map(path.Key); if (modData.Manifest.MapCompatibility.Contains(map.RequiresMod)) previews[map.Uid].UpdateFromMap(map, path.Value); } diff --git a/OpenRA.Game/Widgets/WidgetUtils.cs b/OpenRA.Game/Widgets/WidgetUtils.cs index 422688bb48..ed58dc6c8b 100644 --- a/OpenRA.Game/Widgets/WidgetUtils.cs +++ b/OpenRA.Game/Widgets/WidgetUtils.cs @@ -217,7 +217,7 @@ namespace OpenRA.Widgets { Func isIdealMap = m => { - if (m.Status != MapStatus.Available || !m.Map.Selectable) + if (m.Status != MapStatus.Available || !m.Map.Visibility.HasFlag(MapVisibility.Lobby)) return false; // Other map types may have confusing settings or gameplay @@ -236,7 +236,7 @@ namespace OpenRA.Widgets }; var selected = Game.modData.MapCache.Where(m => isIdealMap(m)).RandomOrDefault(Game.CosmeticRandom) ?? - Game.modData.MapCache.First(m => m.Status == MapStatus.Available && m.Map.Selectable); + Game.modData.MapCache.First(m => m.Status == MapStatus.Available && m.Map.Visibility.HasFlag(MapVisibility.Lobby)); return selected.Uid; } diff --git a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs b/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs index 9339342826..4c6314c159 100644 --- a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs +++ b/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs @@ -150,7 +150,6 @@ namespace OpenRA.Mods.Common.UtilityCommands map.MapSize.X = mapSize; map.MapSize.Y = mapSize; map.Bounds = Rectangle.FromLTRB(offsetX, offsetY, offsetX + width, offsetY + height); - map.Selectable = true; map.Smudges = Exts.Lazy(() => new List()); map.Actors = Exts.Lazy(() => new Dictionary()); diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 2802bd7f23..a36b4da6f6 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -173,7 +173,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic { { "initialMap", Map.Uid }, { "onExit", DoNothing }, - { "onSelect", onSelect } + { "onSelect", onSelect }, + { "filter", MapVisibility.Lobby }, }); }; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs index 43d78833cf..6624f049b8 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs @@ -88,7 +88,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var hasCampaign = Game.modData.Manifest.Missions.Any(); var hasMissions = Game.modData.MapCache - .Any(p => p.Status == MapStatus.Available && p.Map.Type == "Mission" && !p.Map.Selectable); + .Any(p => p.Status == MapStatus.Available && p.Map.Visibility.HasFlag(MapVisibility.MissionSelector)); missionsButton.Disabled = !hasCampaign && !hasMissions; diff --git a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs index a09942c448..3474f065c3 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic string gameMode; [ObjectCreator.UseCtor] - internal MapChooserLogic(Widget widget, string initialMap, Action onExit, Action onSelect) + internal MapChooserLogic(Widget widget, string initialMap, Action onExit, Action onSelect, MapVisibility filter) { selectedUid = WidgetUtils.ChooseInitialMap(initialMap); @@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var gameModeDropdown = widget.GetOrNull("GAMEMODE_FILTER"); if (gameModeDropdown != null) { - var selectableMaps = Game.modData.MapCache.Where(m => m.Status == MapStatus.Available && m.Map.Selectable); + var selectableMaps = Game.modData.MapCache.Where(m => m.Status == MapStatus.Available && (m.Map.Visibility & filter) != 0); var gameModes = selectableMaps .GroupBy(m => m.Type) .Select(g => Pair.New(g.Key, g.Count())).ToList(); @@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { var item = ScrollItemWidget.Setup(template, () => gameMode == ii.First, - () => { gameMode = ii.First; EnumerateMaps(onSelect); }); + () => { gameMode = ii.First; EnumerateMaps(onSelect, filter); }); item.Get("LABEL").GetText = () => showItem(ii); return item; }; @@ -84,13 +84,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic else { mapFilter = mapfilterInput.Text = null; - EnumerateMaps(onSelect); + EnumerateMaps(onSelect, filter); } return true; }; mapfilterInput.OnEnterKey = () => { approving(); return true; }; mapfilterInput.OnTextEdited = () => - { mapFilter = mapfilterInput.Text; EnumerateMaps(onSelect); }; + { mapFilter = mapfilterInput.Text; EnumerateMaps(onSelect, filter); }; } var randomMapButton = widget.GetOrNull("RANDOMMAP_BUTTON"); @@ -105,13 +105,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic randomMapButton.IsDisabled = () => visibleMaps == null || visibleMaps.Count == 0; } - EnumerateMaps(onSelect); + EnumerateMaps(onSelect, filter); } - void EnumerateMaps(Action onSelect) + void EnumerateMaps(Action onSelect, MapVisibility filter) { var maps = Game.modData.MapCache - .Where(m => m.Status == MapStatus.Available && m.Map.Selectable) + .Where(m => m.Status == MapStatus.Available && (m.Map.Visibility & filter) != 0) .Where(m => gameMode == null || m.Type == gameMode) .Where(m => mapFilter == null || m.Title.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0 || m.Author.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0) .OrderBy(m => m.PlayerCount) diff --git a/OpenRA.Mods.RA/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MissionBrowserLogic.cs index 2d4cf0edc7..4033dfdc25 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MissionBrowserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MissionBrowserLogic.cs @@ -110,9 +110,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic } // Add an additional group for loose missions - // Loose missions must define Type: Mission and Selectable: false. var looseMissions = Game.modData.MapCache - .Where(p => p.Status == MapStatus.Available && p.Map.Type == "Mission" && !p.Map.Selectable && !allMaps.Contains(p.Map)) + .Where(p => p.Status == MapStatus.Available && p.Map.Visibility.HasFlag(MapVisibility.MissionSelector) && !allMaps.Contains(p.Map)) .Select(p => p.Map); if (looseMissions.Any()) diff --git a/mods/cnc/maps/Instant_Karma.oramap b/mods/cnc/maps/Instant_Karma.oramap index c1e6baa42c..2691c7421a 100644 Binary files a/mods/cnc/maps/Instant_Karma.oramap and b/mods/cnc/maps/Instant_Karma.oramap differ diff --git a/mods/cnc/maps/Nullpeter.oramap b/mods/cnc/maps/Nullpeter.oramap index 9498368a22..817b8b45a0 100644 Binary files a/mods/cnc/maps/Nullpeter.oramap and b/mods/cnc/maps/Nullpeter.oramap differ diff --git a/mods/cnc/maps/break_of_day.oramap b/mods/cnc/maps/break_of_day.oramap index 89d4995675..5a8d08ff12 100644 Binary files a/mods/cnc/maps/break_of_day.oramap and b/mods/cnc/maps/break_of_day.oramap differ diff --git a/mods/cnc/maps/chokepoint.oramap b/mods/cnc/maps/chokepoint.oramap index 236dd362c6..5f17f51de2 100644 Binary files a/mods/cnc/maps/chokepoint.oramap and b/mods/cnc/maps/chokepoint.oramap differ diff --git a/mods/cnc/maps/chord_simple.oramap b/mods/cnc/maps/chord_simple.oramap index e457f409c1..45453c0a24 100644 Binary files a/mods/cnc/maps/chord_simple.oramap and b/mods/cnc/maps/chord_simple.oramap differ diff --git a/mods/cnc/maps/dead_in_motion_2.oramap b/mods/cnc/maps/dead_in_motion_2.oramap index ddb155256f..bafbacbb24 100644 Binary files a/mods/cnc/maps/dead_in_motion_2.oramap and b/mods/cnc/maps/dead_in_motion_2.oramap differ diff --git a/mods/cnc/maps/deterring_democracy.oramap b/mods/cnc/maps/deterring_democracy.oramap index f099270a3b..2c14cd4fba 100644 Binary files a/mods/cnc/maps/deterring_democracy.oramap and b/mods/cnc/maps/deterring_democracy.oramap differ diff --git a/mods/cnc/maps/deterring_democracy_plus.oramap b/mods/cnc/maps/deterring_democracy_plus.oramap index 0045923878..94dc6e8746 100644 Binary files a/mods/cnc/maps/deterring_democracy_plus.oramap and b/mods/cnc/maps/deterring_democracy_plus.oramap differ diff --git a/mods/cnc/maps/eastwest3.oramap b/mods/cnc/maps/eastwest3.oramap index 281aa6793f..79028797e3 100644 Binary files a/mods/cnc/maps/eastwest3.oramap and b/mods/cnc/maps/eastwest3.oramap differ diff --git a/mods/cnc/maps/garden2.oramap b/mods/cnc/maps/garden2.oramap index 844609de50..62249085aa 100644 Binary files a/mods/cnc/maps/garden2.oramap and b/mods/cnc/maps/garden2.oramap differ diff --git a/mods/cnc/maps/gdi01/map.bin b/mods/cnc/maps/gdi01/map.bin index 7314d565bd..8c1ec0f904 100644 Binary files a/mods/cnc/maps/gdi01/map.bin and b/mods/cnc/maps/gdi01/map.bin differ diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 96ff183c05..09e044a49e 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,7 +14,7 @@ MapSize: 64,64 Bounds: 35,39,27,23 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -27,7 +25,6 @@ Videos: GameLost: gameover.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -35,6 +32,7 @@ Options: FragileAlliances: False StartingCash: 5000 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Nod: diff --git a/mods/cnc/maps/gdi02/map.bin b/mods/cnc/maps/gdi02/map.bin index f43c89bc98..c5b926f41d 100644 Binary files a/mods/cnc/maps/gdi02/map.bin and b/mods/cnc/maps/gdi02/map.bin differ diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 939a6a093d..97cfb2605b 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,7 +14,7 @@ MapSize: 64,64 Bounds: 31,31,31,31 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -26,7 +24,6 @@ Videos: GameLost: gameover.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -34,6 +31,7 @@ Options: FragileAlliances: False StartingCash: 5000 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@GDI: diff --git a/mods/cnc/maps/gdi03/map.bin b/mods/cnc/maps/gdi03/map.bin index 626001a409..095606b17d 100644 Binary files a/mods/cnc/maps/gdi03/map.bin and b/mods/cnc/maps/gdi03/map.bin differ diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index a977aedbab..027a8b9ffc 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,7 +14,7 @@ MapSize: 64,64 Bounds: 1,25,45,37 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -27,7 +25,6 @@ Videos: GameLost: gameover.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -35,6 +32,7 @@ Options: FragileAlliances: False StartingCash: 5000 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Nod: diff --git a/mods/cnc/maps/gdi04a/map.bin b/mods/cnc/maps/gdi04a/map.bin index 0823eb4293..f4ce319090 100644 Binary files a/mods/cnc/maps/gdi04a/map.bin and b/mods/cnc/maps/gdi04a/map.bin differ diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index 3e34646843..3866402525 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,7 +14,7 @@ MapSize: 64,64 Bounds: 7,24,51,36 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -28,7 +26,6 @@ Videos: GameLost: gameover.vqa Options: - ShortGame: False Cheats: False Crates: False Fog: True @@ -37,6 +34,7 @@ Options: FragileAlliances: False StartingCash: 0 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Nod: diff --git a/mods/cnc/maps/gdi04b/map.bin b/mods/cnc/maps/gdi04b/map.bin index f43ceb99ae..7ebb8153d9 100644 Binary files a/mods/cnc/maps/gdi04b/map.bin and b/mods/cnc/maps/gdi04b/map.bin differ diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index 5b8d6f1a3a..a6f713435d 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,7 +14,7 @@ MapSize: 64,64 Bounds: 5,11,50,38 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -28,7 +26,6 @@ Videos: GameLost: gameover.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -36,6 +33,7 @@ Options: FragileAlliances: False StartingCash: 0 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Nod: diff --git a/mods/cnc/maps/gdi04c/map.bin b/mods/cnc/maps/gdi04c/map.bin index c3dbef26c9..f796e0ecc7 100644 Binary files a/mods/cnc/maps/gdi04c/map.bin and b/mods/cnc/maps/gdi04c/map.bin differ diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index ca49fb954f..d956f522f6 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,7 +14,7 @@ MapSize: 64,64 Bounds: 14,14,48,44 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -28,7 +26,6 @@ Videos: GameLost: gameover.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -36,6 +33,7 @@ Options: FragileAlliances: False StartingCash: 0 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/cnc/maps/haos_ridges_cnc.oramap b/mods/cnc/maps/haos_ridges_cnc.oramap index 8a48d88973..3f1e7aa76c 100644 Binary files a/mods/cnc/maps/haos_ridges_cnc.oramap and b/mods/cnc/maps/haos_ridges_cnc.oramap differ diff --git a/mods/cnc/maps/hegemony_or_survival.oramap b/mods/cnc/maps/hegemony_or_survival.oramap index 0234a669e4..20ddbeca74 100644 Binary files a/mods/cnc/maps/hegemony_or_survival.oramap and b/mods/cnc/maps/hegemony_or_survival.oramap differ diff --git a/mods/cnc/maps/hegemony_or_survival_8p.oramap b/mods/cnc/maps/hegemony_or_survival_8p.oramap index 5aa8a8f825..5e2240be31 100644 Binary files a/mods/cnc/maps/hegemony_or_survival_8p.oramap and b/mods/cnc/maps/hegemony_or_survival_8p.oramap differ diff --git a/mods/cnc/maps/into_the_river_below.oramap b/mods/cnc/maps/into_the_river_below.oramap index 15eb34df45..e042813476 100644 Binary files a/mods/cnc/maps/into_the_river_below.oramap and b/mods/cnc/maps/into_the_river_below.oramap differ diff --git a/mods/cnc/maps/lessons_from_kosovo.oramap b/mods/cnc/maps/lessons_from_kosovo.oramap index 18aae75777..73d7917138 100644 Binary files a/mods/cnc/maps/lessons_from_kosovo.oramap and b/mods/cnc/maps/lessons_from_kosovo.oramap differ diff --git a/mods/cnc/maps/letters_from_lexington.oramap b/mods/cnc/maps/letters_from_lexington.oramap index ed4d61a8f4..86a3a30649 100644 Binary files a/mods/cnc/maps/letters_from_lexington.oramap and b/mods/cnc/maps/letters_from_lexington.oramap differ diff --git a/mods/cnc/maps/llamas.oramap b/mods/cnc/maps/llamas.oramap index 6d870b5eb6..9672a1ceae 100644 Binary files a/mods/cnc/maps/llamas.oramap and b/mods/cnc/maps/llamas.oramap differ diff --git a/mods/cnc/maps/llamas2.oramap b/mods/cnc/maps/llamas2.oramap index f68866d20c..f1aeb549ef 100644 Binary files a/mods/cnc/maps/llamas2.oramap and b/mods/cnc/maps/llamas2.oramap differ diff --git a/mods/cnc/maps/manufacturing_consent.oramap b/mods/cnc/maps/manufacturing_consent.oramap index 34babc92ae..e40b631201 100644 Binary files a/mods/cnc/maps/manufacturing_consent.oramap and b/mods/cnc/maps/manufacturing_consent.oramap differ diff --git a/mods/cnc/maps/minus_two.oramap b/mods/cnc/maps/minus_two.oramap index 0acc2a1639..8c786dc1f3 100644 Binary files a/mods/cnc/maps/minus_two.oramap and b/mods/cnc/maps/minus_two.oramap differ diff --git a/mods/cnc/maps/necessary_illusions.oramap b/mods/cnc/maps/necessary_illusions.oramap index 4914320f23..6be6780c04 100644 Binary files a/mods/cnc/maps/necessary_illusions.oramap and b/mods/cnc/maps/necessary_illusions.oramap differ diff --git a/mods/cnc/maps/nod01/map.bin b/mods/cnc/maps/nod01/map.bin index c419f2e7f1..e2315a4170 100644 Binary files a/mods/cnc/maps/nod01/map.bin and b/mods/cnc/maps/nod01/map.bin differ diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index 001b646aee..2b23241828 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,7 +14,7 @@ MapSize: 64,64 Bounds: 21,14,37,24 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -25,7 +23,6 @@ Videos: GameLost: nodlose.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -33,6 +30,7 @@ Options: FragileAlliances: False StartingCash: 0 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/cnc/maps/nod03a/map.bin b/mods/cnc/maps/nod03a/map.bin index e993e43515..5f6d6b5fe9 100644 Binary files a/mods/cnc/maps/nod03a/map.bin and b/mods/cnc/maps/nod03a/map.bin differ diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 9b78dcab77..39bd2bb3a3 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -10,15 +8,13 @@ Description: GDI has established a prison camp, where they are detaining some of Author: Westwood Studios -PreviewVideo: nod3.vqa - Tileset: DESERT MapSize: 64,64 Bounds: 13,16,42,33 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -29,7 +25,6 @@ Videos: GameLost: flag.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -37,6 +32,7 @@ Options: FragileAlliances: False StartingCash: 4000 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/cnc/maps/nod03b/map.bin b/mods/cnc/maps/nod03b/map.bin index e37ee46f41..2863be4743 100644 Binary files a/mods/cnc/maps/nod03b/map.bin and b/mods/cnc/maps/nod03b/map.bin differ diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index cba4ea3e66..c4a568db9a 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -10,15 +8,13 @@ Description: GDI has established a prison camp, where they are detaining some of Author: Westwood Studios -PreviewVideo: nod3.vqa - Tileset: DESERT MapSize: 64,64 Bounds: 13,16,42,34 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -29,7 +25,6 @@ Videos: GameLost: flag.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -37,6 +32,7 @@ Options: FragileAlliances: False StartingCash: 4000 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/cnc/maps/pirates_and_emperors.oramap b/mods/cnc/maps/pirates_and_emperors.oramap index bbd03f940c..d99f46cb00 100644 Binary files a/mods/cnc/maps/pirates_and_emperors.oramap and b/mods/cnc/maps/pirates_and_emperors.oramap differ diff --git a/mods/cnc/maps/pressure_cnc.oramap b/mods/cnc/maps/pressure_cnc.oramap index 51e23daff4..27f54e5236 100644 Binary files a/mods/cnc/maps/pressure_cnc.oramap and b/mods/cnc/maps/pressure_cnc.oramap differ diff --git a/mods/cnc/maps/profit_over_people.oramap b/mods/cnc/maps/profit_over_people.oramap index 63b1205e71..b59437abee 100644 Binary files a/mods/cnc/maps/profit_over_people.oramap and b/mods/cnc/maps/profit_over_people.oramap differ diff --git a/mods/cnc/maps/rogue_states.oramap b/mods/cnc/maps/rogue_states.oramap index 39574caf2d..3267ee1327 100644 Binary files a/mods/cnc/maps/rogue_states.oramap and b/mods/cnc/maps/rogue_states.oramap differ diff --git a/mods/cnc/maps/rubicon.oramap b/mods/cnc/maps/rubicon.oramap index 55ecb63418..e31a1469cd 100644 Binary files a/mods/cnc/maps/rubicon.oramap and b/mods/cnc/maps/rubicon.oramap differ diff --git a/mods/cnc/maps/sea_and_cake.oramap b/mods/cnc/maps/sea_and_cake.oramap index 47de25f486..3be4ed3580 100644 Binary files a/mods/cnc/maps/sea_and_cake.oramap and b/mods/cnc/maps/sea_and_cake.oramap differ diff --git a/mods/cnc/maps/shellmap/map.bin b/mods/cnc/maps/shellmap/map.bin index e909f037b9..3b426e662c 100644 Binary files a/mods/cnc/maps/shellmap/map.bin and b/mods/cnc/maps/shellmap/map.bin differ diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml index e54e063d3b..74fec2a1ef 100644 --- a/mods/cnc/maps/shellmap/map.yaml +++ b/mods/cnc/maps/shellmap/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,10 +14,12 @@ MapSize: 96,48 Bounds: 8,1,80,45 -UseAsShellmap: True +Visibility: Shellmap Type: Shellmap +Videos: + Options: Players: diff --git a/mods/cnc/maps/the-hot-box/map.bin b/mods/cnc/maps/the-hot-box/map.bin index b34b6f4f1b..156f5f2b1b 100644 Binary files a/mods/cnc/maps/the-hot-box/map.bin and b/mods/cnc/maps/the-hot-box/map.bin differ diff --git a/mods/cnc/maps/the-hot-box/map.yaml b/mods/cnc/maps/the-hot-box/map.yaml index 4cbae39a4b..302ca863eb 100644 --- a/mods/cnc/maps/the-hot-box/map.yaml +++ b/mods/cnc/maps/the-hot-box/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: cnc @@ -16,10 +14,12 @@ MapSize: 64,64 Bounds: 16,16,36,36 -UseAsShellmap: False +Visibility: Lobby Type: Drop Zone +Videos: + Options: Crates: True Fog: False diff --git a/mods/cnc/maps/the_hourglass.oramap b/mods/cnc/maps/the_hourglass.oramap index 18c6161aab..d26b5d5726 100644 Binary files a/mods/cnc/maps/the_hourglass.oramap and b/mods/cnc/maps/the_hourglass.oramap differ diff --git a/mods/cnc/maps/thesentinel.oramap b/mods/cnc/maps/thesentinel.oramap index d0e7ea1f25..047c13f297 100644 Binary files a/mods/cnc/maps/thesentinel.oramap and b/mods/cnc/maps/thesentinel.oramap differ diff --git a/mods/cnc/maps/tiberium-oasis-cluster.oramap b/mods/cnc/maps/tiberium-oasis-cluster.oramap index 411418a690..21a1d22444 100644 Binary files a/mods/cnc/maps/tiberium-oasis-cluster.oramap and b/mods/cnc/maps/tiberium-oasis-cluster.oramap differ diff --git a/mods/cnc/maps/white_acres.oramap b/mods/cnc/maps/white_acres.oramap index 28ca656345..2bf7d5ebe5 100644 Binary files a/mods/cnc/maps/white_acres.oramap and b/mods/cnc/maps/white_acres.oramap differ diff --git a/mods/d2k/maps/death-depths.oramap b/mods/d2k/maps/death-depths.oramap index 4b5832580d..143b261130 100644 Binary files a/mods/d2k/maps/death-depths.oramap and b/mods/d2k/maps/death-depths.oramap differ diff --git a/mods/d2k/maps/desert-twister.oramap b/mods/d2k/maps/desert-twister.oramap index 30d704be3c..ed79a3cc77 100644 Binary files a/mods/d2k/maps/desert-twister.oramap and b/mods/d2k/maps/desert-twister.oramap differ diff --git a/mods/d2k/maps/imperial-basin.oramap b/mods/d2k/maps/imperial-basin.oramap index cc03971e8d..4bfa4cc6f0 100644 Binary files a/mods/d2k/maps/imperial-basin.oramap and b/mods/d2k/maps/imperial-basin.oramap differ diff --git a/mods/d2k/maps/mount-idaho.oramap b/mods/d2k/maps/mount-idaho.oramap index 529d952d61..ca5d7e5f19 100644 Binary files a/mods/d2k/maps/mount-idaho.oramap and b/mods/d2k/maps/mount-idaho.oramap differ diff --git a/mods/d2k/maps/oasis-conquest.oramap b/mods/d2k/maps/oasis-conquest.oramap index 8d9aed06c5..9ab41784de 100644 Binary files a/mods/d2k/maps/oasis-conquest.oramap and b/mods/d2k/maps/oasis-conquest.oramap differ diff --git a/mods/d2k/maps/pasty-mesa.oramap b/mods/d2k/maps/pasty-mesa.oramap index c53f1c3969..1f2d398ca6 100644 Binary files a/mods/d2k/maps/pasty-mesa.oramap and b/mods/d2k/maps/pasty-mesa.oramap differ diff --git a/mods/d2k/maps/shellmap/map.bin b/mods/d2k/maps/shellmap/map.bin index 74e247c571..61a628a722 100644 Binary files a/mods/d2k/maps/shellmap/map.bin and b/mods/d2k/maps/shellmap/map.bin differ diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml index 0d28aee1ae..43e9393714 100644 --- a/mods/d2k/maps/shellmap/map.yaml +++ b/mods/d2k/maps/shellmap/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: d2k @@ -16,10 +14,12 @@ MapSize: 128,128 Bounds: 16,16,80,80 -UseAsShellmap: True +Visibility: Shellmap Type: Shellmap +Videos: + Options: Players: diff --git a/mods/d2k/maps/the-duell.oramap b/mods/d2k/maps/the-duell.oramap index 43560a80e0..d13bd2114a 100644 Binary files a/mods/d2k/maps/the-duell.oramap and b/mods/d2k/maps/the-duell.oramap differ diff --git a/mods/d2k/maps/tucks-sietch.oramap b/mods/d2k/maps/tucks-sietch.oramap index 2cb96356d6..602a0004c7 100644 Binary files a/mods/d2k/maps/tucks-sietch.oramap and b/mods/d2k/maps/tucks-sietch.oramap differ diff --git a/mods/d2k/maps/venac-ditch.oramap b/mods/d2k/maps/venac-ditch.oramap index b8b02ac28a..ad309f8772 100644 Binary files a/mods/d2k/maps/venac-ditch.oramap and b/mods/d2k/maps/venac-ditch.oramap differ diff --git a/mods/d2k/maps/vladimirs-folly.oramap b/mods/d2k/maps/vladimirs-folly.oramap index 273ff46953..e1b58c3b6e 100644 Binary files a/mods/d2k/maps/vladimirs-folly.oramap and b/mods/d2k/maps/vladimirs-folly.oramap differ diff --git a/mods/ra/maps/Sahara.oramap b/mods/ra/maps/Sahara.oramap index 6e5b3ccd02..f08f88c08c 100644 Binary files a/mods/ra/maps/Sahara.oramap and b/mods/ra/maps/Sahara.oramap differ diff --git a/mods/ra/maps/a-path-beyond.oramap b/mods/ra/maps/a-path-beyond.oramap index 136693134d..d5ee3a0668 100644 Binary files a/mods/ra/maps/a-path-beyond.oramap and b/mods/ra/maps/a-path-beyond.oramap differ diff --git a/mods/ra/maps/alaska-anarchy-redux.oramap b/mods/ra/maps/alaska-anarchy-redux.oramap index a23322fce7..ee3092bef9 100644 Binary files a/mods/ra/maps/alaska-anarchy-redux.oramap and b/mods/ra/maps/alaska-anarchy-redux.oramap differ diff --git a/mods/ra/maps/all-connected.oramap b/mods/ra/maps/all-connected.oramap index 886c3ef8ad..fbe5fc38df 100644 Binary files a/mods/ra/maps/all-connected.oramap and b/mods/ra/maps/all-connected.oramap differ diff --git a/mods/ra/maps/allies-01/map.bin b/mods/ra/maps/allies-01/map.bin index c99d9acca0..9531b648e3 100644 Binary files a/mods/ra/maps/allies-01/map.bin and b/mods/ra/maps/allies-01/map.bin differ diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index 194dca0b8c..5ae5456e43 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/mods/ra/maps/allies-01/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,7 +14,7 @@ MapSize: 128,128 Bounds: 49,45,30,36 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign diff --git a/mods/ra/maps/allies-02/map.bin b/mods/ra/maps/allies-02/map.bin index ebace1686e..a76f3d1d5a 100644 Binary files a/mods/ra/maps/allies-02/map.bin and b/mods/ra/maps/allies-02/map.bin differ diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index 4b24264b43..dc9292701d 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/mods/ra/maps/allies-02/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,7 +14,7 @@ MapSize: 128,128 Bounds: 43,44,50,42 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -27,7 +25,6 @@ Videos: GameLost: frozen.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -35,6 +32,7 @@ Options: FragileAlliances: False StartingCash: 5700 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@USSR: diff --git a/mods/ra/maps/allies-03a/map.bin b/mods/ra/maps/allies-03a/map.bin index d811058e10..21c7fc1323 100644 Binary files a/mods/ra/maps/allies-03a/map.bin and b/mods/ra/maps/allies-03a/map.bin differ diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index 81a6c0a560..57eab63b2c 100644 --- a/mods/ra/maps/allies-03a/map.yaml +++ b/mods/ra/maps/allies-03a/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,7 +14,7 @@ MapSize: 128,128 Bounds: 35,48,72,36 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -26,7 +24,6 @@ Videos: GameLost: sovtstar.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -35,6 +32,7 @@ Options: StartingCash: 0 ConfigurableStartingUnits: False Difficulties: Easy, Normal + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/ra/maps/arctic-triangle-affair.oramap b/mods/ra/maps/arctic-triangle-affair.oramap index ac33759820..498a750b6f 100644 Binary files a/mods/ra/maps/arctic-triangle-affair.oramap and b/mods/ra/maps/arctic-triangle-affair.oramap differ diff --git a/mods/ra/maps/asymetric-battle.oramap b/mods/ra/maps/asymetric-battle.oramap index 997279afef..3a9e33a12c 100644 Binary files a/mods/ra/maps/asymetric-battle.oramap and b/mods/ra/maps/asymetric-battle.oramap differ diff --git a/mods/ra/maps/bad-neighbors.oramap b/mods/ra/maps/bad-neighbors.oramap index 424569ce05..0047b602d7 100644 Binary files a/mods/ra/maps/bad-neighbors.oramap and b/mods/ra/maps/bad-neighbors.oramap differ diff --git a/mods/ra/maps/bloody-delta.oramap b/mods/ra/maps/bloody-delta.oramap index 9f5af1d0e0..f5366e1169 100644 Binary files a/mods/ra/maps/bloody-delta.oramap and b/mods/ra/maps/bloody-delta.oramap differ diff --git a/mods/ra/maps/bombardment-islands.oramap b/mods/ra/maps/bombardment-islands.oramap index 3d899a88ba..d0601190eb 100644 Binary files a/mods/ra/maps/bombardment-islands.oramap and b/mods/ra/maps/bombardment-islands.oramap differ diff --git a/mods/ra/maps/bomber-john/map.bin b/mods/ra/maps/bomber-john/map.bin index 8c65fb649c..52a01ccdef 100644 Binary files a/mods/ra/maps/bomber-john/map.bin and b/mods/ra/maps/bomber-john/map.bin differ diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index c7c6f7ecbb..11b1e83a34 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 56,56 Bounds: 16,16,24,24 -UseAsShellmap: False +Visibility: Lobby Type: Minigame +Videos: + Options: Crates: False Fog: True diff --git a/mods/ra/maps/breaking-point.oramap b/mods/ra/maps/breaking-point.oramap index 365defb030..46d1baec05 100644 Binary files a/mods/ra/maps/breaking-point.oramap and b/mods/ra/maps/breaking-point.oramap differ diff --git a/mods/ra/maps/burlesca/map.bin b/mods/ra/maps/burlesca/map.bin index ba279f83d9..4dac58ea4f 100644 Binary files a/mods/ra/maps/burlesca/map.bin and b/mods/ra/maps/burlesca/map.bin differ diff --git a/mods/ra/maps/burlesca/map.yaml b/mods/ra/maps/burlesca/map.yaml index 7e85557efc..4b20ca2d9b 100644 --- a/mods/ra/maps/burlesca/map.yaml +++ b/mods/ra/maps/burlesca/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -14,10 +12,12 @@ MapSize: 64,64 Bounds: 4,4,56,56 -UseAsShellmap: False +Visibility: Lobby Type: Conquest +Videos: + Options: Players: diff --git a/mods/ra/maps/caffeinated.oramap b/mods/ra/maps/caffeinated.oramap index 57dd2d1fad..d757ef5678 100644 Binary files a/mods/ra/maps/caffeinated.oramap and b/mods/ra/maps/caffeinated.oramap differ diff --git a/mods/ra/maps/calm-before-storm.oramap b/mods/ra/maps/calm-before-storm.oramap index a4474c4716..f48ea67f9d 100644 Binary files a/mods/ra/maps/calm-before-storm.oramap and b/mods/ra/maps/calm-before-storm.oramap differ diff --git a/mods/ra/maps/center-of-attention-redux-2/map.bin b/mods/ra/maps/center-of-attention-redux-2/map.bin index c35bd6c10e..c53956b3a6 100644 Binary files a/mods/ra/maps/center-of-attention-redux-2/map.bin and b/mods/ra/maps/center-of-attention-redux-2/map.bin differ diff --git a/mods/ra/maps/center-of-attention-redux-2/map.yaml b/mods/ra/maps/center-of-attention-redux-2/map.yaml index eaddc3c145..1a067cea68 100644 --- a/mods/ra/maps/center-of-attention-redux-2/map.yaml +++ b/mods/ra/maps/center-of-attention-redux-2/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -14,10 +12,12 @@ MapSize: 128,128 Bounds: 15,10,105,114 -UseAsShellmap: False +Visibility: Lobby Type: Conquest +Videos: + Options: Players: diff --git a/mods/ra/maps/central-conflict.oramap b/mods/ra/maps/central-conflict.oramap index 191e68b8df..60088619d6 100644 Binary files a/mods/ra/maps/central-conflict.oramap and b/mods/ra/maps/central-conflict.oramap differ diff --git a/mods/ra/maps/chaos-canyon.oramap b/mods/ra/maps/chaos-canyon.oramap index 9782965b25..8a63576365 100644 Binary files a/mods/ra/maps/chaos-canyon.oramap and b/mods/ra/maps/chaos-canyon.oramap differ diff --git a/mods/ra/maps/chokepoint.oramap b/mods/ra/maps/chokepoint.oramap index 4cc2ea6982..128b76c678 100644 Binary files a/mods/ra/maps/chokepoint.oramap and b/mods/ra/maps/chokepoint.oramap differ diff --git a/mods/ra/maps/coastal-influence.oramap b/mods/ra/maps/coastal-influence.oramap index 9929786dea..928e6d48db 100644 Binary files a/mods/ra/maps/coastal-influence.oramap and b/mods/ra/maps/coastal-influence.oramap differ diff --git a/mods/ra/maps/contact.oramap b/mods/ra/maps/contact.oramap index f9ccea049a..f538b51551 100644 Binary files a/mods/ra/maps/contact.oramap and b/mods/ra/maps/contact.oramap differ diff --git a/mods/ra/maps/desert-shellmap/map.bin b/mods/ra/maps/desert-shellmap/map.bin index e11ce7baa2..1eafc5fec1 100644 Binary files a/mods/ra/maps/desert-shellmap/map.bin and b/mods/ra/maps/desert-shellmap/map.bin differ diff --git a/mods/ra/maps/desert-shellmap/map.yaml b/mods/ra/maps/desert-shellmap/map.yaml index 47f9532cca..712a4b131a 100644 --- a/mods/ra/maps/desert-shellmap/map.yaml +++ b/mods/ra/maps/desert-shellmap/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 128,128 Bounds: 1,1,126,126 -UseAsShellmap: True +Visibility: Shellmap Type: Shellmap +Videos: + Options: Players: diff --git a/mods/ra/maps/doubles.oramap b/mods/ra/maps/doubles.oramap index eeb5d1279d..f62f412535 100644 Binary files a/mods/ra/maps/doubles.oramap and b/mods/ra/maps/doubles.oramap differ diff --git a/mods/ra/maps/doughnut.oramap b/mods/ra/maps/doughnut.oramap index 992dbe1e3a..52c4b7c71b 100644 Binary files a/mods/ra/maps/doughnut.oramap and b/mods/ra/maps/doughnut.oramap differ diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.bin b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.bin index b041796184..b4ac4514e3 100755 Binary files a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.bin and b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.bin differ diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 8d44306aa2..3b6145d217 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 64,64 Bounds: 16,16,32,32 -UseAsShellmap: False +Visibility: Lobby Type: Drop Zone +Videos: + Options: Crates: True Fog: False diff --git a/mods/ra/maps/drop-zone-w/map.bin b/mods/ra/maps/drop-zone-w/map.bin index 5924bbf570..931f1ce339 100755 Binary files a/mods/ra/maps/drop-zone-w/map.bin and b/mods/ra/maps/drop-zone-w/map.bin differ diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 19c18a288c..badfe798d4 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 64,64 Bounds: 16,16,32,32 -UseAsShellmap: False +Visibility: Lobby Type: Drop Zone +Videos: + Options: Crates: True Fog: False diff --git a/mods/ra/maps/drop-zone/map.bin b/mods/ra/maps/drop-zone/map.bin index 5def5e9738..cf77f6c097 100644 Binary files a/mods/ra/maps/drop-zone/map.bin and b/mods/ra/maps/drop-zone/map.bin differ diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index 72fdb6989a..455f44c5b5 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 64,64 Bounds: 16,16,32,32 -UseAsShellmap: False +Visibility: Lobby Type: Drop Zone +Videos: + Options: Crates: True Fog: False diff --git a/mods/ra/maps/east-vs-west.oramap b/mods/ra/maps/east-vs-west.oramap index b0c48c8294..dcd74c479a 100644 Binary files a/mods/ra/maps/east-vs-west.oramap and b/mods/ra/maps/east-vs-west.oramap differ diff --git a/mods/ra/maps/encounter.oramap b/mods/ra/maps/encounter.oramap index 71e47b5f6d..214e3f1f80 100644 Binary files a/mods/ra/maps/encounter.oramap and b/mods/ra/maps/encounter.oramap differ diff --git a/mods/ra/maps/engagement.oramap b/mods/ra/maps/engagement.oramap index c04d4373dc..95f3ec2e47 100644 Binary files a/mods/ra/maps/engagement.oramap and b/mods/ra/maps/engagement.oramap differ diff --git a/mods/ra/maps/equal-opportunity.oramap b/mods/ra/maps/equal-opportunity.oramap index 88dc5919fd..79b4cbf49e 100644 Binary files a/mods/ra/maps/equal-opportunity.oramap and b/mods/ra/maps/equal-opportunity.oramap differ diff --git a/mods/ra/maps/first-come-first-served.oramap b/mods/ra/maps/first-come-first-served.oramap index eac4a037ca..1d473b4c6b 100644 Binary files a/mods/ra/maps/first-come-first-served.oramap and b/mods/ra/maps/first-come-first-served.oramap differ diff --git a/mods/ra/maps/forest-path.oramap b/mods/ra/maps/forest-path.oramap index 73a72da9f5..e8460ecf6f 100644 Binary files a/mods/ra/maps/forest-path.oramap and b/mods/ra/maps/forest-path.oramap differ diff --git a/mods/ra/maps/fort-lonestar/map.bin b/mods/ra/maps/fort-lonestar/map.bin index f3a2b6011f..6115d4ddd4 100644 Binary files a/mods/ra/maps/fort-lonestar/map.bin and b/mods/ra/maps/fort-lonestar/map.bin differ diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index bb40b63b5f..0fea14e5c3 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,18 +14,20 @@ MapSize: 96,96 Bounds: 8,8,48,48 -UseAsShellmap: False +Visibility: Lobby Type: Minigame +Videos: + Options: - ShortGame: False Fog: True Shroud: True AllyBuildRadius: False FragileAlliances: False StartingCash: 50 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/ra/maps/ghost-town.oramap b/mods/ra/maps/ghost-town.oramap index 50acfb3ddb..fe38074080 100644 Binary files a/mods/ra/maps/ghost-town.oramap and b/mods/ra/maps/ghost-town.oramap differ diff --git a/mods/ra/maps/haos-ridges.oramap b/mods/ra/maps/haos-ridges.oramap index 78aaa1f201..9b085215f2 100644 Binary files a/mods/ra/maps/haos-ridges.oramap and b/mods/ra/maps/haos-ridges.oramap differ diff --git a/mods/ra/maps/high-and-low-extended.oramap b/mods/ra/maps/high-and-low-extended.oramap index ef9c026c4a..ff795ef6c6 100644 Binary files a/mods/ra/maps/high-and-low-extended.oramap and b/mods/ra/maps/high-and-low-extended.oramap differ diff --git a/mods/ra/maps/high-and-low.oramap b/mods/ra/maps/high-and-low.oramap index c9e7d925a4..4a8a9553e1 100644 Binary files a/mods/ra/maps/high-and-low.oramap and b/mods/ra/maps/high-and-low.oramap differ diff --git a/mods/ra/maps/intervention/map.bin b/mods/ra/maps/intervention/map.bin index 0e08aabd4f..e22bcac312 100644 Binary files a/mods/ra/maps/intervention/map.bin and b/mods/ra/maps/intervention/map.bin differ diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index 4f3fb23918..537e1150f7 100644 --- a/mods/ra/maps/intervention/map.yaml +++ b/mods/ra/maps/intervention/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,12 +14,13 @@ MapSize: 160,160 Bounds: 16,16,128,128 -UseAsShellmap: False +Visibility: MissionSelector Type: Mission +Videos: + Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -30,6 +29,7 @@ Options: StartingCash: 2000 ConfigurableStartingUnits: False Difficulties: Medium, Hard + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/ra/maps/island-hoppers.oramap b/mods/ra/maps/island-hoppers.oramap index fbed338715..cbf675ef11 100644 Binary files a/mods/ra/maps/island-hoppers.oramap and b/mods/ra/maps/island-hoppers.oramap differ diff --git a/mods/ra/maps/keep-off-the-grass-2.oramap b/mods/ra/maps/keep-off-the-grass-2.oramap index 1d1922a404..c09aaf7190 100644 Binary files a/mods/ra/maps/keep-off-the-grass-2.oramap and b/mods/ra/maps/keep-off-the-grass-2.oramap differ diff --git a/mods/ra/maps/koth-hopes-anchor/map.bin b/mods/ra/maps/koth-hopes-anchor/map.bin index 0116e3a7f1..8334a53895 100644 Binary files a/mods/ra/maps/koth-hopes-anchor/map.bin and b/mods/ra/maps/koth-hopes-anchor/map.bin differ diff --git a/mods/ra/maps/koth-hopes-anchor/map.yaml b/mods/ra/maps/koth-hopes-anchor/map.yaml index 1fff527e21..3f5d08e75e 100644 --- a/mods/ra/maps/koth-hopes-anchor/map.yaml +++ b/mods/ra/maps/koth-hopes-anchor/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 128,128 Bounds: 2,2,110,124 -UseAsShellmap: False +Visibility: Lobby Type: KotH +Videos: + Options: Players: @@ -31,51 +31,51 @@ Players: PlayerReference@Multi0: Name: Multi0 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi1: Name: Multi1 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi2: Name: Multi2 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi3: Name: Multi3 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi4: Name: Multi4 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi5: Name: Multi5 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi6: Name: Multi6 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi7: Name: Multi7 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Creeps: Name: Creeps NonCombatant: True diff --git a/mods/ra/maps/man-to-man.oramap b/mods/ra/maps/man-to-man.oramap index 8dc825a472..5474d8060f 100644 Binary files a/mods/ra/maps/man-to-man.oramap and b/mods/ra/maps/man-to-man.oramap differ diff --git a/mods/ra/maps/marooned-2.oramap b/mods/ra/maps/marooned-2.oramap index cde635a98e..63c3bdb5c0 100644 Binary files a/mods/ra/maps/marooned-2.oramap and b/mods/ra/maps/marooned-2.oramap differ diff --git a/mods/ra/maps/mass-confliction.oramap b/mods/ra/maps/mass-confliction.oramap index c241b2d608..5bf9680bce 100644 Binary files a/mods/ra/maps/mass-confliction.oramap and b/mods/ra/maps/mass-confliction.oramap differ diff --git a/mods/ra/maps/monster-tank-madness/map.bin b/mods/ra/maps/monster-tank-madness/map.bin index 00599aec5e..f0fefe7145 100644 Binary files a/mods/ra/maps/monster-tank-madness/map.bin and b/mods/ra/maps/monster-tank-madness/map.bin differ diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index d1bd780c44..fb4b8424d1 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,12 +14,13 @@ MapSize: 128,128 Bounds: 19,16,87,88 -UseAsShellmap: False +Visibility: MissionSelector Type: Mission +Videos: + Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -29,6 +28,7 @@ Options: FragileAlliances: False StartingCash: 5000 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@Greece: diff --git a/mods/ra/maps/north-by-northwest.oramap b/mods/ra/maps/north-by-northwest.oramap index 2d0f83243f..46a0536062 100644 Binary files a/mods/ra/maps/north-by-northwest.oramap and b/mods/ra/maps/north-by-northwest.oramap differ diff --git a/mods/ra/maps/pearly-wastelands.oramap b/mods/ra/maps/pearly-wastelands.oramap index fcb9ef49ce..7b33edc5c2 100644 Binary files a/mods/ra/maps/pearly-wastelands.oramap and b/mods/ra/maps/pearly-wastelands.oramap differ diff --git a/mods/ra/maps/poland-raid/map.bin b/mods/ra/maps/poland-raid/map.bin index 0da5bd106d..86f76fda9f 100644 Binary files a/mods/ra/maps/poland-raid/map.bin and b/mods/ra/maps/poland-raid/map.bin differ diff --git a/mods/ra/maps/poland-raid/map.yaml b/mods/ra/maps/poland-raid/map.yaml index e9f3f73f97..f03de45450 100644 --- a/mods/ra/maps/poland-raid/map.yaml +++ b/mods/ra/maps/poland-raid/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 128,128 Bounds: 16,16,96,96 -UseAsShellmap: False +Visibility: Lobby Type: Conquest +Videos: + Options: Players: diff --git a/mods/ra/maps/pressure.oramap b/mods/ra/maps/pressure.oramap index 25ab1d247d..4a79dd5a7e 100644 Binary files a/mods/ra/maps/pressure.oramap and b/mods/ra/maps/pressure.oramap differ diff --git a/mods/ra/maps/puddles-redux.oramap b/mods/ra/maps/puddles-redux.oramap index e49f1b2d10..69eafc7ae5 100644 Binary files a/mods/ra/maps/puddles-redux.oramap and b/mods/ra/maps/puddles-redux.oramap differ diff --git a/mods/ra/maps/raraku.oramap b/mods/ra/maps/raraku.oramap index 0ecab19381..e1918fe7d6 100644 Binary files a/mods/ra/maps/raraku.oramap and b/mods/ra/maps/raraku.oramap differ diff --git a/mods/ra/maps/regeneration-basin.oramap b/mods/ra/maps/regeneration-basin.oramap index 7a20a1d6da..df4b6b2e4f 100644 Binary files a/mods/ra/maps/regeneration-basin.oramap and b/mods/ra/maps/regeneration-basin.oramap differ diff --git a/mods/ra/maps/ring-of-fire.oramap b/mods/ra/maps/ring-of-fire.oramap index 8efb6904df..a07ce2de00 100644 Binary files a/mods/ra/maps/ring-of-fire.oramap and b/mods/ra/maps/ring-of-fire.oramap differ diff --git a/mods/ra/maps/seaside-2.oramap b/mods/ra/maps/seaside-2.oramap index 06f81dc7e2..c4b9973ea8 100644 Binary files a/mods/ra/maps/seaside-2.oramap and b/mods/ra/maps/seaside-2.oramap differ diff --git a/mods/ra/maps/singles.oramap b/mods/ra/maps/singles.oramap index 6c52fdb898..b4703fca2c 100644 Binary files a/mods/ra/maps/singles.oramap and b/mods/ra/maps/singles.oramap differ diff --git a/mods/ra/maps/snow town.oramap b/mods/ra/maps/snow town.oramap index 28f6fb438f..de6566c67a 100644 Binary files a/mods/ra/maps/snow town.oramap and b/mods/ra/maps/snow town.oramap differ diff --git a/mods/ra/maps/snowy-island.oramap b/mods/ra/maps/snowy-island.oramap index f2ec7781f7..3541055a3d 100644 Binary files a/mods/ra/maps/snowy-island.oramap and b/mods/ra/maps/snowy-island.oramap differ diff --git a/mods/ra/maps/snowyridge.oramap b/mods/ra/maps/snowyridge.oramap index d47d166903..79d54522f5 100644 Binary files a/mods/ra/maps/snowyridge.oramap and b/mods/ra/maps/snowyridge.oramap differ diff --git a/mods/ra/maps/soviet-01/map.bin b/mods/ra/maps/soviet-01/map.bin index 93624ab355..9f637415f8 100644 Binary files a/mods/ra/maps/soviet-01/map.bin and b/mods/ra/maps/soviet-01/map.bin differ diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 355b7e9813..61b3c6e2ce 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,7 +14,7 @@ MapSize: 128,128 Bounds: 32,47,32,38 -UseAsShellmap: False +Visibility: MissionSelector Type: Campaign @@ -27,7 +25,6 @@ Videos: GameLost: sfrozen.vqa Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -35,6 +32,7 @@ Options: FragileAlliances: False StartingCash: 0 ConfigurableStartingUnits: False + ShortGame: False Players: PlayerReference@France: @@ -45,11 +43,11 @@ Players: Enemies: USSR PlayerReference@Germany: Name: Germany + NonCombatant: True Race: allies ColorRamp: 0,0,80 Allies: France, Turkey Enemies: USSR - NonCombatant: True PlayerReference@USSR: Name: USSR Playable: True @@ -64,11 +62,11 @@ Players: Enemies: France, Germany, Turkey PlayerReference@Turkey: Name: Turkey + NonCombatant: True Race: allies ColorRamp: 14,123,167 Allies: France, Germany Enemies: USSR - NonCombatant: True PlayerReference@Neutral: Name: Neutral OwnsWorld: True diff --git a/mods/ra/maps/styrian-mountains.oramap b/mods/ra/maps/styrian-mountains.oramap index 566f63edc1..973f56c5bc 100644 Binary files a/mods/ra/maps/styrian-mountains.oramap and b/mods/ra/maps/styrian-mountains.oramap differ diff --git a/mods/ra/maps/suffrage.oramap b/mods/ra/maps/suffrage.oramap index 4f37260bd1..9427dd5263 100644 Binary files a/mods/ra/maps/suffrage.oramap and b/mods/ra/maps/suffrage.oramap differ diff --git a/mods/ra/maps/survival01/map.bin b/mods/ra/maps/survival01/map.bin index 942e6c2de7..a2b65acb05 100644 Binary files a/mods/ra/maps/survival01/map.bin and b/mods/ra/maps/survival01/map.bin differ diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index d3f13892d0..410ecd5162 100644 --- a/mods/ra/maps/survival01/map.yaml +++ b/mods/ra/maps/survival01/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,12 +14,13 @@ MapSize: 96,64 Bounds: 4,4,88,56 -UseAsShellmap: False +Visibility: MissionSelector Type: Mission +Videos: + Options: - ShortGame: False Crates: False Fog: True Shroud: True @@ -30,6 +29,7 @@ Options: StartingCash: 5000 ConfigurableStartingUnits: False Difficulties: Easy, Medium, Hard + ShortGame: False Players: PlayerReference@Neutral: diff --git a/mods/ra/maps/synergy.oramap b/mods/ra/maps/synergy.oramap index 64f03753da..eecff47cd3 100644 Binary files a/mods/ra/maps/synergy.oramap and b/mods/ra/maps/synergy.oramap differ diff --git a/mods/ra/maps/tainted-peak.oramap b/mods/ra/maps/tainted-peak.oramap index 383fdf5c34..2369256e3d 100644 Binary files a/mods/ra/maps/tainted-peak.oramap and b/mods/ra/maps/tainted-peak.oramap differ diff --git a/mods/ra/maps/temperal.oramap b/mods/ra/maps/temperal.oramap index d70ab30a02..23629974c6 100644 Binary files a/mods/ra/maps/temperal.oramap and b/mods/ra/maps/temperal.oramap differ diff --git a/mods/ra/maps/tournament-island.oramap b/mods/ra/maps/tournament-island.oramap index fcbe9a1065..e0e18c8d04 100644 Binary files a/mods/ra/maps/tournament-island.oramap and b/mods/ra/maps/tournament-island.oramap differ diff --git a/mods/ra/maps/training-camp/map.bin b/mods/ra/maps/training-camp/map.bin index f8defe3224..3a8b32b517 100644 Binary files a/mods/ra/maps/training-camp/map.bin and b/mods/ra/maps/training-camp/map.bin differ diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml index 322a7560b5..689e8bca7e 100644 --- a/mods/ra/maps/training-camp/map.yaml +++ b/mods/ra/maps/training-camp/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ra @@ -16,10 +14,12 @@ MapSize: 64,64 Bounds: 16,16,32,32 -UseAsShellmap: False +Visibility: Lobby Type: Minigame +Videos: + Options: Crates: False Fog: True diff --git a/mods/ra/maps/vegetation.oramap b/mods/ra/maps/vegetation.oramap index 75a98ea2f9..13f24e9f71 100644 Binary files a/mods/ra/maps/vegetation.oramap and b/mods/ra/maps/vegetation.oramap differ diff --git a/mods/ts/maps/arivruns/map.yaml b/mods/ts/maps/arivruns/map.yaml index f35730f8ab..2246df4448 100644 --- a/mods/ts/maps/arivruns/map.yaml +++ b/mods/ts/maps/arivruns/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ts @@ -16,10 +14,12 @@ MapSize: 134,256 Bounds: 2,4,130,234 -UseAsShellmap: False +Visibility: Lobby Type: Conquest +Videos: + Options: Players: diff --git a/mods/ts/maps/blank-conquest/map.bin b/mods/ts/maps/blank-conquest/map.bin index d573ca21a6..d5fba230f3 100644 Binary files a/mods/ts/maps/blank-conquest/map.bin and b/mods/ts/maps/blank-conquest/map.bin differ diff --git a/mods/ts/maps/blank-conquest/map.yaml b/mods/ts/maps/blank-conquest/map.yaml index 448a443777..ba68fa43b2 100644 --- a/mods/ts/maps/blank-conquest/map.yaml +++ b/mods/ts/maps/blank-conquest/map.yaml @@ -1,6 +1,4 @@ -Selectable: True - -MapFormat: 6 +MapFormat: 7 RequiresMod: ts @@ -16,10 +14,12 @@ MapSize: 128,128 Bounds: 32,16,48,96 -UseAsShellmap: False +Visibility: Lobby Type: Conquest +Videos: + Options: Players: diff --git a/mods/ts/maps/blank-shellmap/map.bin b/mods/ts/maps/blank-shellmap/map.bin index 2a86b29b09..1c523d1bbf 100644 Binary files a/mods/ts/maps/blank-shellmap/map.bin and b/mods/ts/maps/blank-shellmap/map.bin differ diff --git a/mods/ts/maps/blank-shellmap/map.yaml b/mods/ts/maps/blank-shellmap/map.yaml index e4625f148a..94ed7f7e74 100644 --- a/mods/ts/maps/blank-shellmap/map.yaml +++ b/mods/ts/maps/blank-shellmap/map.yaml @@ -1,6 +1,4 @@ -Selectable: False - -MapFormat: 6 +MapFormat: 7 RequiresMod: ts @@ -16,10 +14,12 @@ MapSize: 128,128 Bounds: 16,16,96,96 -UseAsShellmap: True +Visibility: Shellmap Type: Shellmap +Videos: + Options: Players: