OpenRA · reaperrr · May 2, 2019 · Mar 31, 2019 · Apr 25, 2019 · Apr 25, 2019
diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs
@@ -566,6 +566,10 @@ public void Save(IReadWritePackage toPackage)
 			foreach (var field in YamlFields)
 				field.Serialize(this, root);
 
+			// HACK: map.yaml is expected to have empty lines between top-level blocks
+			for (var i = root.Count - 1; i > 0; i--)
+				root.Insert(i, new MiniYamlNode("", ""));
+
 			// Saving to a new package: copy over all the content from the map
 			if (Package != null && toPackage != Package)
 				foreach (var file in Package.Contents)

diff --git a/OpenRA.Game/MiniYaml.cs b/OpenRA.Game/MiniYaml.cs
@@ -28,7 +28,8 @@ public static void WriteToFile(this MiniYamlNodes y, string filename)
 
 		public static string WriteToString(this MiniYamlNodes y)
 		{
-			return y.ToLines().JoinWith("\n");
+			// Remove all trailing newlines and restore the final EOF newline
+			return y.ToLines().JoinWith("\n").TrimEnd('\n') + "\n";
 		}
 
 		public static IEnumerable<string> ToLines(this MiniYamlNodes y)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -633,6 +633,7 @@
     <Compile Include="UtilityCommands\ExtractZeroBraneStudioLuaAPI.cs" />
     <Compile Include="UtilityCommands\ExtractTraitDocsCommand.cs" />
     <Compile Include="UtilityCommands\ExtractWeaponDocsCommand.cs" />
+    <Compile Include="UtilityCommands\RefreshMapCommand.cs" />
     <Compile Include="Warheads\ChangeOwnerWarhead.cs" />
     <Compile Include="UtilityCommands\PngSheetExportMetadataCommand.cs" />
     <Compile Include="UtilityCommands\PngSheetImportMetadataCommand.cs" />

diff --git a/OpenRA.Mods.Common/UtilityCommands/RefreshMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/RefreshMapCommand.cs
@@ -0,0 +1,35 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.FileSystem;
+
+namespace OpenRA.Mods.Common.UtilityCommands
+{
+	class RefreshMapCommand : IUtilityCommand
+	{
+		string IUtilityCommand.Name { get { return "--refresh-map"; } }
+
+		bool IUtilityCommand.ValidateArguments(string[] args)
+		{
+			return args.Length >= 2;
+		}
+
+		[Desc("MAP", "Opens and resaves a map to reformat map.yaml and regenerate the preview.")]
+		void IUtilityCommand.Run(Utility utility, string[] args)
+		{
+			// HACK: The engine code assumes that Game.modData is set.
+			// HACK: We know that maps can only be oramap or folders, which are ReadWrite
+			var modData = Game.ModData = utility.ModData;
+			using (var package = new Folder(".").OpenPackage(args[1], modData.ModFiles))
+				new Map(modData, package).Save((IReadWritePackage)package);
+		}
+	}
+}
diff --git a/OpenRA.Test/OpenRA.Game/MiniYamlTest.cs b/OpenRA.Test/OpenRA.Game/MiniYamlTest.cs
@@ -269,7 +269,8 @@ public void CommentsShouldntSurviveRoundTrip()
 
 			var strippedYaml = @"Parent:
 	First: value containing a \# character
-	Second: value".Replace("\r\n", "\n");
+	Second: value
+".Replace("\r\n", "\n");
 
 			var result = MiniYaml.FromString(yaml).WriteToString();
 			Assert.AreEqual(strippedYaml, result);

diff --git a/mods/cnc/chrome/color-picker.yaml b/mods/cnc/chrome/color-picker.yaml
@@ -135,4 +135,4 @@ Background@COLOR_CHOOSER:
 									Y: 0
 									Width: 27
 									Height: 27
-									Visible: false
+									Visible: false
diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml
@@ -618,4 +618,4 @@ ScrollPanel@COPY_FILTER_PANEL:
 			Y: 5
 			Width: PARENT_RIGHT - 29
 			Height: 20
-			Visible: false
+			Visible: false
diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml
@@ -581,7 +581,7 @@ Container@SETTINGS_PANEL:
 									Width: PARENT_RIGHT
 									Height: 20
 									Font: Regular
-									Text: Additional developer-specific options can be enabled via the 
+									Text: Additional developer-specific options can be enabled via the
 									Align: Center
 								Label@B:
 									Y: 20

