Merge pull request #4257 from pchote/map-format

Fix map format incompatibilities

CHANGELOG

@@ -95,6 +95,7 @@ NEW:
 		Improved error message when loading corrupted sprites.
 		Rewritten shp(ts) parser makes more efficient use of texture space.
 		Added support for the dune 2 shp and pak formats.
+		Map format 6 requires the RequiresMod to be defined.
 	Build system and packages:
 		Added GeoIP to Makefile so it is installed properly.
 		Added desktop shortcut creation support to the Makefile and Windows installer.
@@ -129,6 +130,9 @@ NEW:
 		OpenRA.Utility --shp now requires a list of frames to be combined into a shp.
 		Removed Utility --tmp-png, --r8, --fromd2 commands (use --png instead).
 		Removed Asset Browser file extraction / conversion (use the Utility instead).
+		Added OpenRA.Utility --map-preview for generating minimap previews.
+		Added OpenRA.Utility --map-upgrade for updating maps from format 5 to format 6.
+		The map format has been changed. All user-installed maps will be upgraded on the first mod launch, or using OpenRA.Utility --map-upgrade.
 		Unified sprite loading allows any sprite type to be used anywhere: shp can now be used for terrain, and tmp for units.
 		Harvestable resource definitions (ResourceTypes) have changed, and now specify their artwork using via sequences.
 

OpenRA.Editor/Form1.cs

@@ -393,7 +393,8 @@ namespace OpenRA.Editor
 
 				if (DialogResult.OK == nmd.ShowDialog())
 				{
-					var map = Map.FromTileset(nmd.TheaterBox.SelectedItem as string);
+					var tileset = OpenRA.Rules.TileSets[nmd.TheaterBox.SelectedItem as string];
+					var map = Map.FromTileset(tileset);
 
 					map.Resize((int)nmd.MapWidth.Value, (int)nmd.MapHeight.Value);
 					map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value,

OpenRA.Editor/Program.cs

@@ -22,38 +22,11 @@ namespace OpenRA.Editor
 		[STAThread]
 		static void Main(string[] args)
 		{
-			if (args.Length >= 2 && args[0] == "--convert")
-			{
-				Game.modData = new ModData(args[1]);
-				FileSystem.LoadFromManifest(Game.modData.Manifest);
-				Rules.LoadRules(Game.modData.Manifest, new Map());
-				UpgradeMaps(args[1]);
-				return;
-			}
-
 			Application.CurrentCulture = CultureInfo.InvariantCulture;
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
 
 			Application.Run(new Form1(args));
 		}
-
-		static void UpgradeMaps(string mod)
-		{
-			var mapFolderPath = new string[] { Environment.CurrentDirectory, "mods", mod, "maps" }
-				.Aggregate(Path.Combine);
-
-			foreach (var path in ModData.FindMapsIn(mapFolderPath))
-			{
-				var map = new Map(path);
-
-				// Touch the lazy bits to initialize them
-				map.Actors.Force();
-				map.Smudges.Force();
-				map.MapTiles.Force();
-				map.MapResources.Force();
-				map.Save(path);
-			}
-		}
 	}
 }

OpenRA.Game/Map.cs

@@ -109,9 +109,9 @@ namespace OpenRA
 		[FieldLoader.Ignore] public Lazy<TileReference<byte, byte>[,]> MapResources;
 		[FieldLoader.Ignore] public string[,] CustomTerrain;
 
-		public static Map FromTileset(string tileset)
+		public static Map FromTileset(TileSet tileset)
 		{
-			var tile = OpenRA.Rules.TileSets[tileset].Templates.First();
+			var tile = tileset.Templates.First();
 			var tileRef = new TileReference<ushort, byte> { Type = tile.Key, Index = (byte)0 };
 
 			Map map = new Map()
@@ -120,7 +120,7 @@ namespace OpenRA
 				Description = "Describe your map here",
 				Author = "Your name here",
 				MapSize = new int2(1, 1),
-				Tileset = tileset,
+				Tileset = tileset.Id,
 				MapResources = Lazy.New(() => new TileReference<byte, byte>[1, 1]),
 				MapTiles = Lazy.New(() => new TileReference<ushort, byte>[1, 1] { { tileRef } }),
 				Actors = Lazy.New(() => new Dictionary<string, ActorReference>()),
@@ -137,9 +137,16 @@ namespace OpenRA
 					throw new InvalidOperationException("Required file {0} not present in this map".F(filename));
 		}
 
