OpenRA · Mailaender · Aug 30, 2022 · Jan 20, 2022 · Jan 21, 2022 · Jan 21, 2022
diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs
@@ -15,6 +15,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
@@ -151,6 +152,7 @@ public void Serialize(Map map, List<MiniYamlNode> nodes)
 	public class Map : IReadOnlyFileSystem
 	{
 		public const int SupportedMapFormat = 11;
+		public const int CurrentMapFormat = 12;
 		const short InvalidCachedTerrainIndex = -1;
 
 		/// <summary>Defines the order of the fields in map.yaml</summary>
@@ -253,6 +255,11 @@ public class Map : IReadOnlyFileSystem
 		internal Translation Translation;
 
 		public static string ComputeUID(IReadOnlyPackage package)
+		{
+			return ComputeUID(package, GetMapFormat(package));
+		}
+
+		static string ComputeUID(IReadOnlyPackage package, int format)
 		{
 			// UID is calculated by taking an SHA1 of the yaml and binary data
 			var requiredFiles = new[] { "map.yaml", "map.bin" };
@@ -265,7 +272,7 @@ public static string ComputeUID(IReadOnlyPackage package)
 			try
 			{
 				foreach (var filename in contents)
-					if (filename.EndsWith(".yaml") || filename.EndsWith(".bin") || filename.EndsWith(".lua"))
+					if (filename.EndsWith(".yaml") || filename.EndsWith(".bin") || filename.EndsWith(".lua") || (format >= 12 && filename == "map.png"))
 						streams.Add(package.GetStream(filename));
 
 				// Take the SHA1
@@ -285,6 +292,19 @@ public static string ComputeUID(IReadOnlyPackage package)
 			}
 		}
 
+		static int GetMapFormat(IReadOnlyPackage p)
+		{
+			foreach (var line in p.GetStream("map.yaml").ReadAllLines())
+			{
+				// PERF This is a way to get MapFormat without expensive yaml parsing
+				var search = Regex.Match(line, "^MapFormat:\\s*(\\d*)\\s*$");
+				if (search.Success && search.Groups.Count > 0)
+					return FieldLoader.GetValue<int>("MapFormat", search.Groups[1].Value);
+			}
+
+			throw new InvalidDataException($"MapFormat is not definedt\n File: {p.Name}");
+		}
+
 		/// <summary>
 		/// Initializes a new map created by the editor or importer.
 		/// The map will not receive a valid UID until after it has been saved and reloaded.
@@ -332,7 +352,7 @@ public Map(ModData modData, IReadOnlyPackage package)
 			foreach (var field in YamlFields)
 				field.Deserialize(this, yaml.Nodes);
 
-			if (MapFormat != SupportedMapFormat)
+			if (MapFormat < SupportedMapFormat)
 				throw new InvalidDataException($"Map format {MapFormat} is not supported.\n File: {package.Name}");
 
 			PlayerDefinitions = MiniYaml.NodesOrEmpty(yaml, "Players");
@@ -400,7 +420,7 @@ public Map(ModData modData, IReadOnlyPackage package)
 
 			PostInit();
 
-			Uid = ComputeUID(Package);
+			Uid = ComputeUID(Package, MapFormat);
 		}
 
 		void PostInit()
@@ -600,7 +620,7 @@ PPos[] ProjectCellInner(MPos uv)
 
 		public void Save(IReadWritePackage toPackage)
 		{
-			MapFormat = SupportedMapFormat;
+			MapFormat = CurrentMapFormat;
 
 			var root = new List<MiniYamlNode>();
 			foreach (var field in YamlFields)
@@ -625,7 +645,7 @@ public void Save(IReadWritePackage toPackage)
 			Package = toPackage;
 
 			// Update UID to match the newly saved data
-			Uid = ComputeUID(toPackage);
+			Uid = ComputeUID(toPackage, MapFormat);
 		}
 
 		public byte[] SaveBinaryData()

diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs
@@ -320,7 +320,7 @@ public void UpdateFromMap(IReadOnlyPackage p, IReadOnlyPackage parent, MapClassi
 			if (yaml.TryGetValue("MapFormat", out var temp))
 			{
 				var format = FieldLoader.GetValue<int>("MapFormat", temp.Value);
-				if (format != Map.SupportedMapFormat)
+				if (format < Map.SupportedMapFormat)
 					throw new InvalidDataException($"Map format {format} is not supported.");
 			}
 

diff --git a/OpenRA.Mods.Common/Lint/CheckMapMetadata.cs b/OpenRA.Mods.Common/Lint/CheckMapMetadata.cs
@@ -28,8 +28,8 @@ void ILintServerMapPass.Run(Action<string> emitError, Action<string> emitWarning
 
 		void Run(Action<string> emitError, int mapFormat, string author, string title, string[] categories)
 		{
-			if (mapFormat != Map.SupportedMapFormat)
-				emitError($"Map format {mapFormat} does not match the supported version {Map.SupportedMapFormat}.");
+			if (mapFormat < Map.SupportedMapFormat)
+				emitError($"Map format {mapFormat} does not match the supported version {Map.CurrentMapFormat}.");
 
 			if (author == null)
 				emitError("Map does not define a valid author.");

diff --git a/mods/cnc/maps/16-9.oramap b/mods/cnc/maps/16-9.oramap
diff --git a/mods/cnc/maps/african-gambit.oramap b/mods/cnc/maps/african-gambit.oramap
diff --git a/mods/cnc/maps/aggressive-tendencies.oramap b/mods/cnc/maps/aggressive-tendencies.oramap
diff --git a/mods/cnc/maps/alpha-juno-5.oramap b/mods/cnc/maps/alpha-juno-5.oramap
diff --git a/mods/cnc/maps/antrax.oramap b/mods/cnc/maps/antrax.oramap
diff --git a/mods/cnc/maps/anvil-of-war.oramap b/mods/cnc/maps/anvil-of-war.oramap
diff --git a/mods/cnc/maps/arcade.oramap b/mods/cnc/maps/arcade.oramap
diff --git a/mods/cnc/maps/armageddon.oramap b/mods/cnc/maps/armageddon.oramap
diff --git a/mods/cnc/maps/axis-of-advance.oramap b/mods/cnc/maps/axis-of-advance.oramap
diff --git a/mods/cnc/maps/back-to-basics.oramap b/mods/cnc/maps/back-to-basics.oramap
diff --git a/mods/cnc/maps/badland-ridges.oramap b/mods/cnc/maps/badland-ridges.oramap
diff --git a/mods/cnc/maps/blank-shellmap/map.yaml b/mods/cnc/maps/blank-shellmap/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/blood-and-sand.oramap b/mods/cnc/maps/blood-and-sand.oramap
diff --git a/mods/cnc/maps/botany.oramap b/mods/cnc/maps/botany.oramap
diff --git a/mods/cnc/maps/break-of-day.oramap b/mods/cnc/maps/break-of-day.oramap
diff --git a/mods/cnc/maps/burning-hammer.oramap b/mods/cnc/maps/burning-hammer.oramap
diff --git a/mods/cnc/maps/carters-ridge.oramap b/mods/cnc/maps/carters-ridge.oramap
diff --git a/mods/cnc/maps/chill-out.oramap b/mods/cnc/maps/chill-out.oramap
diff --git a/mods/cnc/maps/chokepoint.oramap b/mods/cnc/maps/chokepoint.oramap
diff --git a/mods/cnc/maps/cnc64gdi01/map.yaml b/mods/cnc/maps/cnc64gdi01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/collateral-chaos.oramap b/mods/cnc/maps/collateral-chaos.oramap
diff --git a/mods/cnc/maps/control-and-chaos.oramap b/mods/cnc/maps/control-and-chaos.oramap
diff --git a/mods/cnc/maps/crossing-the-divide.oramap b/mods/cnc/maps/crossing-the-divide.oramap
diff --git a/mods/cnc/maps/desert-invasion.oramap b/mods/cnc/maps/desert-invasion.oramap
diff --git a/mods/cnc/maps/desert-mandarins.oramap b/mods/cnc/maps/desert-mandarins.oramap
diff --git a/mods/cnc/maps/desert-rats-cnc/map.yaml b/mods/cnc/maps/desert-rats-cnc/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/desert-storm-3.oramap b/mods/cnc/maps/desert-storm-3.oramap
diff --git a/mods/cnc/maps/deserted-outpost.oramap b/mods/cnc/maps/deserted-outpost.oramap
diff --git a/mods/cnc/maps/deterring-democracy-plus.oramap b/mods/cnc/maps/deterring-democracy-plus.oramap
diff --git a/mods/cnc/maps/deterring-democracy.oramap b/mods/cnc/maps/deterring-democracy.oramap
diff --git a/mods/cnc/maps/dualism.oramap b/mods/cnc/maps/dualism.oramap
diff --git a/mods/cnc/maps/east-vs-west-3.oramap b/mods/cnc/maps/east-vs-west-3.oramap
diff --git a/mods/cnc/maps/elysian-expanse.oramap b/mods/cnc/maps/elysian-expanse.oramap
diff --git a/mods/cnc/maps/escalations.oramap b/mods/cnc/maps/escalations.oramap
diff --git a/mods/cnc/maps/fight-win-prevail.oramap b/mods/cnc/maps/fight-win-prevail.oramap
diff --git a/mods/cnc/maps/frigid-pass.oramap b/mods/cnc/maps/frigid-pass.oramap
diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi05a/map.yaml b/mods/cnc/maps/gdi05a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi05b/map.yaml b/mods/cnc/maps/gdi05b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi05c/map.yaml b/mods/cnc/maps/gdi05c/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi06/map.yaml b/mods/cnc/maps/gdi06/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi07/map.yaml b/mods/cnc/maps/gdi07/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi08a/map.yaml b/mods/cnc/maps/gdi08a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi08b/map.yaml b/mods/cnc/maps/gdi08b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/gdi09/map.yaml b/mods/cnc/maps/gdi09/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/haos-ridges-cnc.oramap b/mods/cnc/maps/haos-ridges-cnc.oramap
diff --git a/mods/cnc/maps/hattrix.oramap b/mods/cnc/maps/hattrix.oramap
diff --git a/mods/cnc/maps/hegemony-or-survival.oramap b/mods/cnc/maps/hegemony-or-survival.oramap
diff --git a/mods/cnc/maps/island-duel.oramap b/mods/cnc/maps/island-duel.oramap
diff --git a/mods/cnc/maps/jungle-conflict.oramap b/mods/cnc/maps/jungle-conflict.oramap
diff --git a/mods/cnc/maps/kolosseum.oramap b/mods/cnc/maps/kolosseum.oramap
diff --git a/mods/cnc/maps/lost-souls.oramap b/mods/cnc/maps/lost-souls.oramap
diff --git a/mods/cnc/maps/manufacturing-consent.oramap b/mods/cnc/maps/manufacturing-consent.oramap
diff --git a/mods/cnc/maps/master-alert.oramap b/mods/cnc/maps/master-alert.oramap
diff --git a/mods/cnc/maps/master-of-the-jungle-book.oramap b/mods/cnc/maps/master-of-the-jungle-book.oramap
diff --git a/mods/cnc/maps/media-control.oramap b/mods/cnc/maps/media-control.oramap
diff --git a/mods/cnc/maps/model-150.oramap b/mods/cnc/maps/model-150.oramap
diff --git a/mods/cnc/maps/model-200.oramap b/mods/cnc/maps/model-200.oramap
diff --git a/mods/cnc/maps/morbid-aimless-poseidon.oramap b/mods/cnc/maps/morbid-aimless-poseidon.oramap
diff --git a/mods/cnc/maps/mt-nukebait.oramap b/mods/cnc/maps/mt-nukebait.oramap
diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod07a/map.yaml b/mods/cnc/maps/nod07a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod07b/map.yaml b/mods/cnc/maps/nod07b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod07c/map.yaml b/mods/cnc/maps/nod07c/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod08a/map.yaml b/mods/cnc/maps/nod08a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod08b/map.yaml b/mods/cnc/maps/nod08b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod09/map.yaml b/mods/cnc/maps/nod09/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod10a/map.yaml b/mods/cnc/maps/nod10a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/nod10b/map.yaml b/mods/cnc/maps/nod10b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/order-of-battle.oramap b/mods/cnc/maps/order-of-battle.oramap
diff --git a/mods/cnc/maps/ping-pong-bay.oramap b/mods/cnc/maps/ping-pong-bay.oramap
diff --git a/mods/cnc/maps/pirates-and-emperors.oramap b/mods/cnc/maps/pirates-and-emperors.oramap
diff --git a/mods/cnc/maps/pressure-cnc.oramap b/mods/cnc/maps/pressure-cnc.oramap
diff --git a/mods/cnc/maps/reaching-out.oramap b/mods/cnc/maps/reaching-out.oramap
diff --git a/mods/cnc/maps/reasonable-doubt.oramap b/mods/cnc/maps/reasonable-doubt.oramap
diff --git a/mods/cnc/maps/riverside-frontline.oramap b/mods/cnc/maps/riverside-frontline.oramap
diff --git a/mods/cnc/maps/scorched-earth.oramap b/mods/cnc/maps/scorched-earth.oramap
diff --git a/mods/cnc/maps/sustain.oramap b/mods/cnc/maps/sustain.oramap
diff --git a/mods/cnc/maps/tactical-advance.oramap b/mods/cnc/maps/tactical-advance.oramap
diff --git a/mods/cnc/maps/the-hot-box/map.yaml b/mods/cnc/maps/the-hot-box/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: cnc
 

diff --git a/mods/cnc/maps/tiberian-falls.oramap b/mods/cnc/maps/tiberian-falls.oramap
diff --git a/mods/cnc/maps/tiberian-war.oramap b/mods/cnc/maps/tiberian-war.oramap
diff --git a/mods/cnc/maps/tiberium-forest.oramap b/mods/cnc/maps/tiberium-forest.oramap
diff --git a/mods/cnc/maps/tiberium-garden-2.oramap b/mods/cnc/maps/tiberium-garden-2.oramap
diff --git a/mods/cnc/maps/tiberium-rift.oramap b/mods/cnc/maps/tiberium-rift.oramap
diff --git a/mods/cnc/maps/too-hot.oramap b/mods/cnc/maps/too-hot.oramap
diff --git a/mods/cnc/maps/trial-of-possession.oramap b/mods/cnc/maps/trial-of-possession.oramap
diff --git a/mods/cnc/maps/tropic-expanse.oramap b/mods/cnc/maps/tropic-expanse.oramap
diff --git a/mods/cnc/maps/twin-lakes.oramap b/mods/cnc/maps/twin-lakes.oramap
diff --git a/mods/cnc/maps/two-ponds.oramap b/mods/cnc/maps/two-ponds.oramap
diff --git a/mods/cnc/maps/valley-of-gold-6p.oramap b/mods/cnc/maps/valley-of-gold-6p.oramap
diff --git a/mods/cnc/maps/valley-of-gold.oramap b/mods/cnc/maps/valley-of-gold.oramap
diff --git a/mods/cnc/maps/vectors-of-battle.oramap b/mods/cnc/maps/vectors-of-battle.oramap
diff --git a/mods/cnc/maps/warchild.oramap b/mods/cnc/maps/warchild.oramap
diff --git a/mods/cnc/maps/warkraft.oramap b/mods/cnc/maps/warkraft.oramap
diff --git a/mods/cnc/maps/x896.oramap b/mods/cnc/maps/x896.oramap
diff --git a/mods/cnc/maps/year-501.oramap b/mods/cnc/maps/year-501.oramap
diff --git a/mods/d2k/maps/arakeen.oramap b/mods/d2k/maps/arakeen.oramap
diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/atreides-02a/map.yaml b/mods/d2k/maps/atreides-02a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/atreides-02b/map.yaml b/mods/d2k/maps/atreides-02b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/atreides-03a/map.yaml b/mods/d2k/maps/atreides-03a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/atreides-03b/map.yaml b/mods/d2k/maps/atreides-03b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/atreides-04/map.yaml b/mods/d2k/maps/atreides-04/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/atreides-05/map.yaml b/mods/d2k/maps/atreides-05/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k
 

diff --git a/mods/d2k/maps/battle-for-dune.oramap b/mods/d2k/maps/battle-for-dune.oramap
diff --git a/mods/d2k/maps/carthag.oramap b/mods/d2k/maps/carthag.oramap
diff --git a/mods/d2k/maps/cave-of-birds.oramap b/mods/d2k/maps/cave-of-birds.oramap
diff --git a/mods/d2k/maps/cave-of-riches.oramap b/mods/d2k/maps/cave-of-riches.oramap
diff --git a/mods/d2k/maps/chin-rock.oramap b/mods/d2k/maps/chin-rock.oramap
diff --git a/mods/d2k/maps/cliffmaze.oramap b/mods/d2k/maps/cliffmaze.oramap
diff --git a/mods/d2k/maps/death-depths.oramap b/mods/d2k/maps/death-depths.oramap
diff --git a/mods/d2k/maps/desert-twister.oramap b/mods/d2k/maps/desert-twister.oramap
diff --git a/mods/d2k/maps/eyesofthedesert.oramap b/mods/d2k/maps/eyesofthedesert.oramap
diff --git a/mods/d2k/maps/gara-kulon.oramap b/mods/d2k/maps/gara-kulon.oramap
diff --git a/mods/d2k/maps/habbanya-erg.oramap b/mods/d2k/maps/habbanya-erg.oramap
diff --git a/mods/d2k/maps/habbanya-ridge.oramap b/mods/d2k/maps/habbanya-ridge.oramap
diff --git a/mods/d2k/maps/hallecks-ridge.oramap b/mods/d2k/maps/hallecks-ridge.oramap
diff --git a/mods/d2k/maps/harkonnen-01a/map.yaml b/mods/d2k/maps/harkonnen-01a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: d2k