diff --git a/mods/cnc/maps/16-9.oramap b/mods/cnc/maps/16-9.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/arcade.oramap b/mods/cnc/maps/arcade.oramap
diff --git a/mods/cnc/maps/avocado.oramap b/mods/cnc/maps/avocado.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/blank-shellmap/map.png b/mods/cnc/maps/blank-shellmap/map.png
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/collateral-chaos.oramap b/mods/cnc/maps/collateral-chaos.oramap
diff --git a/mods/cnc/maps/contra.oramap b/mods/cnc/maps/contra.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/dead-in-motion.oramap b/mods/cnc/maps/dead-in-motion.oramap
diff --git a/mods/cnc/maps/desert-lakes.oramap b/mods/cnc/maps/desert-lakes.oramap
diff --git a/mods/cnc/maps/desert-rats-cnc/map.png b/mods/cnc/maps/desert-rats-cnc/map.png
diff --git a/mods/cnc/maps/desert-storm-3.oramap b/mods/cnc/maps/desert-storm-3.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/escalations.oramap b/mods/cnc/maps/escalations.oramap
diff --git a/mods/cnc/maps/frigid-pass.oramap b/mods/cnc/maps/frigid-pass.oramap
diff --git a/mods/cnc/maps/frostways.oramap b/mods/cnc/maps/frostways.oramap
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/letters-from-lexington.oramap b/mods/cnc/maps/letters-from-lexington.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/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/nod10a/map.yaml b/mods/cnc/maps/nod10a/map.yaml
@@ -1342,5 +1342,4 @@ Actors:
 		Location: 5,47
 		Owner: Neutral
 
-
-Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
+Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
diff --git a/mods/cnc/maps/nod10b/map.yaml b/mods/cnc/maps/nod10b/map.yaml
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Categories: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral

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/plan-b.oramap b/mods/cnc/maps/plan-b.oramap
diff --git a/mods/cnc/maps/pressure-cnc.oramap b/mods/cnc/maps/pressure-cnc.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/thawed-front.oramap b/mods/cnc/maps/thawed-front.oramap
diff --git a/mods/cnc/maps/the-hot-box/map.png b/mods/cnc/maps/the-hot-box/map.png
diff --git a/mods/cnc/maps/the-new-mandarins.oramap b/mods/cnc/maps/the-new-mandarins.oramap
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-canopy.oramap b/mods/cnc/maps/tiberium-canopy.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/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/twisted-peak.oramap b/mods/cnc/maps/twisted-peak.oramap
diff --git a/mods/cnc/maps/two-ponds.oramap b/mods/cnc/maps/two-ponds.oramap
diff --git a/mods/cnc/maps/understanding-power.oramap b/mods/cnc/maps/understanding-power.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/winters-end.oramap b/mods/cnc/maps/winters-end.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/common/chrome/color-picker.yaml b/mods/common/chrome/color-picker.yaml
@@ -135,4 +135,4 @@ Background@COLOR_CHOOSER:
 									Y: 0
 									Width: 29
 									Height: 29
-									Visible: false
+									Visible: false
diff --git a/mods/common/chrome/editor.yaml b/mods/common/chrome/editor.yaml
@@ -598,4 +598,4 @@ ScrollPanel@COPY_FILTER_PANEL:
 			Y: 5
 			Width: PARENT_RIGHT - 29
 			Height: 20
-			Visible: false
+			Visible: false
diff --git a/mods/common/chrome/settings.yaml b/mods/common/chrome/settings.yaml
@@ -592,7 +592,7 @@ Background@SETTINGS_PANEL:
 							Width: PARENT_RIGHT
 							Height: 20
 							Font: Regular
-							Text: Additional developer-specific options can be enabled via the 
+							Text: Additional developer-specific options can be enabled via the
 							Align: Center
 						Label@B:
 							Y: 20
@@ -646,4 +646,4 @@ Background@SETTINGS_PANEL:
 							Width: 300
 							Height: 20
 							Font: Regular