-		public Map() { }	/* doesn't really produce a valid map, but enough for loading a mod */
+		// Stub constructor that doesn't produce a valid map, but is
+		// sufficient for loading a mod to the content-install panel
+		public Map() { }
 
-		public Map(string path)
+		// 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)
 		{
 			Path = path;
 			Container = FileSystem.OpenPackage(path, null, int.MaxValue);
@@ -149,7 +156,6 @@ namespace OpenRA
 
 			var yaml = new MiniYaml(null, MiniYaml.FromStream(Container.GetContent("map.yaml")));
 			FieldLoader.Load(this, yaml);
-			Uid = ComputeHash();
 
 			// Support for formats 1-3 dropped 2011-02-11.
 			// Use release-20110207 to convert older maps to format 4
@@ -157,6 +163,19 @@ namespace OpenRA
 			if (MapFormat < 5)
 				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;
+			}
+
 			// Load players
 			foreach (var kv in yaml.NodesDict["Players"].NodesDict)
 			{
@@ -198,6 +217,14 @@ namespace OpenRA
 
 			MapTiles = Lazy.New(() => LoadMapTiles());
 			MapResources = Lazy.New(() => LoadResourceTiles());
+
+			// 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();
 		}
 
 		public int2[] GetSpawnPoints()
@@ -210,7 +237,7 @@ namespace OpenRA
 
 		public void Save(string toPath)
 		{
-			MapFormat = 5;
+			MapFormat = 6;
 
 			var root = new List<MiniYamlNode>();
 			var fields = new[]
@@ -222,7 +249,6 @@ namespace OpenRA
 				"Description",
 				"Author",
 				"Tileset",
-				"Options",
 				"MapSize",
 				"Bounds",
 				"UseAsShellmap",
@@ -236,6 +262,8 @@ namespace OpenRA
 				root.Add(new MiniYamlNode(field, FieldSaver.FormatValue(this, f)));
 			}
 
+			root.Add(new MiniYamlNode("Options", FieldSaver.SaveDifferences(Options, new MapOptions())));
+
 			root.Add(new MiniYamlNode("Players", null,
 				Players.Select(p => new MiniYamlNode("PlayerReference@{0}".F(p.Key), FieldSaver.SaveDifferences(p.Value, new PlayerReference()))).ToList()));
 
@@ -343,18 +371,12 @@ namespace OpenRA
 				writer.Write((ushort)MapSize.X);
 				writer.Write((ushort)MapSize.Y);
 
-				if (!OpenRA.Rules.TileSets.ContainsKey(Tileset))
-					throw new InvalidOperationException(
-						"Tileset used by the map ({0}) does not exist in this mod. Valid tilesets are: {1}"
-						.F(Tileset, OpenRA.Rules.TileSets.Keys.JoinWith(",")));
-
 				// Tile data
 				for (var i = 0; i < MapSize.X; i++)
 					for (var j = 0; j < MapSize.Y; j++)
 					{
 						writer.Write(MapTiles.Value[i, j].Type);
-						var pickAny = OpenRA.Rules.TileSets[Tileset].Templates[MapTiles.Value[i, j].Type].PickAny;
-						writer.Write(pickAny ? (byte)(i % 4 + (j % 4) * 4) : MapTiles.Value[i, j].Index);
+						writer.Write(MapTiles.Value[i, j].Index);
 					}
 
 				// Resource data

OpenRA.Game/ModData.cs

@@ -60,8 +60,6 @@ namespace OpenRA
 			LoadScreen.Display();
 			WidgetLoader = new WidgetLoader(this);
 
-			AvailableMaps = FindMaps();
-
 			// HACK: Mount only local folders so we have a half-working environment for the asset installer
 			FileSystem.UnmountAll();
 			foreach (var dir in Manifest.Folders)
@@ -78,6 +76,8 @@ namespace OpenRA
 			SpriteLoader = new SpriteLoader(new string[0], SheetBuilder);
 			VoxelLoader = new VoxelLoader();
 			CursorProvider.Initialize(Manifest.Cursors);
+
+			AvailableMaps = FindMaps();
 		}
 
 		public IEnumerable<string> Languages { get; private set; }
@@ -154,7 +154,7 @@ namespace OpenRA
 			{
 				try
 				{
-					var map = new Map(path);
+					var map = new Map(path, Manifest.Mod.Id);
 					ret.Add(map.Uid, map);
 				}
 				catch (Exception e)

OpenRA.Utility/Command.cs

@@ -312,5 +312,13 @@ namespace OpenRA.Utility
 			minimap.Save(dest);
 			Console.WriteLine(dest + " saved.");
 		}
+
+		public static void UpgradeMap(string[] args)
+		{
+			var map = args[1];
+			var mod = args[2];
+			Game.modData = new ModData(mod);
+			new Map(map, mod);
+		}
 	}
 }

OpenRA.Utility/Program.cs

@@ -28,7 +28,8 @@ namespace OpenRA.Utility
 				{ "--transpose", Command.TransposeShp },
 				{ "--docs", Command.ExtractTraitDocs },
 				{ "--map-hash", Command.GetMapHash },
-				{ "--minimap", Command.GenerateMinimap },
+				{ "--map-preview", Command.GenerateMinimap },
+				{ "--map-upgrade", Command.UpgradeMap },
 			};
 
 			if (args.Length == 0) { PrintUsage(); return; }

mods/cnc/maps/gdi01/map.yaml

@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: cnc
 
@@ -21,36 +21,34 @@ UseAsShellmap: False
 Type: Campaign
 
 Options:
-	Crates: false
-	Fog: false
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: False
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 500
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@BadGuy:
 		Name: BadGuy
 		Race: nod
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		Allies: BadGuy
 		Enemies: GoodGuy,Creeps
 	PlayerReference@GoodGuy:
 		Name: GoodGuy
 		Playable: True
+		AllowBots: False
+		Required: True
 		LockRace: True
 		Race: gdi
 		LockColor: True
-		ColorRamp: 31,222,183,24
-		LockTeam: True
-		Team: 0
+		ColorRamp: 31,222,183
 		LockSpawn: True
-		Spawn: 0
-		AllowBots: False
+		LockTeam: True
 		Allies: GoodGuy
 		Enemies: BadGuy,Creeps
-		Required: True
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
@@ -491,10 +489,16 @@ Rules:
 		-Buildable:
 	BOAT:
 		Mobile:
-			OnRails: false # workaround a crash
+			OnRails: false
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
+
+Notifications:
+
+Translations:

mods/cnc/maps/nod01/map.yaml

@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: cnc
 
@@ -21,13 +21,13 @@ UseAsShellmap: False
 Type: Campaign
 
 Options:
-	Crates: false
-	Fog: false
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: False
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 0
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -42,21 +42,21 @@ Players:
 	PlayerReference@GDI:
 		Name: GDI
 		Race: gdi
-		ColorRamp: 31,222,183,24
+		ColorRamp: 31,222,183
 		Allies: Creeps
 		Enemies: NOD
 	PlayerReference@NOD:
 		Name: NOD
 		Playable: True
 		AllowBots: False
+		Required: True
 		LockRace: True
 		Race: nod
 		LockColor: True
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		LockSpawn: True
 		LockTeam: True
 		Enemies: GDI,Creeps
-		Required: True
 
 Actors:
 	Actor0: rock2
@@ -306,8 +306,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/cnc/maps/shellmap/map.yaml

@@ -1,6 +1,6 @@
 Selectable: False
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: cnc
 
@@ -20,17 +20,19 @@ UseAsShellmap: True
 
 Type: Conquest
 
+Options:
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
 		Race: nod
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI,Creeps
 	PlayerReference@GDI:
 		Name: GDI
 		Race: gdi
-		ColorRamp: 31,222,183,24
+		ColorRamp: 31,222,183
 		Allies: GDI
 		Enemies: Nod,Creeps
 	PlayerReference@Neutral:
@@ -41,37 +43,31 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
@@ -1010,6 +1006,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
+
+Notifications:
+
+Translations:

mods/cnc/maps/the-hot-box/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: cnc
 
 Title: The Hot Box
 
@@ -18,16 +20,14 @@ UseAsShellmap: False
 
 Type: Drop Zone
 
-RequiresMod: cnc
-
 Options:
-	Fog: false
-	Shroud: false
-	Crates: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: True
+	Fog: False
+	Shroud: False
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -242,8 +242,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/d2k/maps/brimstone/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: d2k
 
 Title: Brimstone
 