-							Text: Strict Activity checking
+							Text: Strict Activity checking
diff --git a/mods/d2k/maps/arakeen.oramap b/mods/d2k/maps/arakeen.oramap
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/imperial-basin.oramap b/mods/d2k/maps/imperial-basin.oramap
diff --git a/mods/d2k/maps/jacarutu.oramap b/mods/d2k/maps/jacarutu.oramap
diff --git a/mods/d2k/maps/kanly.oramap b/mods/d2k/maps/kanly.oramap
diff --git a/mods/d2k/maps/letos-erg.oramap b/mods/d2k/maps/letos-erg.oramap
diff --git a/mods/d2k/maps/lynch-pass.oramap b/mods/d2k/maps/lynch-pass.oramap
diff --git a/mods/d2k/maps/mauddibs-cave.oramap b/mods/d2k/maps/mauddibs-cave.oramap
diff --git a/mods/d2k/maps/mount-idaho/map.png b/mods/d2k/maps/mount-idaho/map.png
diff --git a/mods/d2k/maps/mount-irulan.oramap b/mods/d2k/maps/mount-irulan.oramap
diff --git a/mods/d2k/maps/oasis-conquest/map.png b/mods/d2k/maps/oasis-conquest/map.png
diff --git a/mods/d2k/maps/oh-gap.oramap b/mods/d2k/maps/oh-gap.oramap
diff --git a/mods/d2k/maps/pasty-mesa/map.png b/mods/d2k/maps/pasty-mesa/map.png
diff --git a/mods/d2k/maps/red-chasm.oramap b/mods/d2k/maps/red-chasm.oramap
diff --git a/mods/d2k/maps/shellmap/map.png b/mods/d2k/maps/shellmap/map.png
diff --git a/mods/d2k/maps/sietch-tabr.oramap b/mods/d2k/maps/sietch-tabr.oramap
diff --git a/mods/d2k/maps/tenaya.oramap b/mods/d2k/maps/tenaya.oramap
diff --git a/mods/d2k/maps/the-duell.oramap b/mods/d2k/maps/the-duell.oramap
diff --git a/mods/d2k/maps/the-funeral-plain.oramap b/mods/d2k/maps/the-funeral-plain.oramap
diff --git a/mods/d2k/maps/the-great-flat.oramap b/mods/d2k/maps/the-great-flat.oramap
diff --git a/mods/d2k/maps/the-minor-erg.oramap b/mods/d2k/maps/the-minor-erg.oramap
diff --git a/mods/d2k/maps/the-shield-wall.oramap b/mods/d2k/maps/the-shield-wall.oramap
diff --git a/mods/d2k/maps/thufirs-point.oramap b/mods/d2k/maps/thufirs-point.oramap
diff --git a/mods/d2k/maps/tsimpo.oramap b/mods/d2k/maps/tsimpo.oramap
diff --git a/mods/d2k/maps/tucks-sietch.oramap b/mods/d2k/maps/tucks-sietch.oramap
diff --git a/mods/d2k/maps/venac-ditch.oramap b/mods/d2k/maps/venac-ditch.oramap
diff --git a/mods/d2k/maps/vladimirs-folly.oramap b/mods/d2k/maps/vladimirs-folly.oramap
diff --git a/mods/ra/maps/Siberian-Pass.oramap b/mods/ra/maps/Siberian-Pass.oramap
diff --git a/mods/ra/maps/a-nuclear-winter/map.png b/mods/ra/maps/a-nuclear-winter/map.png
diff --git a/mods/ra/maps/a-path-beyond.oramap b/mods/ra/maps/a-path-beyond.oramap
diff --git a/mods/ra/maps/agenda.oramap b/mods/ra/maps/agenda.oramap
diff --git a/mods/ra/maps/alaska-anarchy-redux.oramap b/mods/ra/maps/alaska-anarchy-redux.oramap
diff --git a/mods/ra/maps/all-connected.oramap b/mods/ra/maps/all-connected.oramap
diff --git a/mods/ra/maps/ant-01/map.yaml b/mods/ra/maps/ant-01/map.yaml
@@ -43,7 +43,7 @@ Players:
 		Enemies: AntMan
 		Color: F6D679
 	PlayerReference@AntMan:
-		Name: AntMan 
+		Name: AntMan
 		Faciton: soviet
 		Enemies: Spain, Creeps
 		Bot: campaign