@@ -18,7 +20,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: d2k
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -29,55 +31,46 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi8:
 		Name: Multi8
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
@@ -659,8 +652,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/d2k/maps/shellmap/map.yaml

@@ -1,6 +1,8 @@
 Selectable: False
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: d2k
 
 Title: Shellmap
 
@@ -18,13 +20,14 @@ UseAsShellmap: True
 
 Type: Conquest
 
-RequiresMod: d2k
+Options:
 
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		Race: allies
+
 Actors:
 	Actor0: spicebloom
 		Location: 27,42
@@ -93,10 +96,15 @@ Rules:
 	World:
 		LoadWidgetAtGameStart:
 			Widget: MAINMENU
+
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/Fort-Lonestar/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Fort Lonestar
 
@@ -18,15 +20,13 @@ UseAsShellmap: False
 
 Type: Minigame
 
-RequiresMod: ra
-
 Options:
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 50
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -1052,6 +1052,8 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 	120mm:
 		ROF: 150
@@ -1246,3 +1248,5 @@ Weapons:
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/Survival01/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Survivial01
 
@@ -18,16 +20,14 @@ UseAsShellmap: False
 
 Type: Minigame
 
-RequiresMod: ra
-
 Options:
-	Crates: false
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 	Difficulties: Easy,Normal,Hard
 
 Players:
@@ -44,18 +44,18 @@ Players:
 		Name: Allies
 		Playable: True
 		AllowBots: False
+		Required: True
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 115,240,130,10
+		ColorRamp: 115,240,130
 		LockSpawn: True
 		LockTeam: True
 		Enemies: Soviets
-		Required: True
 	PlayerReference@Soviets:
 		Name: Soviets
 		Race: soviet
-		ColorRamp: 0,255,128,10
+		ColorRamp: 0,255,128
 		Enemies: Allies
 
 Actors:
@@ -1318,8 +1318,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/Survival02/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Survival02
 
@@ -18,16 +20,14 @@ UseAsShellmap: False
 
 Type: Minigame
 
-RequiresMod: ra
-
 Options:
-	Crates: false
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -42,7 +42,7 @@ Players:
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 115,240,130,10
+		ColorRamp: 115,240,130
 		LockSpawn: True
 		LockTeam: True
 		Allies: Greece
@@ -50,7 +50,7 @@ Players:
 	PlayerReference@Soviets:
 		Name: Soviets
 		Race: soviet
-		ColorRamp: 0,255,128,10
+		ColorRamp: 0,255,128
 		Enemies: Allies,Greece
 	PlayerReference@Creeps:
 		Name: Creeps
@@ -1119,6 +1119,8 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 	ParaBomb:
 		ROF: 5
@@ -1143,3 +1145,5 @@ Weapons:
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/allies-01/map.yaml

@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: ra
 
@@ -21,14 +21,14 @@ UseAsShellmap: False
 Type: Campaign
 
 Options:
-	Crates: false
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
-	Difficulties: Easy, Normal
+	ConfigurableStartingUnits: False
+	Difficulties: Easy,Normal
 
 Players:
 	PlayerReference@Neutral:
@@ -44,19 +44,19 @@ Players:
 		Name: Allies
 		Playable: True
 		AllowBots: False
+		Required: True
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 161,134,200,30
+		ColorRamp: 161,134,200
 		LockSpawn: True
 		LockTeam: True
 		Allies: Creeps
 		Enemies: Soviets
-		Required: True
 	PlayerReference@Soviets:
 		Name: Soviets
 		Race: soviet
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		Enemies: Allies,Creeps
 
 Actors:
@@ -409,6 +409,8 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 	8Inch:
 		ROF: 200
@@ -440,3 +442,5 @@ Weapons:
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/allies-02/map.yaml

@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: ra
 
@@ -21,13 +21,13 @@ UseAsShellmap: False
 Type: Campaign
 
 Options:
-	Crates: false
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -43,7 +43,7 @@ Players:
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 161,134,200,30
+		ColorRamp: 161,134,200
 		LockSpawn: True
 		LockTeam: True
 		Allies: Allies2,Allies
@@ -55,7 +55,7 @@ Players:
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 76,196,190,20
+		ColorRamp: 76,196,190
 		LockSpawn: True
 		LockTeam: True
 		Allies: Allies1,Allies
@@ -63,13 +63,13 @@ Players:
 	PlayerReference@Allies:
 		Name: Allies
 		Race: allies
-		ColorRamp: 115,115,143,16
+		ColorRamp: 115,115,143
 		Allies: Allies1,Allies2
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
 		Race: soviet
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		Enemies: Allies1,Allies2,Allies
 
 Actors:
@@ -1936,8 +1936,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/allies-03/map.yaml

@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: ra
 
@@ -21,14 +21,14 @@ UseAsShellmap: False
 Type: Campaign
 
 Options:
-	Crates: false
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
-	Difficulties: Easy, Normal, Hard
+	ConfigurableStartingUnits: False
+	Difficulties: Easy,Normal,Hard
 
 Players:
 	PlayerReference@Neutral:
@@ -40,15 +40,15 @@ Players:
 		Name: Allies1
 		Playable: True
 		AllowBots: False
+		Required: True
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 161,134,200,30
+		ColorRamp: 161,134,200
 		LockSpawn: True
 		LockTeam: True
 		Allies: Allies2,Allies
 		Enemies: Soviets
-		Required: True
 	PlayerReference@Allies2:
 		Name: Allies2
 		Playable: True
@@ -56,7 +56,7 @@ Players:
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 76,196,190,20
+		ColorRamp: 76,196,190
 		LockSpawn: True
 		LockTeam: True
 		Allies: Allies1,Allies
@@ -64,13 +64,13 @@ Players:
 	PlayerReference@Allies:
 		Name: Allies
 		Race: allies
-		ColorRamp: 115,115,143,16
+		ColorRamp: 115,115,143
 		Allies: Allies1,Allies2
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
 		Race: soviet
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		Enemies: Allies1,Allies2,Allies
 
 Actors:
@@ -1569,8 +1569,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/allies-04/map.yaml

@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: ra
 
@@ -12,16 +12,6 @@ Author: Scott_NZ
 
 Tileset: TEMPERAT
 
-Options:
-	Crates: false
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
-	StartingCash: 5000
-	ConfigurableStartingUnits: false
-	Difficulties: Easy,Normal,Hard
-
 MapSize: 128,128
 
 Bounds: 16,16,96,96
@@ -30,6 +20,16 @@ UseAsShellmap: False
 
 Type: Campaign
 
+Options:
+	Crates: False
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
+	StartingCash: 5000
+	ConfigurableStartingUnits: False
+	Difficulties: Easy,Normal,Hard
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -45,15 +45,15 @@ Players:
 		Name: Allies1
 		Playable: True
 		AllowBots: False
+		Required: True
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 161,134,200,30
+		ColorRamp: 161,134,200
 		LockSpawn: True
 		LockTeam: True
 		Allies: Allies2,Allies
 		Enemies: Soviets
-		Required: True
 	PlayerReference@Allies2:
 		Name: Allies2
 		Playable: True
@@ -61,7 +61,7 @@ Players:
 		LockRace: True
 		Race: allies
 		LockColor: True
-		ColorRamp: 76,196,190,20
+		ColorRamp: 76,196,190
 		LockSpawn: True
 		LockTeam: True
 		Allies: Allies1,Allies
@@ -69,13 +69,13 @@ Players:
 	PlayerReference@Allies:
 		Name: Allies
 		Race: allies
-		ColorRamp: 115,115,143,16
+		ColorRamp: 115,115,143
 		Allies: Allies1,Allies2
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
 		Race: soviet
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		Enemies: Allies1,Allies2,Allies,Creeps
 
 Actors:
@@ -2001,8 +2001,12 @@ Sequences:
 			Start: 0
 			Facings: 32
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/apollo/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Apollo
 
@@ -18,7 +20,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: ra
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -2624,3 +2626,5 @@ Weapons:
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/ares/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Ares
 
@@ -18,7 +20,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: ra
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -29,25 +31,21 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
@@ -1053,6 +1051,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
+
+Notifications:
+
+Translations:

mods/ra/maps/artemis/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Artemis
 
@@ -18,7 +20,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: ra
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -2956,3 +2958,5 @@ Weapons:
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/bomber-john/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Bomber John
 
@@ -18,16 +20,14 @@ UseAsShellmap: False
 
 Type: Minigame
 
-RequiresMod: ra
-
 Options:
-	Crates: false
-	Fog: true
-	Shroud: true
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: False
+	Fog: True
+	Shroud: True
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 60
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -43,59 +43,59 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi2,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi2,Multi3,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi1,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi1,Multi17
-		AllowBots: False
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi11
-		AllowBots: False
 
 Actors:
 	Actor69: ftur