diff --git a/mods/ra/maps/ascent.oramap b/mods/ra/maps/ascent.oramap
diff --git a/mods/ra/maps/asymmetric-battle.oramap b/mods/ra/maps/asymmetric-battle.oramap
diff --git a/mods/ra/maps/barracuda.oramap b/mods/ra/maps/barracuda.oramap
diff --git a/mods/ra/maps/behind-the-veil.oramap b/mods/ra/maps/behind-the-veil.oramap
diff --git a/mods/ra/maps/bombardment-islands.oramap b/mods/ra/maps/bombardment-islands.oramap
diff --git a/mods/ra/maps/bomber-john/map.png b/mods/ra/maps/bomber-john/map.png
diff --git a/mods/ra/maps/caffeinated.oramap b/mods/ra/maps/caffeinated.oramap
diff --git a/mods/ra/maps/center-of-attention-redux-2/map.png b/mods/ra/maps/center-of-attention-redux-2/map.png
diff --git a/mods/ra/maps/chaos-canyon.oramap b/mods/ra/maps/chaos-canyon.oramap
diff --git a/mods/ra/maps/coastal-influence.oramap b/mods/ra/maps/coastal-influence.oramap
diff --git a/mods/ra/maps/cold-front.oramap b/mods/ra/maps/cold-front.oramap
diff --git a/mods/ra/maps/countercross.oramap b/mods/ra/maps/countercross.oramap
diff --git a/mods/ra/maps/crossfire.oramap b/mods/ra/maps/crossfire.oramap
diff --git a/mods/ra/maps/decrepit-isles.oramap b/mods/ra/maps/decrepit-isles.oramap
diff --git a/mods/ra/maps/desert-rats/map.png b/mods/ra/maps/desert-rats/map.png
diff --git a/mods/ra/maps/desert-shellmap/map.png b/mods/ra/maps/desert-shellmap/map.png
diff --git a/mods/ra/maps/doubles.oramap b/mods/ra/maps/doubles.oramap
diff --git a/mods/ra/maps/doublestep.oramap b/mods/ra/maps/doublestep.oramap
diff --git a/mods/ra/maps/doughnut.oramap b/mods/ra/maps/doughnut.oramap
diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.png b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.png
diff --git a/mods/ra/maps/drop-zone-w/map.png b/mods/ra/maps/drop-zone-w/map.png
diff --git a/mods/ra/maps/drop-zone/map.png b/mods/ra/maps/drop-zone/map.png
diff --git a/mods/ra/maps/dual-cold-front.oramap b/mods/ra/maps/dual-cold-front.oramap
diff --git a/mods/ra/maps/east-vs-west.oramap b/mods/ra/maps/east-vs-west.oramap
diff --git a/mods/ra/maps/encounter.oramap b/mods/ra/maps/encounter.oramap
diff --git a/mods/ra/maps/engagement.oramap b/mods/ra/maps/engagement.oramap
diff --git a/mods/ra/maps/ensio-kaivo.oramap b/mods/ra/maps/ensio-kaivo.oramap
diff --git a/mods/ra/maps/evacuation/map.yaml b/mods/ra/maps/evacuation/map.yaml
@@ -16,6 +16,8 @@ Visibility: Lobby, MissionSelector
 
 Categories: Mission, Cooperative Mission
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral

diff --git a/mods/ra/maps/exodus/map.yaml b/mods/ra/maps/exodus/map.yaml
@@ -16,6 +16,8 @@ Visibility: Lobby, MissionSelector
 
 Categories: Mission, Cooperative Mission
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral

diff --git a/mods/ra/maps/fort-lonestar/map.png b/mods/ra/maps/fort-lonestar/map.png
diff --git a/mods/ra/maps/great-sahara-2.oramap b/mods/ra/maps/great-sahara-2.oramap
diff --git a/mods/ra/maps/green-belt.oramap b/mods/ra/maps/green-belt.oramap
diff --git a/mods/ra/maps/haos-ridges.oramap b/mods/ra/maps/haos-ridges.oramap
diff --git a/mods/ra/maps/hypothermia.oramap b/mods/ra/maps/hypothermia.oramap
diff --git a/mods/ra/maps/icy-ridge.oramap b/mods/ra/maps/icy-ridge.oramap
diff --git a/mods/ra/maps/imminent-destruction.oramap b/mods/ra/maps/imminent-destruction.oramap
diff --git a/mods/ra/maps/infiltration/map.yaml b/mods/ra/maps/infiltration/map.yaml
@@ -16,6 +16,8 @@ Visibility: Lobby, MissionSelector
 
 Categories: Mission, Cooperative Mission
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral

diff --git a/mods/ra/maps/jungle-law.oramap b/mods/ra/maps/jungle-law.oramap
diff --git a/mods/ra/maps/keep-off-the-grass-2.oramap b/mods/ra/maps/keep-off-the-grass-2.oramap
diff --git a/mods/ra/maps/mad-science.oramap b/mods/ra/maps/mad-science.oramap
diff --git a/mods/ra/maps/maelstrom.oramap b/mods/ra/maps/maelstrom.oramap
diff --git a/mods/ra/maps/mass-confliction.oramap b/mods/ra/maps/mass-confliction.oramap
diff --git a/mods/ra/maps/minor-pressure.oramap b/mods/ra/maps/minor-pressure.oramap
diff --git a/mods/ra/maps/nine-lives.oramap b/mods/ra/maps/nine-lives.oramap
diff --git a/mods/ra/maps/north-by-northwest.oramap b/mods/ra/maps/north-by-northwest.oramap
diff --git a/mods/ra/maps/northwestpassage.oramap b/mods/ra/maps/northwestpassage.oramap
diff --git a/mods/ra/maps/operation-goldmine.oramap b/mods/ra/maps/operation-goldmine.oramap
diff --git a/mods/ra/maps/opposite-force.oramap b/mods/ra/maps/opposite-force.oramap
diff --git a/mods/ra/maps/ore-gardens.oramap b/mods/ra/maps/ore-gardens.oramap
diff --git a/mods/ra/maps/ore-lord.oramap b/mods/ra/maps/ore-lord.oramap
diff --git a/mods/ra/maps/outdoor-trails.oramap b/mods/ra/maps/outdoor-trails.oramap
diff --git a/mods/ra/maps/pie-of-animosity.oramap b/mods/ra/maps/pie-of-animosity.oramap
diff --git a/mods/ra/maps/pitfight.oramap b/mods/ra/maps/pitfight.oramap
diff --git a/mods/ra/maps/poland-raid/map.png b/mods/ra/maps/poland-raid/map.png
diff --git a/mods/ra/maps/polar-disorder.oramap b/mods/ra/maps/polar-disorder.oramap
diff --git a/mods/ra/maps/pool-party.oramap b/mods/ra/maps/pool-party.oramap
diff --git a/mods/ra/maps/pressure.oramap b/mods/ra/maps/pressure.oramap
diff --git a/mods/ra/maps/puddles-redux.oramap b/mods/ra/maps/puddles-redux.oramap
diff --git a/mods/ra/maps/rapa-nui/map.png b/mods/ra/maps/rapa-nui/map.png
diff --git a/mods/ra/maps/regeneration-basin.oramap b/mods/ra/maps/regeneration-basin.oramap
diff --git a/mods/ra/maps/sarin-gas-2-down-under/map.yaml b/mods/ra/maps/sarin-gas-2-down-under/map.yaml
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Categories: Mission
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral

diff --git a/mods/ra/maps/shattered-mountain/map.png b/mods/ra/maps/shattered-mountain/map.png
diff --git a/mods/ra/maps/sidestep.oramap b/mods/ra/maps/sidestep.oramap
diff --git a/mods/ra/maps/singles.oramap b/mods/ra/maps/singles.oramap
diff --git a/mods/ra/maps/six-below-zero/map.png b/mods/ra/maps/six-below-zero/map.png
diff --git a/mods/ra/maps/snow town/map.png b/mods/ra/maps/snow town/map.png
diff --git a/mods/ra/maps/snow-off/map.png b/mods/ra/maps/snow-off/map.png
diff --git a/mods/ra/maps/snow town/map.bin → mods/ra/maps/snow-town/map.bin b/mods/ra/maps/snow town/map.bin → mods/ra/maps/snow-town/map.bin
diff --git a/mods/ra/maps/snow-town/map.png b/mods/ra/maps/snow-town/map.png
diff --git a/mods/ra/maps/snow town/map.yaml → mods/ra/maps/snow-town/map.yaml b/mods/ra/maps/snow town/map.yaml → mods/ra/maps/snow-town/map.yaml
diff --git a/mods/ra/maps/snow town/rules.yaml → mods/ra/maps/snow-town/rules.yaml b/mods/ra/maps/snow town/rules.yaml → mods/ra/maps/snow-town/rules.yaml
diff --git a/mods/ra/maps/sudden-death.oramap b/mods/ra/maps/sudden-death.oramap
diff --git a/mods/ra/maps/sunstroke.oramap b/mods/ra/maps/sunstroke.oramap
diff --git a/mods/ra/maps/synergy.oramap b/mods/ra/maps/synergy.oramap
diff --git a/mods/ra/maps/tabula-rasa.oramap b/mods/ra/maps/tabula-rasa.oramap
diff --git a/mods/ra/maps/tainted-peak.oramap b/mods/ra/maps/tainted-peak.oramap
diff --git a/mods/ra/maps/tandem.oramap b/mods/ra/maps/tandem.oramap
diff --git a/mods/ra/maps/temperal.oramap b/mods/ra/maps/temperal.oramap
diff --git a/mods/ra/maps/tournament-island.oramap b/mods/ra/maps/tournament-island.oramap
diff --git a/mods/ra/maps/unconventional-warfare.oramap b/mods/ra/maps/unconventional-warfare.oramap
diff --git a/mods/ra/maps/union-sacree.oramap b/mods/ra/maps/union-sacree.oramap
diff --git a/mods/ra/maps/vegetation.oramap b/mods/ra/maps/vegetation.oramap
diff --git a/mods/ra/maps/vihaan-lunta.oramap b/mods/ra/maps/vihaan-lunta.oramap
diff --git a/mods/ra/maps/warwind.oramap b/mods/ra/maps/warwind.oramap
diff --git a/mods/ra/maps/winter-storm.oramap b/mods/ra/maps/winter-storm.oramap
diff --git a/mods/ra/maps/x-lake.oramap b/mods/ra/maps/x-lake.oramap
diff --git a/mods/ra/maps/ysmir.oramap b/mods/ra/maps/ysmir.oramap
diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
@@ -833,4 +833,3 @@ WarriorAnt:
 		Prerequisites: ~disabled
 	RenderSprites:
 		Image: Ant
-
diff --git a/mods/ts/chrome/color-picker.yaml b/mods/ts/chrome/color-picker.yaml
@@ -136,4 +136,4 @@ Background@COLOR_CHOOSER:
 									Y: 0
 									Width: 29
 									Height: 29
-									Visible: false
+									Visible: false
diff --git a/mods/ts/maps/1ice6/map.png b/mods/ts/maps/1ice6/map.png
diff --git a/mods/ts/maps/2temp7/map.png b/mods/ts/maps/2temp7/map.png
diff --git a/mods/ts/maps/ThePit/map.png b/mods/ts/maps/ThePit/map.png
diff --git a/mods/ts/maps/arivruns/map.png b/mods/ts/maps/arivruns/map.png
diff --git a/mods/ts/maps/cliffsin/map.png b/mods/ts/maps/cliffsin/map.png
diff --git a/mods/ts/maps/drawbrid/map.png b/mods/ts/maps/drawbrid/map.png
diff --git a/mods/ts/maps/fields-of-green/map.png b/mods/ts/maps/fields-of-green/map.png
diff --git a/mods/ts/maps/fields-of-green/map.yaml b/mods/ts/maps/fields-of-green/map.yaml
@@ -1419,4 +1419,4 @@ Actors:
 		Owner: Neutral
 		Location: 45,6
 
-Rules: rules.yaml
+Rules: rules.yaml
diff --git a/mods/ts/maps/float/map.png b/mods/ts/maps/float/map.png
diff --git a/mods/ts/maps/forestfr/map.png b/mods/ts/maps/forestfr/map.png
diff --git a/mods/ts/maps/karasjok/map.png b/mods/ts/maps/karasjok/map.png
diff --git a/mods/ts/maps/ot11/map.png b/mods/ts/maps/ot11/map.png
diff --git a/mods/ts/maps/rivrrad4/map.png b/mods/ts/maps/rivrrad4/map.png
diff --git a/mods/ts/maps/springs/map.png b/mods/ts/maps/springs/map.png
diff --git a/mods/ts/maps/sunstroke/map.png b/mods/ts/maps/sunstroke/map.png
diff --git a/mods/ts/maps/t_garden/map.png b/mods/ts/maps/t_garden/map.png
diff --git a/mods/ts/maps/tactical/map.png b/mods/ts/maps/tactical/map.png
diff --git a/mods/ts/maps/terrace/map.png b/mods/ts/maps/terrace/map.png
diff --git a/mods/ts/maps/tiers/map.png b/mods/ts/maps/tiers/map.png
diff --git a/mods/ts/maps/tread_l/map.png b/mods/ts/maps/tread_l/map.png
diff --git a/mods/ts/maps/ts_rift/map.png b/mods/ts/maps/ts_rift/map.png
diff --git a/mods/ts/maps/uganda/map.png b/mods/ts/maps/uganda/map.png