@@ -771,7 +771,6 @@ Rules:
 	World:
 		-CrateDrop:
 		-SpawnMPUnits:
-
 	APWR:
 		Buildable:
 			Owner: a
@@ -805,11 +804,9 @@ Rules:
 	SILO:
 		Buildable:
 			Owner: a
-
 	Player:
 		ClassicProductionQueue@Building:
 			BuildSpeed: 0.4
-
 	MNLYR:
 		Inherits: ^Tank
 		Buildable:
@@ -840,7 +837,7 @@ Rules:
 		MustBeDestroyed:
 		Transforms:
 			IntoActor: ftur
-			Offset:0,0
+			Offset: 0,0
 			Facing: 96
 		CashTrickler:
 			Period: 150
@@ -850,7 +847,7 @@ Rules:
 			HP: 1000
 		Transforms:
 			IntoActor: mnlyr
-			Offset:0,0
+			Offset: 0,0
 			Facing: 96
 		MustBeDestroyed:
 		Building:
@@ -879,8 +876,6 @@ Rules:
 			BeginChargeSound: ironchg1.aud
 			EndChargeSound: ironrdy1.aud
 			Range: 1
-
-
 	MINVV:
 		Building:
 			Adjacent: 99
@@ -917,7 +912,6 @@ Rules:
 		Explodes:
 		DemoTruck:
 		BodyOrientation:
-
 	T17:
 		Health:
 			HP: 999999999
@@ -927,8 +921,6 @@ Rules:
 		Production:
 			Produces: Building
 		BaseBuilding:
-		#RenderBuilding:
-		#	Image: brick
 		Tooltip:
 			Name: Tree
 		ChronoshiftPower:
@@ -966,14 +958,19 @@ Sequences:
 			Length: *
 		icon: jmin
 			Start: 0
-
 	mnlyr:
 		icon: mnlyicon
-
 	brick:
 		idle:
 			Start: 0
 			Length: *
+
+VoxelSequences:
+
 Weapons:
 
 Voices:
+
+Notifications:
+
+Translations:

mods/ra/maps/center-of-attention-redux-2/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Center of Attention Redux 2
 
@@ -16,7 +18,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: ra
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -32,49 +34,41 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 
@@ -908,6 +902,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
+
+Notifications:
+
+Translations:

mods/ra/maps/desert-shellmap/map.yaml

@@ -1,6 +1,6 @@
 Selectable: False
 
-MapFormat: 5
+MapFormat: 6
 
 RequiresMod: ra
 
@@ -20,6 +20,8 @@ UseAsShellmap: True
 
 Type: Conquest
 
+Options:
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -34,13 +36,13 @@ Players:
 	PlayerReference@Allies:
 		Name: Allies
 		Race: allies
-		ColorRamp: 161,134,200,30
+		ColorRamp: 161,134,200
 		Allies: Neutral
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
 		Race: soviet
-		ColorRamp: 3,255,127,28
+		ColorRamp: 3,255,127
 		Enemies: Allies
 
 Actors:
@@ -1338,6 +1340,8 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 	8Inch:
 		Report: tank6.aud
@@ -1351,3 +1355,5 @@ Weapons:
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/dionysus/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Dionysus
 
@@ -18,7 +20,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: ra
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -2175,3 +2177,5 @@ Weapons:
 Voices:
 
 Notifications:
+
+Translations:

mods/ra/maps/doughnut-hole/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Doughnut Hole
 
@@ -18,7 +20,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: ra
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -29,35 +31,31 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
+		StartingUnitsClass: custom
+		AllowBots: False
 		Race: Random
 		Enemies: Creeps
-		AllowBots: False
-		DefaultStartingUnits: True
-		StartingUnitsClass: custom
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
+		StartingUnitsClass: custom
+		AllowBots: False
 		Race: Random
 		Enemies: Creeps
-		AllowBots: False
-		DefaultStartingUnits: True
-		StartingUnitsClass: custom
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
+		StartingUnitsClass: custom
+		AllowBots: False
 		Race: Random
 		Enemies: Creeps
-		AllowBots: False
-		DefaultStartingUnits: True
-		StartingUnitsClass: custom
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
+		StartingUnitsClass: custom
+		AllowBots: False
 		Race: Random
 		Enemies: Creeps
-		AllowBots: False
-		DefaultStartingUnits: True
-		StartingUnitsClass: custom
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
@@ -844,7 +842,6 @@ Rules:
 			Value: 1000
 		NukePower:
 			AllowMultiple: yes
-
 	World:
 		MPStartUnits@custom:
 			Class: custom
@@ -853,8 +850,15 @@ Rules:
 			SupportActors: lst
 			InnerSupportRadius: 3
 			OuterSupportRadius: 4
+
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
+
+Notifications:
+
+Translations:

mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Drop Zone - Battle of Tikiaki
 
@@ -18,16 +20,14 @@ UseAsShellmap: False
 
 Type: Drop Zone
 
-RequiresMod: ra
-
 Options:
-	Crates: true
-	Fog: false
-	Shroud: false
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: True
+	Fog: False
+	Shroud: False
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -42,59 +42,59 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi2,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi2,Multi3,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi1,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi1,Multi17
-		AllowBots: False
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi11
-		AllowBots: False
 
 Actors:
 	Actor0: apc
@@ -348,6 +348,8 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 	PortaTesla:
 		ROF: 20
@@ -358,3 +360,7 @@ Weapons:
 			Damage: 80
 
 Voices:
+
+Notifications:
+
+Translations:

mods/ra/maps/drop-zone-w/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Drop Zone W
 
@@ -18,16 +20,14 @@ UseAsShellmap: False
 
 Type: Drop Zone
 
-RequiresMod: ra
-
 Options:
-	Crates: true
-	Fog: false
-	Shroud: false
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: True
+	Fog: False
+	Shroud: False
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -43,67 +43,67 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: allies
 		LockSpawn: True
 		Enemies: Creeps
-		AllowBots: False
 
 Actors:
 	Actor2: mpspawn
@@ -257,10 +257,10 @@ Rules:
 		RevealsShroud:
 			Range: 50
 		Armament@PRIMARY:
-			Weapon:M60mg
+			Weapon: M60mg
 		Armament@SECONDARY:
 			Name: secondary
-			Weapon:M60mg
+			Weapon: M60mg
 		AttackFrontal:
 		WithMuzzleFlash@PRIMARY:
 		WithMuzzleFlash@SECONDARY:
@@ -298,6 +298,8 @@ Sequences:
 			Start: 0
 			Facings: 32
 
+VoxelSequences:
+
 Weapons:
 	8Inch:
 		ROF: 200
@@ -353,3 +355,7 @@ Weapons:
 			WaterImpactSound: splash9
 
 Voices:
+
+Notifications:
+
+Translations:

mods/ra/maps/drop-zone/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Drop Zone
 
@@ -18,16 +20,14 @@ UseAsShellmap: False
 
 Type: Drop Zone
 
-RequiresMod: ra
-
 Options:
-	Crates: true
-	Fog: false
-	Shroud: false
-	AllyBuildRadius: false
-	FragileAlliances: false
+	Crates: True
+	Fog: False
+	Shroud: False
+	AllyBuildRadius: False
+	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: false
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
@@ -42,59 +42,59 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi3,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi2,Multi4,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi1,Multi2,Multi3,Multi5,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi1,Multi6,Multi17
-		AllowBots: False
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi1,Multi17
-		AllowBots: False
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
+		AllowBots: False
 		LockRace: True
 		Race: soviet
 		Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi11
-		AllowBots: False
 
 Actors:
 	Actor0: apc
@@ -243,6 +243,8 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 	PortaTesla:
 		ROF: 20
@@ -253,3 +255,7 @@ Weapons:
 			Damage: 80
 
 Voices:
+
+Notifications:
+
+Translations:

mods/ra/maps/ice-woods/map.yaml

@@ -1,6 +1,8 @@
 Selectable: True
 
-MapFormat: 5
+MapFormat: 6
+
+RequiresMod: ra
 
 Title: Ice Woods
 
@@ -18,7 +20,7 @@ UseAsShellmap: False
 
 Type: Conquest
 
-RequiresMod: ra
+Options:
 
 Players:
 	PlayerReference@Neutral:
@@ -29,13 +31,11 @@ Players:
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		DefaultStartingUnits: True
 		Race: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
@@ -2145,6 +2145,12 @@ Rules:
 
 Sequences:
 
+VoxelSequences:
+
 Weapons:
 
 Voices:
+
+Notifications:
+
+Translations: