Merge pull request #10839 from pchote/map-format-nine

Extract map rules to external files (and map format changes).

OpenRA.Game/GameRules/RulesetCache.cs

@@ -21,7 +21,7 @@ namespace OpenRA
 {
 	public sealed class RulesetCache
 	{
-		static readonly List<MiniYamlNode> NoMapRules = new List<MiniYamlNode>();
+		static readonly string[] NoMapRules = new string[0];
 
 		readonly ModData modData;
 
@@ -94,12 +94,12 @@ namespace OpenRA
 
 		Dictionary<string, T> LoadYamlRules<T>(IReadOnlyFileSystem fileSystem,
 			Dictionary<string, T> itemCache,
-			string[] files, List<MiniYamlNode> nodes,
+			string[] files, string[] mapFiles,
 			Func<MiniYamlNode, T> f)
 		{
 			RaiseProgress();
 
-			var inputKey = string.Concat(string.Join("|", files), "|", nodes.WriteToString());
+			var inputKey = string.Concat(string.Join("|", files.Append(mapFiles)), "|");
 			Func<MiniYamlNode, T> wrap = wkv =>
 			{
 				var key = inputKey + wkv.Value.ToLines(wkv.Key).JoinWith("|");
@@ -114,7 +114,7 @@ namespace OpenRA
 				return t;
 			};
 
-			var tree = MiniYaml.Merge(files.Select(s => MiniYaml.FromStream(fileSystem.Open(s))).Append(nodes))
+			var tree = MiniYaml.Merge(files.Append(mapFiles).Select(s => MiniYaml.FromStream(fileSystem.Open(s))))
 				.ToDictionaryWithConflictLog(n => n.Key, n => n.Value, "LoadYamlRules", null, null);
 			RaiseProgress();
 

OpenRA.Game/Graphics/Minimap.cs

@@ -1,149 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 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 System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using OpenRA.Traits;
-
-namespace OpenRA.Graphics
-{
-	public static class Minimap
-	{
-		public static Bitmap TerrainBitmap(TileSet tileset, Map map, bool actualSize = false)
-		{
-			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
-			var b = map.Bounds;
-
-			// Fudge the heightmap offset by adding as much extra as we need / can.
-			// This tries to correct for our incorrect assumption that MPos == PPos
-			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
-			var width = b.Width;
-			var height = b.Height + heightOffset;
-
-			var bitmapWidth = width;
-			if (isRectangularIsometric)
-				bitmapWidth = 2 * bitmapWidth - 1;
-
-			if (!actualSize)
-				bitmapWidth = height = Exts.NextPowerOf2(Math.Max(bitmapWidth, height));
-
-			var terrain = new Bitmap(bitmapWidth, height);
-
-			var bitmapData = terrain.LockBits(terrain.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			var mapTiles = map.MapTiles.Value;
-
-			unsafe
-			{
-				var colors = (int*)bitmapData.Scan0;
-				var stride = bitmapData.Stride / 4;
-				for (var y = 0; y < height; y++)
-				{
-					for (var x = 0; x < width; x++)
-					{
-						var uv = new MPos(x + b.Left, y + b.Top);
-						var type = tileset.GetTileInfo(mapTiles[uv]);
-						var leftColor = type != null ? type.LeftColor : Color.Black;
-
-						if (isRectangularIsometric)
-						{
-							// Odd rows are shifted right by 1px
-							var dx = uv.V & 1;
-							var rightColor = type != null ? type.RightColor : Color.Black;
-							if (x + dx > 0)
-								colors[y * stride + 2 * x + dx - 1] = leftColor.ToArgb();
-
-							if (2 * x + dx < stride)
-								colors[y * stride + 2 * x + dx] = rightColor.ToArgb();
-						}
-						else
-							colors[y * stride + x] = leftColor.ToArgb();
-					}
-				}
-			}
-
-			terrain.UnlockBits(bitmapData);
-			return terrain;
-		}
-
-		// Add the static resources defined in the map; if the map lives
-		// in a world use AddCustomTerrain instead
-		static Bitmap AddStaticResources(TileSet tileset, Map map, Ruleset resourceRules, Bitmap terrainBitmap)
-		{
-			var terrain = new Bitmap(terrainBitmap);
-			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
-			var b = map.Bounds;
-
-			// Fudge the heightmap offset by adding as much extra as we need / can
-			// This tries to correct for our incorrect assumption that MPos == PPos
-			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
-			var width = b.Width;
-			var height = b.Height + heightOffset;
-
-			var resources = resourceRules.Actors["world"].TraitInfos<ResourceTypeInfo>()
-				.ToDictionary(r => r.ResourceType, r => r.TerrainType);
-
-			var bitmapData = terrain.LockBits(terrain.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				var colors = (int*)bitmapData.Scan0;
-				var stride = bitmapData.Stride / 4;
-				for (var y = 0; y < height; y++)
-				{
-					for (var x = 0; x < width; x++)
-					{
-						var uv = new MPos(x + b.Left, y + b.Top);
-						if (map.MapResources.Value[uv].Type == 0)
-							continue;
-
-						string res;
-						if (!resources.TryGetValue(map.MapResources.Value[uv].Type, out res))
-							continue;
-
-						var color = tileset[tileset.GetTerrainIndex(res)].Color.ToArgb();
-						if (isRectangularIsometric)
-						{
-							// Odd rows are shifted right by 1px
-							var dx = uv.V & 1;
-							if (x + dx > 0)
-								colors[y * stride + 2 * x + dx - 1] = color;
-
-							if (2 * x + dx < stride)
-								colors[y * stride + 2 * x + dx] = color;
-						}
-						else
-							colors[y * stride + x] = color;
-					}
-				}
-			}
-
-			terrain.UnlockBits(bitmapData);
-
-			return terrain;
-		}
-
-		public static Bitmap RenderMapPreview(TileSet tileset, Map map, bool actualSize)
-		{
-			return RenderMapPreview(tileset, map, map.Rules, actualSize);
-		}
-
-		public static Bitmap RenderMapPreview(TileSet tileset, Map map, Ruleset resourceRules, bool actualSize)
-		{
-			using (var terrain = TerrainBitmap(tileset, map, actualSize))
-				return AddStaticResources(tileset, map, resourceRules, terrain);
-		}
-	}
-}

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -100,14 +100,13 @@ namespace OpenRA.Graphics
 		public Sequences LoadSequences(IReadOnlyFileSystem fileSystem, Map map)
 		{
 			using (new Support.PerfTimer("LoadSequences"))
-				return Load(fileSystem, map != null ? map.SequenceDefinitions : new List<MiniYamlNode>());
+				return Load(fileSystem, map != null ? map.SequenceDefinitions : new string[0]);
 		}
 
-		Sequences Load(IReadOnlyFileSystem fileSystem, List<MiniYamlNode> sequenceNodes)
+		Sequences Load(IReadOnlyFileSystem fileSystem, string[] mapSequences)
 		{
-			var nodes = MiniYaml.Merge(modData.Manifest.Sequences
+			var nodes = MiniYaml.Merge(modData.Manifest.Sequences.Append(mapSequences)
-				.Select(s => MiniYaml.FromStream(fileSystem.Open(s)))
+				.Select(s => MiniYaml.FromStream(fileSystem.Open(s))));
-				.Append(sequenceNodes));
 
 			var items = new Dictionary<string, UnitSequences>();
 			foreach (var n in nodes)

OpenRA.Game/Graphics/VoxelProvider.cs

@@ -21,7 +21,7 @@ namespace OpenRA.Graphics
 	{
 		static Dictionary<string, Dictionary<string, Voxel>> units;
 
-		public static void Initialize(VoxelLoader loader, IReadOnlyFileSystem fileSystem, string[] voxelFiles, List<MiniYamlNode> voxelNodes)
+		public static void Initialize(VoxelLoader loader, IReadOnlyFileSystem fileSystem, IEnumerable<string> voxelFiles)
 		{
 			units = new Dictionary<string, Dictionary<string, Voxel>>();
 

OpenRA.Game/Map/Map.cs

@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -19,6 +20,7 @@ using System.Text;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Network;
+using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
 
@@ -66,7 +68,7 @@ namespace OpenRA
 
 	public class Map : IReadOnlyFileSystem
 	{
-		public const int SupportedMapFormat = 9;
+		public const int SupportedMapFormat = 10;
 
 		public const int MaxTilesInCircleRange = 50;
 		public readonly MapGrid Grid;
@@ -88,7 +90,7 @@ namespace OpenRA
 		public string Type = "Conquest";
 		public string Author;
 		public string Tileset;
-		public Bitmap CustomPreview;
+		public bool LockPreview;
 		public bool InvalidCustomRules { get; private set; }
 
 		public WVec OffsetOfSubCell(SubCell subCell)
@@ -102,23 +104,18 @@ namespace OpenRA
 		public static string ComputeUID(IReadOnlyPackage package)
 		{
 			// UID is calculated by taking an SHA1 of the yaml and binary data
+			var requiredFiles = new[] { "map.yaml", "map.bin" };
+			var contents = package.Contents.ToList();
+			foreach (var required in requiredFiles)
+				if (!contents.Contains(required))
+					throw new FileNotFoundException("Required file {0} not present in this map".F(required));
+
 			using (var ms = new MemoryStream())
 			{
-				// Read the relevant data into the buffer
+				foreach (var filename in contents)
-				using (var s = package.GetStream("map.yaml"))
+					if (filename.EndsWith(".yaml") || filename.EndsWith(".bin") || filename.EndsWith(".lua"))
-				{
+						using (var s = package.GetStream(filename))
-					if (s == null)
+							s.CopyTo(ms);
-						throw new FileNotFoundException("Required file map.yaml not present in this map");
-					s.CopyTo(ms);
-				}
-
-				using (var s = package.GetStream("map.bin"))
-				{
-					if (s == null)
-						throw new FileNotFoundException("Required file map.bin not present in this map");
-
-					s.CopyTo(ms);
-				}
 
 				// Take the SHA1
 				ms.Seek(0, SeekOrigin.Begin);
@@ -144,18 +141,17 @@ namespace OpenRA
 		public Lazy<CPos[]> SpawnPoints;
 
 		// Yaml map data
-		[FieldLoader.Ignore] public List<MiniYamlNode> RuleDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] RuleDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> SequenceDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] SequenceDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> VoxelSequenceDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] VoxelSequenceDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> WeaponDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] WeaponDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> VoiceDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] VoiceDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> MusicDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] MusicDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> NotificationDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] NotificationDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> TranslationDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public readonly string[] TranslationDefinitions = { };
-		[FieldLoader.Ignore] public List<MiniYamlNode> PlayerDefinitions = new List<MiniYamlNode>();
 
+		[FieldLoader.Ignore] public List<MiniYamlNode> PlayerDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> ActorDefinitions = new List<MiniYamlNode>();
-		[FieldLoader.Ignore] public List<MiniYamlNode> SmudgeDefinitions = new List<MiniYamlNode>();
 
 		// Binary map data
 		[FieldLoader.Ignore] public byte TileFormat = 2;
@@ -188,6 +184,13 @@ namespace OpenRA
 					throw new InvalidOperationException("Required file {0} not present in this map".F(filename));
 		}
 
+		void LoadFileList(MiniYaml yaml, string section, ref string[] files)
+		{
+			MiniYamlNode node;
+			if ((node = yaml.Nodes.FirstOrDefault(n => n.Key == section)) != null)
+				files = FieldLoader.GetValue<string[]>(section, node.Value.Value);
+		}
+
 		/// <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.
@@ -257,18 +260,17 @@ namespace OpenRA
 				return spawns.ToArray();
 			});
 
-			RuleDefinitions = MiniYaml.NodesOrEmpty(yaml, "Rules");
+			LoadFileList(yaml, "Rules", ref RuleDefinitions);
-			SequenceDefinitions = MiniYaml.NodesOrEmpty(yaml, "Sequences");
+			LoadFileList(yaml, "Sequences", ref SequenceDefinitions);
-			VoxelSequenceDefinitions = MiniYaml.NodesOrEmpty(yaml, "VoxelSequences");
+			LoadFileList(yaml, "VoxelSequences", ref VoxelSequenceDefinitions);
-			WeaponDefinitions = MiniYaml.NodesOrEmpty(yaml, "Weapons");
+			LoadFileList(yaml, "Weapons", ref WeaponDefinitions);
-			VoiceDefinitions = MiniYaml.NodesOrEmpty(yaml, "Voices");
+			LoadFileList(yaml, "Voices", ref VoiceDefinitions);
-			MusicDefinitions = MiniYaml.NodesOrEmpty(yaml, "Music");
+			LoadFileList(yaml, "Music", ref MusicDefinitions);
-			NotificationDefinitions = MiniYaml.NodesOrEmpty(yaml, "Notifications");
+			LoadFileList(yaml, "Notifications", ref NotificationDefinitions);
-			TranslationDefinitions = MiniYaml.NodesOrEmpty(yaml, "Translations");
+			LoadFileList(yaml, "Translations", ref TranslationDefinitions);
-			PlayerDefinitions = MiniYaml.NodesOrEmpty(yaml, "Players");
 
+			PlayerDefinitions = MiniYaml.NodesOrEmpty(yaml, "Players");
 			ActorDefinitions = MiniYaml.NodesOrEmpty(yaml, "Actors");
-			SmudgeDefinitions = MiniYaml.NodesOrEmpty(yaml, "Smudges");
 
 			MapTiles = Exts.Lazy(LoadMapTiles);
 			MapResources = Exts.Lazy(LoadResourceTiles);
@@ -280,10 +282,6 @@ namespace OpenRA
 			LastSubCell = (SubCell)(SubCellOffsets.Length - 1);
 			DefaultSubCell = (SubCell)Grid.SubCellDefaultIndex;
 
-			if (Package.Contains("map.png"))
-				using (var dataStream = Package.GetStream("map.png"))
-					CustomPreview = new Bitmap(dataStream);
-
 			PostInit();
 
 			Uid = ComputeUID(Package);
@@ -443,23 +441,37 @@ namespace OpenRA
 				root.Add(new MiniYamlNode(field, FieldSaver.FormatValue(this, f)));
 			}
 
+			// Save LockPreview field only if it's set
+			if (LockPreview)
+				root.Add(new MiniYamlNode("LockPreview", "True"));
+
 			root.Add(new MiniYamlNode("Players", null, PlayerDefinitions));
 			root.Add(new MiniYamlNode("Actors", null, ActorDefinitions));
-			root.Add(new MiniYamlNode("Smudges", null, SmudgeDefinitions));
+
-			root.Add(new MiniYamlNode("Rules", null, RuleDefinitions));
+			var fileFields = new[]
-			root.Add(new MiniYamlNode("Sequences", null, SequenceDefinitions));
+			{
-			root.Add(new MiniYamlNode("VoxelSequences", null, VoxelSequenceDefinitions));
+				Pair.New("Rules", RuleDefinitions),
-			root.Add(new MiniYamlNode("Weapons", null, WeaponDefinitions));
+				Pair.New("Sequences", SequenceDefinitions),
-			root.Add(new MiniYamlNode("Voices", null, VoiceDefinitions));
+				Pair.New("VoxelSequences", VoxelSequenceDefinitions),
-			root.Add(new MiniYamlNode("Music", null, MusicDefinitions));
+				Pair.New("Weapons", WeaponDefinitions),
-			root.Add(new MiniYamlNode("Notifications", null, NotificationDefinitions));
+				Pair.New("Voices", VoiceDefinitions),
-			root.Add(new MiniYamlNode("Translations", null, TranslationDefinitions));
+				Pair.New("Music", MusicDefinitions),
+				Pair.New("Notifications", NotificationDefinitions),
+				Pair.New("Translations", TranslationDefinitions)
+			};
+
+			foreach (var kv in fileFields)
+				if (kv.Second.Any())
+					root.Add(new MiniYamlNode(kv.First, FieldSaver.FormatValue(kv.Second)));
 
 			// Saving to a new package: copy over all the content from the map
 			if (Package != null && toPackage != Package)
 				foreach (var file in Package.Contents)
 					toPackage.Update(file, Package.GetStream(file).ReadAllBytes());
 
+			if (!LockPreview)
+				toPackage.Update("map.png", SavePreview());
+
 			// Update the package with the new map data
 			var s = root.WriteToString();
 			toPackage.Update("map.yaml", Encoding.UTF8.GetBytes(s));
@@ -607,6 +619,84 @@ namespace OpenRA
 			return dataStream.ToArray();
 		}
 
+		public byte[] SavePreview()
+		{
+			var tileset = Rules.TileSets[Tileset];
+			var resources = Rules.Actors["world"].TraitInfos<ResourceTypeInfo>()
+				.ToDictionary(r => r.ResourceType, r => r.TerrainType);
+
+			using (var stream = new MemoryStream())
+			{
+				var isRectangularIsometric = Grid.Type == MapGridType.RectangularIsometric;
+
+				// Fudge the heightmap offset by adding as much extra as we need / can.
+				// This tries to correct for our incorrect assumption that MPos == PPos
+				var heightOffset = Math.Min(Grid.MaximumTerrainHeight, MapSize.Y - Bounds.Bottom);
+				var width = Bounds.Width;
+				var height = Bounds.Height + heightOffset;
+
+				var bitmapWidth = width;
+				if (isRectangularIsometric)
+					bitmapWidth = 2 * bitmapWidth - 1;
+
+				using (var bitmap = new Bitmap(bitmapWidth, height))
+				{
+					var bitmapData = bitmap.LockBits(bitmap.Bounds(),
+						ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+
+					unsafe
+					{
+						var colors = (int*)bitmapData.Scan0;
+						var stride = bitmapData.Stride / 4;
+						Color leftColor, rightColor;
+
+						for (var y = 0; y < height; y++)
+						{
+							for (var x = 0; x < width; x++)
+							{
+								var uv = new MPos(x + Bounds.Left, y + Bounds.Top);
+								var resourceType = MapResources.Value[uv].Type;
+								if (resourceType != 0)
+								{
+									// Cell contains resources
+									string res;
+									if (!resources.TryGetValue(resourceType, out res))
+										continue;
+
+									leftColor = rightColor = tileset[tileset.GetTerrainIndex(res)].Color;
+								}
+								else
+								{
+									// Cell contains terrain
+									var type = tileset.GetTileInfo(MapTiles.Value[uv]);
+									leftColor = type != null ? type.LeftColor : Color.Black;
+									rightColor = type != null ? type.RightColor : Color.Black;
+								}
+
+								if (isRectangularIsometric)
+								{
+									// Odd rows are shifted right by 1px
+									var dx = uv.V & 1;
+									if (x + dx > 0)
+										colors[y * stride + 2 * x + dx - 1] = leftColor.ToArgb();
+
+									if (2 * x + dx < stride)
+										colors[y * stride + 2 * x + dx] = rightColor.ToArgb();
+								}
+								else
+									colors[y * stride + x] = leftColor.ToArgb();
+							}
+						}
+					}
+
+					bitmap.UnlockBits(bitmapData);
+					bitmap.Save(stream, ImageFormat.Png);
+				}
+
+				return stream.ToArray();
+			}
+		}
+
 		public bool Contains(CPos cell)
 		{
 			// .ToMPos() returns the same result if the X and Y coordinates

OpenRA.Game/Map/MapCache.cs

@@ -193,28 +193,8 @@ namespace OpenRA
 				// Render the minimap into the shared sheet
 				foreach (var p in todo)
 				{
-					// The rendering is thread safe because it only reads from the passed instances and writes to a new bitmap
+					if (p.Preview != null)
-					var createdPreview = false;
+						Game.RunAfterTick(() => p.SetMinimap(sheetBuilder.Add(p.Preview)));
-					var bitmap = p.CustomPreview;
-					if (bitmap == null)
-					{
-						createdPreview = true;
-						var map = new Map(modData, p.Package);
-						bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[map.Tileset], map, modData.DefaultRules, true);
-					}
-
-					Game.RunAfterTick(() =>
-					{
-						try
-						{
-							p.SetMinimap(sheetBuilder.Add(bitmap));
-						}
-						finally
-						{
-							if (createdPreview)
-								bitmap.Dispose();
-						}
-					});
 
 					// Yuck... But this helps the UI Jank when opening the map selector significantly.
 					Thread.Sleep(Environment.ProcessorCount == 1 ? 25 : 5);

OpenRA.Game/Map/MapPreview.cs

@@ -69,7 +69,7 @@ namespace OpenRA
 		public CPos[] SpawnPoints { get; private set; }
 		public MapGridType GridType { get; private set; }
 		public Rectangle Bounds { get; private set; }
-		public Bitmap CustomPreview { get; private set; }
+		public Bitmap Preview { get; private set; }
 		public MapStatus Status { get; private set; }
 		public MapClassification Class { get; private set; }
 		public MapVisibility Visibility { get; private set; }
@@ -200,7 +200,7 @@ namespace OpenRA
 
 			if (p.Contains("map.png"))
 				using (var dataStream = p.GetStream("map.png"))
-					CustomPreview = new Bitmap(dataStream);
+					Preview = new Bitmap(dataStream);
 		}
 
 		bool EvaluateUserFriendliness(Dictionary<string, PlayerReference> players)
@@ -253,11 +253,11 @@ namespace OpenRA
 						SpawnPoints = spawns;
 						GridType = r.map_grid_type;
 
-						CustomPreview = new Bitmap(new MemoryStream(Convert.FromBase64String(r.minimap)));
+						Preview = new Bitmap(new MemoryStream(Convert.FromBase64String(r.minimap)));
 					}
 					catch (Exception) { }
 
-					if (CustomPreview != null)
+					if (Preview != null)
 						cache.CacheMinimap(this);
 				}
 

OpenRA.Game/ModData.cs

@@ -130,9 +130,8 @@ namespace OpenRA
 				return;
 			}
 
-			var yaml = MiniYaml.Merge(Manifest.Translations
+			var yaml = MiniYaml.Merge(Manifest.Translations.Append(map.TranslationDefinitions)
-				.Select(t => MiniYaml.FromStream(ModFiles.Open(t)))
+				.Select(t => MiniYaml.FromStream(map.Open(t))));
-				.Append(map.TranslationDefinitions));
 			Languages = yaml.Select(t => t.Key).ToArray();
 
 			foreach (var y in yaml)
@@ -183,7 +182,7 @@ namespace OpenRA
 				foreach (var entry in map.Rules.Music)
 					entry.Value.Load(map);
 
-			VoxelProvider.Initialize(VoxelLoader, map, Manifest.VoxelSequences, map.VoxelSequenceDefinitions);
+			VoxelProvider.Initialize(VoxelLoader, map, Manifest.VoxelSequences.Append(map.VoxelSequenceDefinitions));
 			VoxelLoader.Finish();
 
 			return map;

OpenRA.Game/OpenRA.Game.csproj

@@ -121,7 +121,6 @@
     <Compile Include="Graphics\CursorSequence.cs" />
     <Compile Include="Graphics\HardwarePalette.cs" />
     <Compile Include="Graphics\MappedImage.cs" />
-    <Compile Include="Graphics\Minimap.cs" />
     <Compile Include="Graphics\SequenceProvider.cs" />
     <Compile Include="Graphics\Sheet.cs" />
     <Compile Include="Graphics\SheetBuilder.cs" />

OpenRA.Mods.Common/Lint/CheckSequences.cs

@@ -32,8 +32,8 @@ namespace OpenRA.Mods.Common.Lint
 			var modData = Game.ModData;
 			this.emitError = emitError;
 
-			var sequenceSource = map != null ? map.SequenceDefinitions : new List<MiniYamlNode>();
+			var mapSequences = map != null ? map.SequenceDefinitions : new string[0];
-			sequenceDefinitions = MiniYaml.Merge(modData.Manifest.Sequences.Select(s => MiniYaml.FromStream(map.Open(s))).Append(sequenceSource));
+			sequenceDefinitions = MiniYaml.Merge(modData.Manifest.Sequences.Append(mapSequences).Select(s => MiniYaml.FromStream(map.Open(s))));
 
 			var rules = map == null ? modData.DefaultRules : map.Rules;
 			var factions = rules.Actors["world"].TraitInfos<FactionInfo>().Select(f => f.InternalName).ToArray();

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -543,7 +543,6 @@
     <Compile Include="UtilityCommands\ExtractLuaDocsCommand.cs" />
     <Compile Include="UtilityCommands\ExtractTraitDocsCommand.cs" />
     <Compile Include="WorldExtensions.cs" />
-    <Compile Include="UtilityCommands\GenerateMinimapCommand.cs" />
     <Compile Include="UtilityCommands\GetMapHashCommand.cs" />
     <Compile Include="UtilityCommands\Glob.cs" />
     <Compile Include="UtilityCommands\ImportLegacyMapCommand.cs" />

OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs

@@ -18,6 +18,12 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
+	public struct MapSmudge
+	{
+		public string Type;
+		public int Depth;
+	}
+
 	[Desc("Attach this to the world actor.", "Order of the layers defines the Z sorting.")]
 	public class SmudgeLayerInfo : ITraitInfo
 	{
@@ -36,6 +42,33 @@ namespace OpenRA.Mods.Common.Traits
 
 		[PaletteReference] public readonly string Palette = TileSet.TerrainPaletteInternalName;
 
+		[FieldLoader.LoadUsing("LoadInitialSmudges")]
+		public readonly Dictionary<CPos, MapSmudge> InitialSmudges;
+
+		public static object LoadInitialSmudges(MiniYaml yaml)
+		{
+			MiniYaml smudgeYaml;
+			var nd = yaml.ToDictionary();
+			var smudges = new Dictionary<CPos, MapSmudge>();
+			if (nd.TryGetValue("InitialSmudges", out smudgeYaml))
+			{
+				foreach (var node in smudgeYaml.Nodes)
+				{
+					try
+					{
+						var cell = FieldLoader.GetValue<CPos>("key", node.Key);
+						var parts = node.Value.Value.Split(',');
+						var type = parts[0];
+						var depth = FieldLoader.GetValue<int>("depth", parts[1]);
+						smudges.Add(cell, new MapSmudge { Type = type, Depth = depth });
+					}
+					catch { }
+				}
+			}
+
+			return smudges;
+		}
+
 		public object Create(ActorInitializer init) { return new SmudgeLayer(init.Self, this); }
 	}
 
@@ -85,28 +118,21 @@ namespace OpenRA.Mods.Common.Traits
 			render = new TerrainSpriteLayer(w, wr, sheet, blendMode, wr.Palette(Info.Palette), wr.World.Type != WorldType.Editor);
 
 			// Add map smudges
-			foreach (var s in w.Map.SmudgeDefinitions)
+			foreach (var kv in Info.InitialSmudges)
 			{
-				var name = s.Key;
+				var s = kv.Value;
-				var vals = name.Split(' ');
+				if (!smudges.ContainsKey(s.Type))
-				var type = vals[0];
-
-				if (!smudges.ContainsKey(type))
 					continue;
 
-				var loc = vals[1].Split(',');
-				var cell = new CPos(Exts.ParseIntegerInvariant(loc[0]), Exts.ParseIntegerInvariant(loc[1]));
-				var depth = Exts.ParseIntegerInvariant(vals[2]);
-
 				var smudge = new Smudge
 				{
-					Type = type,
+					Type = s.Type,
-					Depth = depth,
+					Depth = s.Depth,
-					Sprite = smudges[type][depth]
+					Sprite = smudges[s.Type][s.Depth]
 				};
 
-				tiles.Add(cell, smudge);
+				tiles.Add(kv.Key, smudge);
-				render.Update(cell, smudge.Sprite);
+				render.Update(kv.Key, smudge.Sprite);
 			}
 		}
 

OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs

@@ -127,7 +127,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			{
 				try
 				{
-					modData.RulesetCache.Load(modData.DefaultFileSystem, map);
+					modData.RulesetCache.Load(map ?? modData.DefaultFileSystem, map);
 					var customRulesPass = (ILintRulesPass)modData.ObjectCreator.CreateBasic(customRulesPassType);
 					customRulesPass.Run(EmitError, EmitWarning, rules);
 				}

OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs

@@ -1,40 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 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 System;
-using System.IO;
-using OpenRA.Graphics;
-
-namespace OpenRA.Mods.Common.UtilityCommands
-{
-	class GenerateMinimapCommand : IUtilityCommand
-	{
-		public string Name { get { return "--map-preview"; } }
-
-		public bool ValidateArguments(string[] args)
-		{
-			return args.Length >= 2;
-		}
-
-		[Desc("MAPFILE", "Render PNG minimap of specified oramap file.")]
-		public void Run(ModData modData, string[] args)
-		{
-			Game.ModData = modData;
-
-			var map = new Map(modData, modData.ModFiles.OpenPackage(args[1]));
-			var minimap = Minimap.RenderMapPreview(map.Rules.TileSets[map.Tileset], map, true);
-
-			var dest = Path.GetFileNameWithoutExtension(args[1]) + ".png";
-			minimap.Save(dest);
-			Console.WriteLine(dest + " saved.");
-		}
-	}
-}

OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 
 		public ModData ModData;
 		public Map Map;
+		public IReadWritePackage Package;
 		public List<string> Players = new List<string>();
 		public MapPlayers MapPlayers;
 		public MiniYaml Rules = new MiniYaml("");
@@ -51,6 +52,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			Game.ModData = modData;
 
 			var filename = args[1];
+			var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap";
+			Package = new ZipFile(modData.ModFiles, dest, true);
 			using (var stream = modData.DefaultFileSystem.Open(filename))
 			{
 				var file = new IniFile(stream);
@@ -79,7 +82,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 
 				ReadActors(file);
 
-				LoadSmudges(file, "SMUDGE", MapSize, Map);
+				LoadSmudges(file, "SMUDGE");
 
 				var waypoints = file.GetSection("Waypoints");
 				LoadWaypoints(Map, waypoints, MapSize);
@@ -93,11 +96,16 @@ namespace OpenRA.Mods.Common.UtilityCommands
 
 			Map.FixOpenAreas();
 
-			Map.RuleDefinitions = Rules.Nodes;
+			if (Rules.Nodes.Any())
+			{
+				// HACK: bypassing the readonly modifier here is still better than leaving this mutable by everyone
+				typeof(Map).GetField("RuleDefinitions").SetValue(Map, new[] { "rules.yaml" });
 
-			var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap";
+				var rulesText = Rules.Nodes.ToLines(false).JoinWith("\n");
-			var package = new ZipFile(modData.ModFiles, dest, true);
+				Package.Update("rules.yaml", System.Text.Encoding.ASCII.GetBytes(rulesText));
-			Map.Save(package);
+			}
+
+			Map.Save(Package);
 			Console.WriteLine(dest + " saved.");
 		}
 
@@ -271,16 +279,45 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			}
 		}
 
-		static void LoadSmudges(IniFile file, string section, int mapSize, Map map)
+		void LoadSmudges(IniFile file, string section)
 		{
+			var scorches = new List<MiniYamlNode>();
+			var craters = new List<MiniYamlNode>();
 			foreach (var s in file.GetSection(section, true))
 			{
 				// loc=type,loc,depth
 				var parts = s.Value.Split(',');
 				var loc = Exts.ParseIntegerInvariant(parts[1]);
-				var key = "{0} {1},{2} {3}".F(parts[0].ToLowerInvariant(), loc % mapSize, loc / mapSize, Exts.ParseIntegerInvariant(parts[2]));
+				var type = parts[0].ToLowerInvariant();
-				map.SmudgeDefinitions.Add(new MiniYamlNode(key, ""));
+				var key = "{0},{1}".F(loc % MapSize, loc / MapSize);
+				var value = "{0},{1}".F(type, parts[2]);
+				var node = new MiniYamlNode(key, value);
+				if (type.StartsWith("sc"))
+					scorches.Add(node);
+				else if (type.StartsWith("cr"))
+					craters.Add(node);
 			}
+
+			var worldNode = Rules.Nodes.FirstOrDefault(n => n.Key == "World");
+			if (worldNode == null)
+				worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
+
+			if (scorches.Any())
+			{
+				var initialScorches = new MiniYamlNode("InitialSmudges", new MiniYaml("", scorches));
+				var smudgeLayer = new MiniYamlNode("SmudgeLayer@SCORCH", new MiniYaml("", new List<MiniYamlNode>() { initialScorches }));
+				worldNode.Value.Nodes.Add(smudgeLayer);
+			}
+
+			if (craters.Any())
+			{
+				var initialCraters = new MiniYamlNode("InitialSmudges", new MiniYaml("", craters));
+				var smudgeLayer = new MiniYamlNode("SmudgeLayer@CRATER", new MiniYaml("", new List<MiniYamlNode>() { initialCraters }));
+				worldNode.Value.Nodes.Add(smudgeLayer);
+			}
+
+			if (worldNode.Value.Nodes.Any() && !Rules.Nodes.Contains(worldNode))
+				Rules.Nodes.Add(worldNode);
 		}
 
 		// TODO: fix this -- will have bitrotted pretty badly.

OpenRA.Mods.Common/UtilityCommands/UpgradeMapCommand.cs

@@ -25,6 +25,21 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			return args.Length >= 3;
 		}
 
+		delegate void UpgradeAction(int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth);
+
+		static void ProcessYaml(Map map, IEnumerable<string> files, int engineDate, UpgradeAction processFile)
+		{
+		    foreach (var filename in files)
+		    {
+		        if (!map.Package.Contains(filename))
+		            continue;
+
+		        var yaml = MiniYaml.FromStream(map.Package.GetStream(filename));
+		        processFile(engineDate, ref yaml, null, 0);
+		        ((IReadWritePackage)map.Package).Update(filename, Encoding.ASCII.GetBytes(yaml.WriteToString()));
+		    }
+		}
+
 		public static void UpgradeMap(ModData modData, IReadWritePackage package, int engineDate)
 		{
 			UpgradeRules.UpgradeMapFormat(modData, package);
@@ -37,8 +52,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			}
 
 			var map = new Map(modData, package);
-			UpgradeRules.UpgradeWeaponRules(engineDate, ref map.WeaponDefinitions, null, 0);
+			ProcessYaml(map, map.WeaponDefinitions, engineDate, UpgradeRules.UpgradeWeaponRules);
-			UpgradeRules.UpgradeActorRules(engineDate, ref map.RuleDefinitions, null, 0);
+			ProcessYaml(map, map.RuleDefinitions, engineDate, UpgradeRules.UpgradeActorRules);
 			UpgradeRules.UpgradePlayers(engineDate, ref map.PlayerDefinitions, null, 0);
 			UpgradeRules.UpgradeActors(engineDate, ref map.ActorDefinitions, null, 0);
 			map.Save(package);

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -778,7 +778,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						}
 					}
 
-					Console.WriteLine("Converted " + package.Name + " to MapFormat 8.");
 					if (noteHexColors)
 						Console.WriteLine("ColorRamp is now called Color and uses rgb(a) hex value - rrggbb[aa].");
 					else if (noteColorRamp)
@@ -949,9 +948,97 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					rules.Value.Nodes.Add(playerNode);
 			}
 
-			yaml.Nodes.First(n => n.Key == "MapFormat").Value = new MiniYaml(Map.SupportedMapFormat.ToString());
+			// Format 9 -> 10 extracted map rules, sequences, voxelsequences, weapons, voices, music, notifications,
+			// and translations to external files, moved smudges to SmudgeLayer, and uses map.png for all maps
+			if (mapFormat < 10)
+			{
+				ExtractSmudges(yaml);
+				ExtractOrRemoveRules(package, yaml, "Rules", "rules.yaml");
+				ExtractOrRemoveRules(package, yaml, "Sequences", "sequences.yaml");
+				ExtractOrRemoveRules(package, yaml, "VoxelSequences", "voxels.yaml");
+				ExtractOrRemoveRules(package, yaml, "Weapons", "weapons.yaml");
+				ExtractOrRemoveRules(package, yaml, "Voices", "voices.yaml");
+				ExtractOrRemoveRules(package, yaml, "Music", "music.yaml");
+				ExtractOrRemoveRules(package, yaml, "Notifications", "notifications.yaml");
+				ExtractOrRemoveRules(package, yaml, "Translations", "translations.yaml");
+
+				if (package.Contains("map.png"))
+					yaml.Nodes.Add(new MiniYamlNode("LockPreview", new MiniYaml("True")));
+			}
+
+			if (mapFormat < Map.SupportedMapFormat)
+			{
+				yaml.Nodes.First(n => n.Key == "MapFormat").Value = new MiniYaml(Map.SupportedMapFormat.ToString());
+				Console.WriteLine("Converted {0} to MapFormat {1}.", package.Name, Map.SupportedMapFormat);
+			}
 
 			package.Update("map.yaml", Encoding.UTF8.GetBytes(yaml.Nodes.WriteToString()));
 		}
+
+		static void ExtractSmudges(MiniYaml yaml)
+		{
+			var smudges = yaml.Nodes.FirstOrDefault(n => n.Key == "Smudges");
+			if (smudges == null || !smudges.Value.Nodes.Any())
+				return;
+
+			var scorches = new List<MiniYamlNode>();
+			var craters = new List<MiniYamlNode>();
+			foreach (var s in smudges.Value.Nodes)
+			{
+				// loc=type,loc,depth
+				var parts = s.Key.Split(' ');
+				var value = "{0},{1}".F(parts[0], parts[2]);
+				var node = new MiniYamlNode(parts[1], value);
+				if (parts[0].StartsWith("sc"))
+					scorches.Add(node);
+				else if (parts[0].StartsWith("cr"))
+					craters.Add(node);
+			}
+
+			var rulesNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Rules");
+			if (rulesNode == null)
+			{
+				rulesNode = new MiniYamlNode("Rules", new MiniYaml("", new List<MiniYamlNode>()));
+				yaml.Nodes.Add(rulesNode);
+			}
+
+			var worldNode = rulesNode.Value.Nodes.FirstOrDefault(n => n.Key == "World");
+			if (worldNode == null)
+			{
+				worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
+				rulesNode.Value.Nodes.Add(rulesNode);
+			}
+
+			if (scorches.Any())
+			{
+				var initialScorches = new MiniYamlNode("InitialSmudges", new MiniYaml("", scorches));
+				var smudgeLayer = new MiniYamlNode("SmudgeLayer@SCORCH", new MiniYaml("", new List<MiniYamlNode>() { initialScorches }));
+				worldNode.Value.Nodes.Add(smudgeLayer);
+			}
+
+			if (craters.Any())
+			{
+				var initialCraters = new MiniYamlNode("InitialSmudges", new MiniYaml("", craters));
+				var smudgeLayer = new MiniYamlNode("SmudgeLayer@CRATER", new MiniYaml("", new List<MiniYamlNode>() { initialCraters }));
+				worldNode.Value.Nodes.Add(smudgeLayer);
+			}
+		}
+
+		static void ExtractOrRemoveRules(IReadWritePackage package, MiniYaml yaml, string key, string filename)
+		{
+			var node = yaml.Nodes.FirstOrDefault(n => n.Key == key);
+			if (node == null)
+				return;
+
+			if (node.Value.Nodes.Any())
+			{
+				var rulesText = node.Value.Nodes.ToLines(false).JoinWith("\n");
+				package.Update(filename, System.Text.Encoding.ASCII.GetBytes(rulesText));
+				node.Value.Value = filename;
+				node.Value.Nodes.Clear();
+			}
+			else
+				yaml.Nodes.Remove(node);
+		}
 	}
 }

OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			}
 
 			// Briefing tab
-			if (world.Map.CustomPreview != null)
+			if (world.Map.Exists("map.png"))
 			{
 				numTabs++;
 				var mapTabButton = widget.Get<ButtonWidget>(string.Concat("BUTTON", numTabs.ToString()));

OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs

@@ -165,6 +165,8 @@ namespace OpenRA.Mods.TS.UtilityCommands
 			var filename = args[1];
 			var file = new IniFile(File.Open(args[1], FileMode.Open));
 			var map = GenerateMapHeader(filename, file, modData);
+			var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap";
+			var package = new ZipFile(modData.DefaultFileSystem, dest, true);
 
 			ReadTiles(map, file);
 			ReadActors(map, file, "Structures");
@@ -173,13 +175,11 @@ namespace OpenRA.Mods.TS.UtilityCommands
 			ReadTerrainActors(map, file);
 			ReadWaypoints(map, file);
 			ReadOverlay(map, file);
-			ReadLighting(map, file);
+			ReadLighting(map, package, file);
 
 			var mapPlayers = new MapPlayers(map.Rules, spawnCount);
 			map.PlayerDefinitions = mapPlayers.ToMiniYaml();
 
-			var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap";
-			var package = new ZipFile(modData.DefaultFileSystem, dest, true);
 			map.Save(package);
 			Console.WriteLine(dest + " saved.");
 		}
@@ -431,29 +431,32 @@ namespace OpenRA.Mods.TS.UtilityCommands
 			}
 		}
 
-		void ReadLighting(Map map, IniFile file)
+		void ReadLighting(Map map, IReadWritePackage package, IniFile file)
 		{
 			var lightingTypes = new[] { "Red", "Green", "Blue", "Ambient" };
 			var lightingSection = file.GetSection("Lighting");
-			var lightingNodes = new List<MiniYamlNode>();
+			var lightingNode = new MiniYamlNode("GlobalLightingPaletteEffect", new MiniYaml("", new List<MiniYamlNode>()));
+			var worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>() { lightingNode }));
+
 			foreach (var kv in lightingSection)
 			{
 				if (lightingTypes.Contains(kv.Key))
 				{
 					var val = FieldLoader.GetValue<float>(kv.Key, kv.Value);
 					if (val != 1.0f)
-						lightingNodes.Add(new MiniYamlNode(kv.Key, FieldSaver.FormatValue(val)));
+						lightingNode.Value.Nodes.Add(new MiniYamlNode(kv.Key, FieldSaver.FormatValue(val)));
 				}
 				else
 					Console.WriteLine("Ignoring unknown lighting type: `{0}`".F(kv.Key));
 			}
 
-			if (lightingNodes.Any())
+			if (lightingNode.Value.Nodes.Any())
 			{
-				map.RuleDefinitions.Add(new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()
+				// HACK: bypassing the readonly modifier here is still better than leaving this mutable by everyone
-				{
+				typeof(Map).GetField("RuleDefinitions").SetValue(map, new[] { "rules.yaml" });
-					new MiniYamlNode("GlobalLightingPaletteEffect", new MiniYaml("", lightingNodes))
+
-				})));
+				var rulesText = new List<MiniYamlNode>() { worldNode }.ToLines(false).JoinWith("\n");
+				package.Update("rules.yaml", System.Text.Encoding.ASCII.GetBytes(rulesText));
 			}
 		}
 	}

mods/cnc/maps/cnc64gdi01/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
@@ -710,182 +712,6 @@ Actors:
 		Owner: Nod
 		Location: 26,14
 
-Smudges:
+Rules: rules.yaml
 
-Rules:
+Sequences: sequences.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: cnc64gdi01.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: aoi
-		MissionData:
-			Briefing: Nod is experimenting on civilians with Tiberium. Use the commando to take out the SAM sites surrounding the dropoff area. With the SAMs gone you will then get an airstrike.  Take out the Obelisk and an MCV will be delivered to help you to locate and destroy the biochem facility.
-			StartVideo: obel.vqa
-			WinVideo: orcabomb.vqa
-			LossVideo: cutout.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 10000
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	BIO.Husk:
-		Tooltip:
-			ShowOwnerRow: false
-	EYE:
-		IonCannonPower:
-			Prerequisites: ~disabled
-	FLARE:
-		RevealsShroud:
-			Range: 5c0
-	STNK:
-		Buildable:
-			Prerequisites: ~techlevel.high
-	TRAN:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	OLDLST:
-		Inherits: LST
-		-WithRoof:
-		-Selectable:
-		RejectsOrders:
-		Cargo:
-			Types: disabled
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	airstrike.proxy:
-		AlwaysVisible:
-		AirstrikePower:
-			Icon: airstrike
-			StartFullyCharged: True
-			ChargeTime: 120
-			SquadSize: 3
-			QuantizedFacings: 8
-			Description: Air Strike
-			LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
-			EndChargeSound: airredy1.aud
-			SelectTargetSound: select1.aud
-			InsufficientPowerSound: nopower1.aud
-			IncomingSound: enemya.aud
-			UnitType: a10
-			DisplayBeacon: True
-			BeaconPoster: airstrike
-			DisplayRadarPing: True
-			CameraActor: camera
-
-Sequences:
-	oldlst:
-		idle: lst
-			Start: 0
-			Facings: 1
-			ZOffset: -1024
-		icon: lsticnh.tem
-			AddExtension: False
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/cnc64gdi01/rules.yaml

@@ -0,0 +1,178 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: cnc64gdi01.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: aoi
+	MissionData:
+		Briefing: Nod is experimenting on civilians with Tiberium. Use the commando to take out the SAM sites surrounding the dropoff area. With the SAMs gone you will then get an airstrike.  Take out the Obelisk and an MCV will be delivered to help you to locate and destroy the biochem facility.
+		StartVideo: obel.vqa
+		WinVideo: orcabomb.vqa
+		LossVideo: cutout.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 10000
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+BIO.Husk:
+	Tooltip:
+		ShowOwnerRow: false
+
+EYE:
+	IonCannonPower:
+		Prerequisites: ~disabled
+
+FLARE:
+	RevealsShroud:
+		Range: 5c0
+
+STNK:
+	Buildable:
+		Prerequisites: ~techlevel.high
+
+TRAN:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+OLDLST:
+	Inherits: LST
+	-WithRoof:
+	-Selectable:
+	RejectsOrders:
+	Cargo:
+		Types: disabled
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+airstrike.proxy:
+	AlwaysVisible:
+	AirstrikePower:
+		Icon: airstrike
+		StartFullyCharged: True
+		ChargeTime: 120
+		SquadSize: 3
+		QuantizedFacings: 8
+		Description: Air Strike
+		LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
+		EndChargeSound: airredy1.aud
+		SelectTargetSound: select1.aud
+		InsufficientPowerSound: nopower1.aud
+		IncomingSound: enemya.aud
+		UnitType: a10
+		DisplayBeacon: True
+		BeaconPoster: airstrike
+		DisplayRadarPing: True
+		CameraActor: camera

mods/cnc/maps/cnc64gdi01/sequences.yaml

@@ -0,0 +1,7 @@
+oldlst: 
+	idle: lst
+		Start: 0
+		Facings: 1
+		ZOffset: -1024
+	icon: lsticnh.tem
+		AddExtension: False

mods/cnc/maps/funpark01/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -407,156 +409,8 @@ Actors:
 		Location: 16,50
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
 
-Rules:
+Sequences: sequences.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Civilian: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Dinosaur: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		EnemyWatcher:
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		LuaScript:
-			Scripts: scj01ea.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: j1
-		MissionData:
-			Briefing: There have been some reports of strange animals in this area. \n\nTake your units to investigate, and report back your findings.
-			BriefingVideo: generic.vqa
-			StartVideo: dino.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			Difficulties: Easy, Normal
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-	^CivInfantry:
-		-ActorLostNotification:
-	^CivBuilding:
-		AnnounceOnSeen:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	OLDLST:
-		Inherits: LST
-		-WithRoof:
-		-Selectable:
-		RejectsOrders:
-		Cargo:
-			Types: disabled
-	TREX:
-		Health:
-			HP: 750
-		Mobile:
-			Speed: 34
-		AutoTarget:
-			ScanRadius: 5
-	TRIC:
-		Health:
-			HP: 700
-		Mobile:
-			Speed: 18
-		AutoTarget:
-			ScanRadius: 5
-	STEG:
-		Health:
-			HP: 600
-		Mobile:
-			Speed: 32
-	^DINO:
-		Tooltip:
-			ShowOwnerRow: false
-		MustBeDestroyed:
 
-Sequences:
+Weapons: weapons.yaml
-	oldlst:
-		idle: lst
-			Start: 0
-			Facings: 1
-			ZOffset: -1024
-		icon: lsticnh.tem
-			AddExtension: False
-
-VoxelSequences:
-
-Weapons:
-	Teeth:
-		Range: 1c900
-		Warhead@1Dam: SpreadDamage
-			Versus:
-				Wood: 35
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/funpark01/rules.yaml

@@ -0,0 +1,143 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Civilian: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Dinosaur: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	EnemyWatcher:
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	LuaScript:
+		Scripts: scj01ea.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: j1
+	MissionData:
+		Briefing: There have been some reports of strange animals in this area. \n\nTake your units to investigate, and report back your findings.
+		BriefingVideo: generic.vqa
+		StartVideo: dino.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		Difficulties: Easy, Normal
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+
+^CivInfantry:
+	-ActorLostNotification:
+
+^CivBuilding:
+	AnnounceOnSeen:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+OLDLST:
+	Inherits: LST
+	-WithRoof:
+	-Selectable:
+	RejectsOrders:
+	Cargo:
+		Types: disabled
+
+TREX:
+	Health:
+		HP: 750
+	Mobile:
+		Speed: 34
+	AutoTarget:
+		ScanRadius: 5
+
+TRIC:
+	Health:
+		HP: 700
+	Mobile:
+		Speed: 18
+	AutoTarget:
+		ScanRadius: 5
+
+STEG:
+	Health:
+		HP: 600
+	Mobile:
+		Speed: 32
+
+^DINO:
+	Tooltip:
+		ShowOwnerRow: false
+	MustBeDestroyed:

mods/cnc/maps/funpark01/sequences.yaml

@@ -0,0 +1,7 @@
+oldlst: 
+	idle: lst
+		Start: 0
+		Facings: 1
+		ZOffset: -1024
+	icon: lsticnh.tem
+		AddExtension: False

mods/cnc/maps/funpark01/weapons.yaml

@@ -0,0 +1,5 @@
+Teeth:
+	Range: 1c900
+	Warhead@1Dam: SpreadDamage
+		Versus:
+			Wood: 35

mods/cnc/maps/gdi01/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
@@ -392,218 +394,8 @@ Actors:
 		Location: 54,53
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
 
-Rules:
+Sequences: sequences.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi01.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: aoi
-		MissionData:
-			Briefing: Use the units provided to protect the Mobile Construction Vehicle (MCV).\n\nYou should then deploy the MCV by selecting it with a left-click and then right-clicking on it.\n\nThen you can begin to build up a base. Start with a Power Plant.\n\nFinally, search out and destroy all enemy Nod units in the surrounding area.
-			BackgroundVideo: intro2.vqa
-			BriefingVideo: gdi1.vqa
-			StartVideo: landing.vqa
-			WinVideo: consyard.vqa
-			LossVideo: gameover.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 5000
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	NUKE:
-		-Sellable:
-		Buildable:
-			BuildLimit: 1
-	PYLE:
-		-Sellable:
-		Buildable:
-			BuildLimit: 1
-	FACT:
-		-Sellable:
-	PROC:
-		Buildable:
-			Prerequisites: ~disabled
-	SILO:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	HQ:
-		Buildable:
-			Prerequisites: ~disabled
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	E2:
-		Buildable:
-			Prerequisites: ~disabled
-	E3:
-		Buildable:
-			Prerequisites: ~disabled
-	E6:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	BOAT:
-		Health:
-			HP: 1500
-		AutoTarget:
-			InitialStance: AttackAnything
-		RejectsOrders:
-			Except: Attack
-	OLDLST:
-		Inherits: LST
-		-WithRoof:
-		-Selectable:
-		RejectsOrders:
-		Cargo:
-			Types: disabled
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
 
-Sequences:
+Weapons: weapons.yaml
-	oldlst:
-		idle: lst
-			Start: 0
-			Facings: 1
-			ZOffset: -1024
-		icon: lsticnh.tem
-			AddExtension: False
-
-VoxelSequences:
-
-Weapons:
-	BoatMissile:
-		Warhead: SpreadDamage
-			Versus:
-				Heavy: 50
-			Damage: 50
-			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi01/rules.yaml

@@ -0,0 +1,221 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi01.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: aoi
+	MissionData:
+		Briefing: Use the units provided to protect the Mobile Construction Vehicle (MCV).\n\nYou should then deploy the MCV by selecting it with a left-click and then right-clicking on it.\n\nThen you can begin to build up a base. Start with a Power Plant.\n\nFinally, search out and destroy all enemy Nod units in the surrounding area.
+		BackgroundVideo: intro2.vqa
+		BriefingVideo: gdi1.vqa
+		StartVideo: landing.vqa
+		WinVideo: consyard.vqa
+		LossVideo: gameover.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 5000
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+NUKE:
+	-Sellable:
+	Buildable:
+		BuildLimit: 1
+
+PYLE:
+	-Sellable:
+	Buildable:
+		BuildLimit: 1
+
+FACT:
+	-Sellable:
+
+PROC:
+	Buildable:
+		Prerequisites: ~disabled
+
+SILO:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+HQ:
+	Buildable:
+		Prerequisites: ~disabled
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+E2:
+	Buildable:
+		Prerequisites: ~disabled
+
+E3:
+	Buildable:
+		Prerequisites: ~disabled
+
+E6:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+BOAT:
+	Health:
+		HP: 1500
+	AutoTarget:
+		InitialStance: AttackAnything
+	RejectsOrders:
+		Except: Attack
+
+OLDLST:
+	Inherits: LST
+	-WithRoof:
+	-Selectable:
+	RejectsOrders:
+	Cargo:
+		Types: disabled
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/gdi01/sequences.yaml

@@ -0,0 +1,7 @@
+oldlst: 
+	idle: lst
+		Start: 0
+		Facings: 1
+		ZOffset: -1024
+	icon: lsticnh.tem
+		AddExtension: False

mods/cnc/maps/gdi01/weapons.yaml

@@ -0,0 +1,6 @@
+BoatMissile:
+	Warhead: SpreadDamage
+		Versus:
+			Heavy: 50
+		Damage: 50
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath

mods/cnc/maps/gdi02/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@GDI:
 		Name: GDI
@@ -621,216 +623,6 @@ Actors:
 		Location: 54,55
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
 
-Rules:
+Sequences: sequences.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi02.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: befeared
-		MissionData:
-			Briefing: Defend your position, deploy the MCV, then build a sizable force to search out and destroy the Nod base in the area.\n\nAll Nod units and structures must be either destroyed or captured to complete objective.
-			BriefingVideo: gdi2.vqa
-			WinVideo: flag.vqa
-			LossVideo: gameover.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 5000
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	SBAG:
-		-Crushable:
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	HARV:
-		Harvester:
-			SearchFromProcRadius: 32
-			SearchFromOrderRadius: 20
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	PROC:
-		Buildable:
-			Prerequisites: ~disabled
-	SILO:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	HQ:
-		Buildable:
-			Prerequisites: ~disabled
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	E2:
-		Buildable:
-			Prerequisites: ~disabled
-	E3:
-		Buildable:
-			Prerequisites: ~disabled
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	E6:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	AFLD:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	SAM:
-		Buildable:
-			Prerequisites: ~disabled
-	OLDLST:
-		Inherits: LST
-		-WithRoof:
-		-Selectable:
-		RejectsOrders:
-		Cargo:
-			Types: disabled
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-	oldlst:
-		idle: lst
-			Start: 0
-			Facings: 1
-			ZOffset: -1024
-		icon: lsticnh.tem
-			AddExtension: False
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi02/rules.yaml

@@ -0,0 +1,228 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi02.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: befeared
+	MissionData:
+		Briefing: Defend your position, deploy the MCV, then build a sizable force to search out and destroy the Nod base in the area.\n\nAll Nod units and structures must be either destroyed or captured to complete objective.
+		BriefingVideo: gdi2.vqa
+		WinVideo: flag.vqa
+		LossVideo: gameover.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 5000
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+SBAG:
+	-Crushable:
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+HARV:
+	Harvester:
+		SearchFromProcRadius: 32
+		SearchFromOrderRadius: 20
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+PROC:
+	Buildable:
+		Prerequisites: ~disabled
+
+SILO:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+HQ:
+	Buildable:
+		Prerequisites: ~disabled
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+E2:
+	Buildable:
+		Prerequisites: ~disabled
+
+E3:
+	Buildable:
+		Prerequisites: ~disabled
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+E6:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+AFLD:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+SAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+OLDLST:
+	Inherits: LST
+	-WithRoof:
+	-Selectable:
+	RejectsOrders:
+	Cargo:
+		Types: disabled
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/gdi02/sequences.yaml

@@ -0,0 +1,7 @@
+oldlst: 
+	idle: lst
+		Start: 0
+		Facings: 1
+		ZOffset: -1024
+	icon: lsticnh.tem
+		AddExtension: False

mods/cnc/maps/gdi03/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
@@ -695,212 +697,4 @@ Actors:
 		Location: 37,51
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi03.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: crep226m
-		MissionData:
-			Briefing: Build up forces to destroy Nod base.\n\nOnce all Nod SAM sites are neutralized then air support will be provided to combat obstacles such as turrets.\n\nDestroy all units and structures to complete the mission objective.
-			BriefingVideo: gdi3.vqa
-			StartVideo: samdie.vqa
-			WinVideo: bombaway.vqa
-			LossVideo: gameover.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 5000
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	SBAG:
-		-Crushable:
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	E3:
-		Buildable:
-			Prerequisites: ~disabled
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	AFLD:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	SAM:
-		Buildable:
-			Prerequisites: ~disabled
-		Building:
-		Power:
-			Amount: -10
-		-Capturable:
-	HQ:
-		Tooltip:
-			Description: Provides an overview of the battlefield.\n  Requires power to operate.
-		-AirstrikePower:
-	airstrike.proxy:
-		AlwaysVisible:
-		AirstrikePower:
-			Icon: airstrike
-			StartFullyCharged: True
-			ChargeTime: 120
-			SquadSize: 3
-			QuantizedFacings: 8
-			Description: Air Strike
-			LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
-			EndChargeSound: airredy1.aud
-			SelectTargetSound: select1.aud
-			InsufficientPowerSound: nopower1.aud
-			IncomingSound: enemya.aud
-			UnitType: a10
-			DisplayBeacon: True
-			BeaconPoster: airstrike
-			DisplayRadarPing: True
-			CameraActor: camera
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi03/rules.yaml

@@ -0,0 +1,227 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi03.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: crep226m
+	MissionData:
+		Briefing: Build up forces to destroy Nod base.\n\nOnce all Nod SAM sites are neutralized then air support will be provided to combat obstacles such as turrets.\n\nDestroy all units and structures to complete the mission objective.
+		BriefingVideo: gdi3.vqa
+		StartVideo: samdie.vqa
+		WinVideo: bombaway.vqa
+		LossVideo: gameover.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 5000
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+SBAG:
+	-Crushable:
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+E3:
+	Buildable:
+		Prerequisites: ~disabled
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+AFLD:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+SAM:
+	Buildable:
+		Prerequisites: ~disabled
+	Building:
+	Power:
+		Amount: -10
+	-Capturable:
+
+HQ:
+	Tooltip:
+		Description: Provides an overview of the battlefield.\n  Requires power to operate.
+	-AirstrikePower:
+
+airstrike.proxy:
+	AlwaysVisible:
+	AirstrikePower:
+		Icon: airstrike
+		StartFullyCharged: True
+		ChargeTime: 120
+		SquadSize: 3
+		QuantizedFacings: 8
+		Description: Air Strike
+		LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
+		EndChargeSound: airredy1.aud
+		SelectTargetSound: select1.aud
+		InsufficientPowerSound: nopower1.aud
+		IncomingSound: enemya.aud
+		UnitType: a10
+		DisplayBeacon: True
+		BeaconPoster: airstrike
+		DisplayRadarPing: True
+		CameraActor: camera
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/gdi04a/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
@@ -453,136 +455,6 @@ Actors:
 		Location: 27,58
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
 
-Rules:
+Weapons: weapons.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi04a.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: fist226m
-		MissionData:
-			Briefing: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces.
-			BackgroundVideo: bkground.vqa
-			BriefingVideo: gdi4b.vqa
-			StartVideo: nitejump.vqa
-			WinVideo: burdet1.vqa
-			LossVideo: gameover.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-	Tiberium:
-		Warhead@1Dam: SpreadDamage
-			Damage: 6
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi04a/rules.yaml

@@ -0,0 +1,128 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi04a.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: fist226m
+	MissionData:
+		Briefing: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces.
+		BackgroundVideo: bkground.vqa
+		BriefingVideo: gdi4b.vqa
+		StartVideo: nitejump.vqa
+		WinVideo: burdet1.vqa
+		LossVideo: gameover.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/gdi04a/weapons.yaml

@@ -0,0 +1,3 @@
+Tiberium:
+	Warhead@1Dam: SpreadDamage
+		Damage: 6

mods/cnc/maps/gdi04b/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
@@ -524,139 +526,6 @@ Actors:
 		Location: 50,45
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
 
-Rules:
+Weapons: weapons.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi04b.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: fist226m
-		MissionData:
-			Briefing: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces.
-			BackgroundVideo: bkground.vqa
-			BriefingVideo: gdi4b.vqa
-			StartVideo: nitejump.vqa
-			WinVideo: burdet1.vqa
-			LossVideo: gameover.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	E3:
-		AutoTarget:
-			ScanRadius: 5
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-	Tiberium:
-		Warhead@1Dam: SpreadDamage
-			Damage: 4
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi04b/rules.yaml

@@ -0,0 +1,132 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi04b.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: fist226m
+	MissionData:
+		Briefing: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces.
+		BackgroundVideo: bkground.vqa
+		BriefingVideo: gdi4b.vqa
+		StartVideo: nitejump.vqa
+		WinVideo: burdet1.vqa
+		LossVideo: gameover.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+E3:
+	AutoTarget:
+		ScanRadius: 5
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/gdi04b/weapons.yaml

@@ -0,0 +1,3 @@
+Tiberium:
+	Warhead@1Dam: SpreadDamage
+		Damage: 4

mods/cnc/maps/gdi04c/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -738,167 +740,6 @@ Actors:
 		Location: 28,47
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-	sc5 58,38 0:
-	sc6 55,37 0:
-	sc5 56,34 0:
-	sc5 47,34 0:
-	sc6 54,33 0:
-	sc3 47,33 0:
-	sc4 46,33 0:
-	sc2 55,32 0:
-	cr1 23,32 0:
-	sc3 48,31 0:
-	sc2 47,31 0:
 
-Rules:
+Weapons: weapons.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi04c.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: ind
-		MissionData:
-			Briefing: Nod is moving to capture and hold a civilian town.\n\nYour mission is to reach the town first and hold off invading Nod units until GDI reinforcements can arrive.\n\nAll invading Nod units must be destroyed.
-			BackgroundVideo: bkground.vqa
-			BriefingVideo: gdi4a.vqa
-			StartVideo: nodsweep.vqa
-			WinVideo: burdet1.vqa
-			LossVideo: gameover.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^CivInfantry:
-		Health:
-			HP: 125
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Bridge:
-		DamageMultiplier@INVULNERABLE:
-			Modifier: 0
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-	Rockets:
-		Range: 5c0
-		Warhead: SpreadDamage
-			Versus:
-				None: 10
-				Light: 66
-				Heavy: 66
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi04c/rules.yaml

@@ -0,0 +1,163 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi04c.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: ind
+	MissionData:
+		Briefing: Nod is moving to capture and hold a civilian town.\n\nYour mission is to reach the town first and hold off invading Nod units until GDI reinforcements can arrive.\n\nAll invading Nod units must be destroyed.
+		BackgroundVideo: bkground.vqa
+		BriefingVideo: gdi4a.vqa
+		StartVideo: nodsweep.vqa
+		WinVideo: burdet1.vqa
+		LossVideo: gameover.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+	SmudgeLayer@SCORCH:
+		InitialSmudges:
+			58,38: sc5,0
+			55,37: sc6,0
+			56,34: sc5,0
+			47,34: sc5,0
+			54,33: sc6,0
+			47,33: sc3,0
+			46,33: sc4,0
+			55,32: sc2,0
+			48,31: sc3,0
+			47,31: sc2,0
+	SmudgeLayer@CRATER:
+		InitialSmudges:
+			23,32: cr1,0
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^CivInfantry:
+	Health:
+		HP: 125
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Bridge:
+	DamageMultiplier@INVULNERABLE:
+		Modifier: 0
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/gdi04c/weapons.yaml

@@ -0,0 +1,7 @@
+Rockets:
+	Range: 5c0
+	Warhead: SpreadDamage
+		Versus:
+			None: 10
+			Light: 66
+			Heavy: 66

mods/cnc/maps/gdi05a/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
@@ -752,246 +754,6 @@ Actors:
 		Location: 44,40
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-	sc4 41,55 0:
-	cr1 41,54 0:
-	cr1 13,52 0:
-	sc5 48,51 0:
-	cr1 11,51 0:
-	sc2 53,50 0:
-	sc3 51,50 0:
-	sc4 45,50 0:
-	sc6 49,48 0:
 
-Rules:
+Weapons: weapons.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi05a.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: rain
-		MissionData:
-			Briefing: A GDI field base is under attack. They have fended off one attack but will not survive another.\n\nMove to the base, repair the structures and then launch a strike force to destroy the Nod base in the area.\n\nDestroy all Nod units and structures.
-			BackgroundVideo: podium.vqa
-			BriefingVideo: gdi5.vqa
-			StartVideo: seige.vqa
-			WinVideo: nodlose.vqa
-			LossVideo: gdilose.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			Difficulties: Easy, Normal, Hard
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		EnemyWatcher:
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 2000
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	E2:
-		Buildable:
-			Prerequisites: ~pyle
-	E3:
-		Buildable:
-			Queue: Infantry.Nod
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	HARV:
-		Harvester:
-			SearchFromOrderRadius: 24
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	LTNK:
-		Buildable:
-			Prerequisites: ~afld
-	MCV:
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	HTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	MSAM:
-		Buildable:
-			Prerequisites: ~disabled
-	ARTY:
-		Buildable:
-			Prerequisites: ~disabled
-	MLRS:
-		Buildable:
-			Prerequisites: ~disabled
-	FTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	STNK:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	MoneyCrate:
-		Inherits: ^Crate
-		GiveCashCrateAction:
-			Amount: 500
-			UseCashTick: yes
-	airstrike.proxy:
-		AlwaysVisible:
-		AirstrikePower:
-			Icon: airstrike
-			StartFullyCharged: True
-			ChargeTime: 120
-			SquadSize: 1
-			QuantizedFacings: 8
-			Description: Air Strike
-			LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
-			EndChargeSound: airredy1.aud
-			SelectTargetSound: select1.aud
-			InsufficientPowerSound: nopower1.aud
-			IncomingSound: enemya.aud
-			UnitType: a10
-			DisplayBeacon: True
-			BeaconPoster: airstrike
-			DisplayRadarPing: True
-			CameraActor: camera
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-	Tiberium:
-		Warhead@1Dam: SpreadDamage
-			Damage: 4
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi05a/rules.yaml

@@ -0,0 +1,266 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi05a.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: rain
+	MissionData:
+		Briefing: A GDI field base is under attack. They have fended off one attack but will not survive another.\n\nMove to the base, repair the structures and then launch a strike force to destroy the Nod base in the area.\n\nDestroy all Nod units and structures.
+		BackgroundVideo: podium.vqa
+		BriefingVideo: gdi5.vqa
+		StartVideo: seige.vqa
+		WinVideo: nodlose.vqa
+		LossVideo: gdilose.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		Difficulties: Easy, Normal, Hard
+		ShortGameLocked: True
+		ShortGameEnabled: False
+	SmudgeLayer@SCORCH:
+		InitialSmudges:
+			41,55: sc4,0
+			48,51: sc5,0
+			53,50: sc2,0
+			51,50: sc3,0
+			45,50: sc4,0
+			49,48: sc6,0
+	SmudgeLayer@CRATER:
+		InitialSmudges:
+			41,54: cr1,0
+			13,52: cr1,0
+			11,51: cr1,0
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	EnemyWatcher:
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 2000
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+E2:
+	Buildable:
+		Prerequisites: ~pyle
+
+E3:
+	Buildable:
+		Queue: Infantry.Nod
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+HARV:
+	Harvester:
+		SearchFromOrderRadius: 24
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+LTNK:
+	Buildable:
+		Prerequisites: ~afld
+
+MCV:
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+HTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+MSAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+ARTY:
+	Buildable:
+		Prerequisites: ~disabled
+
+MLRS:
+	Buildable:
+		Prerequisites: ~disabled
+
+FTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+STNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+MoneyCrate:
+	Inherits: ^Crate
+	GiveCashCrateAction:
+		Amount: 500
+		UseCashTick: yes
+
+airstrike.proxy:
+	AlwaysVisible:
+	AirstrikePower:
+		Icon: airstrike
+		StartFullyCharged: True
+		ChargeTime: 120
+		SquadSize: 1
+		QuantizedFacings: 8
+		Description: Air Strike
+		LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
+		EndChargeSound: airredy1.aud
+		SelectTargetSound: select1.aud
+		InsufficientPowerSound: nopower1.aud
+		IncomingSound: enemya.aud
+		UnitType: a10
+		DisplayBeacon: True
+		BeaconPoster: airstrike
+		DisplayRadarPing: True
+		CameraActor: camera

mods/cnc/maps/gdi05a/weapons.yaml

@@ -0,0 +1,3 @@
+Tiberium:
+	Warhead@1Dam: SpreadDamage
+		Damage: 4

mods/cnc/maps/gdi05b/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Nod:
 		Name: Nod
@@ -605,226 +607,4 @@ Actors:
 		Location: 26,37
 		Owner: Nod
 
-Smudges:
+Rules: rules.yaml
-	sc3 15,56 0:
-	sc2 40,53 0:
-	sc2 24,53 0:
-	sc5 39,52 0:
-	sc1 24,52 0:
-	sc4 39,51 0:
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		EnemyWatcher:
-		MusicPlaylist:
-			StartingMusic: rain
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 4000
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		LuaScript:
-			Scripts: gdi05b.lua
-		MissionData:
-			Briefing: A GDI field base is under attack. They have fended off one attack but will not survive another.\n\nMove to the base, repair the structures and then launch a strike force to destroy the Nod base in the area.\n\nDestroy all Nod units and structures.
-			BackgroundVideo: podium.vqa
-			BriefingVideo: gdi5.vqa
-			StartVideo: seige.vqa
-			WinVideo: nodlose.vqa
-			LossVideo: gdilose.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	SBAG:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	CYCL:
-		Buildable:
-			Prerequisites: ~disabled
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	E2:
-		Buildable:
-			Prerequisites: ~pyle
-	E3:
-		Buildable:
-			Prerequisites: ~disabled
-	HARV:
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	HTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	MSAM:
-		Buildable:
-			Prerequisites: ~disabled
-	MCV:
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	FTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	airstrike.proxy:
-		AlwaysVisible:
-		AirstrikePower:
-			Icon: airstrike
-			StartFullyCharged: True
-			ChargeTime: 120
-			SquadSize: 1
-			QuantizedFacings: 8
-			Description: Air Strike
-			LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
-			EndChargeSound: airredy1.aud
-			SelectTargetSound: select1.aud
-			InsufficientPowerSound: nopower1.aud
-			IncomingSound: enemya.aud
-			UnitType: a10
-			DisplayBeacon: True
-			BeaconPoster: airstrike
-			DisplayRadarPing: True
-			CameraActor: camera
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi05b/rules.yaml

@@ -0,0 +1,244 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	EnemyWatcher:
+	MusicPlaylist:
+		StartingMusic: rain
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 4000
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	LuaScript:
+		Scripts: gdi05b.lua
+	MissionData:
+		Briefing: A GDI field base is under attack. They have fended off one attack but will not survive another.\n\nMove to the base, repair the structures and then launch a strike force to destroy the Nod base in the area.\n\nDestroy all Nod units and structures.
+		BackgroundVideo: podium.vqa
+		BriefingVideo: gdi5.vqa
+		StartVideo: seige.vqa
+		WinVideo: nodlose.vqa
+		LossVideo: gdilose.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+	SmudgeLayer@SCORCH:
+		InitialSmudges:
+			15,56: sc3,0
+			40,53: sc2,0
+			24,53: sc2,0
+			39,52: sc5,0
+			24,52: sc1,0
+			39,51: sc4,0
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+SBAG:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+CYCL:
+	Buildable:
+		Prerequisites: ~disabled
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+E2:
+	Buildable:
+		Prerequisites: ~pyle
+
+E3:
+	Buildable:
+		Prerequisites: ~disabled
+
+HARV:
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+HTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+MSAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+MCV:
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+FTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+airstrike.proxy:
+	AlwaysVisible:
+	AirstrikePower:
+		Icon: airstrike
+		StartFullyCharged: True
+		ChargeTime: 120
+		SquadSize: 1
+		QuantizedFacings: 8
+		Description: Air Strike
+		LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
+		EndChargeSound: airredy1.aud
+		SelectTargetSound: select1.aud
+		InsufficientPowerSound: nopower1.aud
+		IncomingSound: enemya.aud
+		UnitType: a10
+		DisplayBeacon: True
+		BeaconPoster: airstrike
+		DisplayRadarPing: True
+		CameraActor: camera

mods/cnc/maps/gdi06/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -1014,206 +1016,8 @@ Actors:
 		Owner: GDI
 		Location: 55,61
 
-Smudges:
+Rules: rules.yaml
 
-Rules:
+Sequences: sequences.yaml
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	World:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		-CrateSpawner:
-		LuaScript:
-			Scripts: gdi06.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			BackgroundMusic: rain-ambient
-			StartingMusic: rain
-		WeatherOverlay:
-			ParticleDensityFactor: 0.0007625
-			ChangingWindLevel: true
-			WindLevels: -5, -3, -2, 0, 2, 3, 5
-			WindTick: 150, 550
-			InstantWindChanges: false
-			UseSquares: false
-			ScatterDirection: 0, 0
-			Gravity: 8.00, 12.00
-			SwingOffset: 0, 0
-			SwingSpeed: 0, 0
-			SwingAmplitude: 0, 0
-			ParticleColors: 304074, 28386C, 202C60, 182C54
-			LineTailAlphaValue: 150
-			ParticleSize: 1, 1
-		GlobalLightingPaletteEffect:
-			Red: 0.75
-			Green: 0.85
-			Blue: 1.5
-			Ambient: 0.35
-		MissionData:
-			Briefing: Use a GDI Commando to infiltrate the Nod base. **** ** destroy the ******** so that the base is incapacitated. Get in, hit it, and get the **** out.
-			BriefingVideo: gdi6.vqa
-			StartVideo: nitejump.vqa
-			WinVideo: sabotage.vqa
-			LossVideo: gdilose.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			Difficulties: Easy, Normal, Hard
-			ShortGameLocked: True
-			ShortGameEnabled: True
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	FLARE:
-		RevealsShroud:
-			Range: 5c0
-	OLDLST:
-		Inherits: LST
-		-WithRoof:
-		-Selectable:
-		RejectsOrders:
-		Cargo:
-			Types: disabled
-	SAM:
-		SpawnActorOnDeath:
-			Actor: e1
-	RMBO:
-		MustBeDestroyed:
-			RequiredForShortGame: true
-		AutoTarget:
-			TargetWhenIdle: false
-			TargetWhenDamaged: true
-		Health:
-			HP: 150
-	RMBO.easy:
-		Inherits: RMBO
-		Health:
-			HP: 300
-		SelfHealing:
-			Ticks: 10
-			HealIfBelow: 50%
-			DamageCooldown: 200
-		RenderSprites:
-			Image: RMBO
-	RMBO.hard:
-		Inherits: RMBO
-		AutoTarget:
-			TargetWhenDamaged: false
-		RenderSprites:
-			Image: RMBO
-	E3.sticky:
-		Inherits: E3
-		AutoTarget:
-			AllowMovement: false
-		RenderSprites:
-			Image: E3
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
 
-Sequences:
+Music: music.yaml
-	oldlst:
-		idle: lst
-			Start: 0
-			Facings: 1
-			ZOffset: -1024
-		icon: lsticnh.tem
-			AddExtension: False
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-	rain-ambient: Rain (ambient)
-		Hidden: true
-
-Notifications:
-
-Translations:

mods/cnc/maps/gdi06/music.yaml

@@ -0,0 +1,2 @@
+rain-ambient: Rain (ambient)
+	Hidden: true

mods/cnc/maps/gdi06/rules.yaml

@@ -0,0 +1,199 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+World:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	-CrateSpawner:
+	LuaScript:
+		Scripts: gdi06.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		BackgroundMusic: rain-ambient
+		StartingMusic: rain
+	WeatherOverlay:
+		ParticleDensityFactor: 0.0007625
+		ChangingWindLevel: true
+		WindLevels: -5, -3, -2, 0, 2, 3, 5
+		WindTick: 150, 550
+		InstantWindChanges: false
+		UseSquares: false
+		ScatterDirection: 0, 0
+		Gravity: 8.00, 12.00
+		SwingOffset: 0, 0
+		SwingSpeed: 0, 0
+		SwingAmplitude: 0, 0
+		ParticleColors: 304074, 28386C, 202C60, 182C54
+		LineTailAlphaValue: 150
+		ParticleSize: 1, 1
+	GlobalLightingPaletteEffect:
+		Red: 0.75
+		Green: 0.85
+		Blue: 1.5
+		Ambient: 0.35
+	MissionData:
+		Briefing: Use a GDI Commando to infiltrate the Nod base. **** ** destroy the ******** so that the base is incapacitated. Get in, hit it, and get the **** out.
+		BriefingVideo: gdi6.vqa
+		StartVideo: nitejump.vqa
+		WinVideo: sabotage.vqa
+		LossVideo: gdilose.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		Difficulties: Easy, Normal, Hard
+		ShortGameLocked: True
+		ShortGameEnabled: True
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+FLARE:
+	RevealsShroud:
+		Range: 5c0
+
+OLDLST:
+	Inherits: LST
+	-WithRoof:
+	-Selectable:
+	RejectsOrders:
+	Cargo:
+		Types: disabled
+
+SAM:
+	SpawnActorOnDeath:
+		Actor: e1
+
+RMBO:
+	MustBeDestroyed:
+		RequiredForShortGame: true
+	AutoTarget:
+		TargetWhenIdle: false
+		TargetWhenDamaged: true
+	Health:
+		HP: 150
+
+RMBO.easy:
+	Inherits: RMBO
+	Health:
+		HP: 300
+	SelfHealing:
+		Ticks: 10
+		HealIfBelow: 50%
+		DamageCooldown: 200
+	RenderSprites:
+		Image: RMBO
+
+RMBO.hard:
+	Inherits: RMBO
+	AutoTarget:
+		TargetWhenDamaged: false
+	RenderSprites:
+		Image: RMBO
+
+E3.sticky:
+	Inherits: E3
+	AutoTarget:
+		AllowMovement: false
+	RenderSprites:
+		Image: E3
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/gdi06/sequences.yaml

@@ -0,0 +1,7 @@
+oldlst: 
+	idle: lst
+		Start: 0
+		Facings: 1
+		ZOffset: -1024
+	icon: lsticnh.tem
+		AddExtension: False

mods/cnc/maps/nod01/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -251,151 +253,4 @@ Actors:
 		Location: 24,17
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		LuaScript:
-			Scripts: nod01.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: nomercy
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: In order for the Brotherhood to gain a foothold, we must begin by eliminating certain elements.\n\nNikoomba, the nearby village's leader, is one such element.\n\nHis views and ours do not coincide.\n\nHe and his whole group must be eliminated.
-			BackgroundVideo: intro2.vqa
-			BriefingVideo: nod1.vqa
-			LossVideo: nodlose.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	C10:
-		Tooltip:
-			Name: Nikoomba
-	^Bridge:
-		DamageMultiplier@INVULNERABLE:
-			Modifier: 0
-	^CivBuilding:
-		MustBeDestroyed:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivInfantry:
-		MustBeDestroyed:
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod01/rules.yaml

@@ -0,0 +1,151 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	LuaScript:
+		Scripts: nod01.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: nomercy
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: In order for the Brotherhood to gain a foothold, we must begin by eliminating certain elements.\n\nNikoomba, the nearby village's leader, is one such element.\n\nHis views and ours do not coincide.\n\nHe and his whole group must be eliminated.
+		BackgroundVideo: intro2.vqa
+		BriefingVideo: nod1.vqa
+		LossVideo: nodlose.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+C10:
+	Tooltip:
+		Name: Nikoomba
+
+^Bridge:
+	DamageMultiplier@INVULNERABLE:
+		Modifier: 0
+
+^CivBuilding:
+	MustBeDestroyed:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivInfantry:
+	MustBeDestroyed:
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/nod02a/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@GDI:
 		Name: GDI
@@ -192,216 +194,4 @@ Actors:
 		Location: 56,38
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 4000
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		LuaScript:
-			Scripts: nod02a.lua
-		MusicPlaylist:
-			StartingMusic: ind2
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: GDI has kept a stranglehold on Egypt for many years.  Set up a forward attack base in your area.  To do this you must select your Mobile Construction Vehicle (MCV) and right click on it.  From here you can begin to build a base. This area contains plenty of Tiberium, so establishing the base should be easy.
-			BriefingVideo: nod2.vqa
-			StartVideo: seige.vqa
-			WinVideo: airstrk.vqa
-			LossVideo: deskill.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	CYCL:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	FTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	STNK:
-		Buildable:
-			Prerequisites: ~disabled
-	ARTY:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	MLRS:
-		Buildable:
-			Prerequisites: ~disabled
-	MCV:
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	LST:
-		Buildable:
-			Prerequisites: ~disabled
-	C17:
-		Buildable:
-			Prerequisites: ~disabled
-	SAM:
-		Buildable:
-			Prerequisites: ~disabled
-	HQ:
-		Buildable:
-			Prerequisites: ~disabled
-	AFLD:
-		Buildable:
-			Prerequisites: ~disabled
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	E3:
-		Buildable:
-			Prerequisites: ~disabled
-	E2:
-		Buildable:
-			Prerequisites: ~disabled
-	SBAG:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod02a/rules.yaml

@@ -0,0 +1,238 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 4000
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	LuaScript:
+		Scripts: nod02a.lua
+	MusicPlaylist:
+		StartingMusic: ind2
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: GDI has kept a stranglehold on Egypt for many years.  Set up a forward attack base in your area.  To do this you must select your Mobile Construction Vehicle (MCV) and right click on it.  From here you can begin to build a base. This area contains plenty of Tiberium, so establishing the base should be easy.
+		BriefingVideo: nod2.vqa
+		StartVideo: seige.vqa
+		WinVideo: airstrk.vqa
+		LossVideo: deskill.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+CYCL:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+FTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+STNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+ARTY:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+MLRS:
+	Buildable:
+		Prerequisites: ~disabled
+
+MCV:
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+LST:
+	Buildable:
+		Prerequisites: ~disabled
+
+C17:
+	Buildable:
+		Prerequisites: ~disabled
+
+SAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+HQ:
+	Buildable:
+		Prerequisites: ~disabled
+
+AFLD:
+	Buildable:
+		Prerequisites: ~disabled
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+E3:
+	Buildable:
+		Prerequisites: ~disabled
+
+E2:
+	Buildable:
+		Prerequisites: ~disabled
+
+SBAG:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled

mods/cnc/maps/nod02b/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@GDI:
 		Name: GDI
@@ -234,216 +236,4 @@ Actors:
 		Location: 30,44
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 4000
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		LuaScript:
-			Scripts: nod02b.lua
-		MusicPlaylist:
-			StartingMusic: ind2
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: GDI has kept a stranglehold on Egypt for many years.  Set up a forward attack base in your area.  To do this you must select your Mobile Construction Vehicle (MCV) and right click on it.  From here you can begin to build a base. This area contains plenty of Tiberium, so establishing the base should be easy.
-			BriefingVideo: nod2.vqa
-			StartVideo: seige.vqa
-			WinVideo: airstrk.vqa
-			LossVideo: deskill.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	CYCL:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	FTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	STNK:
-		Buildable:
-			Prerequisites: ~disabled
-	ARTY:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	MLRS:
-		Buildable:
-			Prerequisites: ~disabled
-	MCV:
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	LST:
-		Buildable:
-			Prerequisites: ~disabled
-	C17:
-		Buildable:
-			Prerequisites: ~disabled
-	SAM:
-		Buildable:
-			Prerequisites: ~disabled
-	HQ:
-		Buildable:
-			Prerequisites: ~disabled
-	AFLD:
-		Buildable:
-			Prerequisites: ~disabled
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	E3:
-		Buildable:
-			Prerequisites: ~disabled
-	E2:
-		Buildable:
-			Prerequisites: ~disabled
-	SBAG:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod02b/rules.yaml

@@ -0,0 +1,238 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 4000
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	LuaScript:
+		Scripts: nod02b.lua
+	MusicPlaylist:
+		StartingMusic: ind2
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: GDI has kept a stranglehold on Egypt for many years.  Set up a forward attack base in your area.  To do this you must select your Mobile Construction Vehicle (MCV) and right click on it.  From here you can begin to build a base. This area contains plenty of Tiberium, so establishing the base should be easy.
+		BriefingVideo: nod2.vqa
+		StartVideo: seige.vqa
+		WinVideo: airstrk.vqa
+		LossVideo: deskill.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+CYCL:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+FTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+STNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+ARTY:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+MLRS:
+	Buildable:
+		Prerequisites: ~disabled
+
+MCV:
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+LST:
+	Buildable:
+		Prerequisites: ~disabled
+
+C17:
+	Buildable:
+		Prerequisites: ~disabled
+
+SAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+HQ:
+	Buildable:
+		Prerequisites: ~disabled
+
+AFLD:
+	Buildable:
+		Prerequisites: ~disabled
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+E3:
+	Buildable:
+		Prerequisites: ~disabled
+
+E2:
+	Buildable:
+		Prerequisites: ~disabled
+
+SBAG:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/nod03a/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -428,199 +430,4 @@ Actors:
 		Location: 32,47
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 4000
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		LuaScript:
-			Scripts: nod03a.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: chrg226m
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it.
-			BriefingVideo: nod3.vqa
-			StartVideo: dessweep.vqa
-			WinVideo: desflees.vqa
-			LossVideo: flag.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	HQ:
-		AirstrikePower:
-			Prerequisites: ~disabled
-		Tooltip:
-			Description: Provides an overview of the battlefield.\nRequires power to operate.
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	AFLD:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	SAM:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	MISS:
-		Tooltip:
-			Name: Prison
-		Capturable:
-			CaptureThreshold: 1
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod03a/rules.yaml

@@ -0,0 +1,214 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 4000
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	LuaScript:
+		Scripts: nod03a.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: chrg226m
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it.
+		BriefingVideo: nod3.vqa
+		StartVideo: dessweep.vqa
+		WinVideo: desflees.vqa
+		LossVideo: flag.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+HQ:
+	AirstrikePower:
+		Prerequisites: ~disabled
+	Tooltip:
+		Description: Provides an overview of the battlefield.\nRequires power to operate.
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+AFLD:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+SAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+MISS:
+	Tooltip:
+		Name: Prison
+	Capturable:
+		CaptureThreshold: 1
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/nod03b/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -472,199 +474,4 @@ Actors:
 		Location: 23,20
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 4000
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		LuaScript:
-			Scripts: nod03b.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: chrg226m
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it.
-			BriefingVideo: nod3.vqa
-			StartVideo: dessweep.vqa
-			WinVideo: desflees.vqa
-			LossVideo: flag.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	HQ:
-		AirstrikePower:
-			Prerequisites: ~disabled
-		Tooltip:
-			Description: Provides an overview of the battlefield.\nRequires power to operate.
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	AFLD:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	SAM:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	MISS:
-		Tooltip:
-			Name: Prison
-		Capturable:
-			CaptureThreshold: 1
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod03b/rules.yaml

@@ -0,0 +1,214 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 4000
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	LuaScript:
+		Scripts: nod03b.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: chrg226m
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it.
+		BriefingVideo: nod3.vqa
+		StartVideo: dessweep.vqa
+		WinVideo: desflees.vqa
+		LossVideo: flag.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+HQ:
+	AirstrikePower:
+		Prerequisites: ~disabled
+	Tooltip:
+		Description: Provides an overview of the battlefield.\nRequires power to operate.
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+AFLD:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+SAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+MISS:
+	Tooltip:
+		Name: Prison
+	Capturable:
+		CaptureThreshold: 1
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/nod04a/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -532,222 +534,4 @@ Actors:
 		Facing: 160
 		SubCell: 2
 
-Smudges:
+Rules: rules.yaml
-	sc6 37,24 0:
-	sc6 36,18 0:
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		EnemyWatcher:
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		LuaScript:
-			Scripts: nod04a.lua
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		MusicPlaylist:
-			StartingMusic: valkyrie
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: A small village friendly to our cause has been increasingly harassed by GDI, and the Brotherhood wishes you to assist them in their efforts.\n\nSeek out the enemy village and destroy it. The event will be disguised as a GDI attack.
-			BriefingVideo: nod4b.vqa
-			StartVideo: retro.vqa
-			LossVideo: deskill.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	CYCL:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	FTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	STNK:
-		Buildable:
-			Prerequisites: ~disabled
-	ARTY:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	MLRS:
-		Buildable:
-			Prerequisites: ~disabled
-	MCV:
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	LST:
-		Buildable:
-			Prerequisites: ~disabled
-	C17:
-		Buildable:
-			Prerequisites: ~disabled
-	SAM:
-		Buildable:
-			Prerequisites: ~disabled
-	AFLD:
-		Buildable:
-			Prerequisites: ~disabled
-	E4:
-		Buildable:
-			Prerequisites: ~disabled
-	SBAG:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod04a/rules.yaml

@@ -0,0 +1,245 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	EnemyWatcher:
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	LuaScript:
+		Scripts: nod04a.lua
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	MusicPlaylist:
+		StartingMusic: valkyrie
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: A small village friendly to our cause has been increasingly harassed by GDI, and the Brotherhood wishes you to assist them in their efforts.\n\nSeek out the enemy village and destroy it. The event will be disguised as a GDI attack.
+		BriefingVideo: nod4b.vqa
+		StartVideo: retro.vqa
+		LossVideo: deskill.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+	SmudgeLayer@SCORCH:
+		InitialSmudges:
+			37,24: sc6,0
+			36,18: sc6,0
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+CYCL:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+FTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+STNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+ARTY:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+MLRS:
+	Buildable:
+		Prerequisites: ~disabled
+
+MCV:
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+LST:
+	Buildable:
+		Prerequisites: ~disabled
+
+C17:
+	Buildable:
+		Prerequisites: ~disabled
+
+SAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+AFLD:
+	Buildable:
+		Prerequisites: ~disabled
+
+E4:
+	Buildable:
+		Prerequisites: ~disabled
+
+SBAG:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/nod04b/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@GDI:
 		Name: GDI
@@ -474,139 +476,4 @@ Actors:
 		Location: 32,22
 		Owner: Neutral
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		EnemyWatcher:
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		LuaScript:
-			Scripts: nod04b.lua
-		MusicPlaylist:
-			StartingMusic: warfare
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: A small village friendly to our cause has been increasingly harassed by GDI, and the Brotherhood wishes you to assist them in their efforts.\n\nSeek out the enemy village and destroy it. The event will be disguised as a GDI attack.
-			BriefingVideo: nod4b.vqa
-			LossVideo: nodlose.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	TRAN:
-		RejectsOrders:
-		-Selectable:
-		RevealsShroud:
-			Range: 5c0
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod04b/rules.yaml

@@ -0,0 +1,135 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	EnemyWatcher:
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	LuaScript:
+		Scripts: nod04b.lua
+	MusicPlaylist:
+		StartingMusic: warfare
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: A small village friendly to our cause has been increasingly harassed by GDI, and the Brotherhood wishes you to assist them in their efforts.\n\nSeek out the enemy village and destroy it. The event will be disguised as a GDI attack.
+		BriefingVideo: nod4b.vqa
+		LossVideo: nodlose.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+TRAN:
+	RejectsOrders:
+	-Selectable:
+	RevealsShroud:
+		Range: 5c0
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/nod05/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@GDI:
 		Name: GDI
@@ -371,228 +373,4 @@ Actors:
 		Location: 26,13
 		Owner: GDI
 
-Smudges:
+Rules: rules.yaml
-	cr1 46,48 0:
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 5000
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		LuaScript:
-			Scripts: nod05.lua
-		MusicPlaylist:
-			StartingMusic: airstrik
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: Our brothers within GDI tell us of A-10 strike jets scheduled to be deployed here soon. Our suppliers have delivered new Surface to Air Missiles to aid you. Use the SAMs to defend your base, then seek out their base and destroy it.
-			BackgroundVideo: sethpre.vqa
-			BriefingVideo: nod5.vqa
-			StartVideo: samsite.vqa
-			WinVideo: insites.vqa
-			LossVideo: flag.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^Wall:
-		Tooltip:
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy, Ally, Neutral
-			GenericStancePrefix: false
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	NUK2:
-		Buildable:
-			Prerequisites: ~disabled
-	GUN:
-		Buildable:
-			Prerequisites: ~disabled
-	CYCL:
-		Buildable:
-			Prerequisites: ~disabled
-	FIX:
-		Buildable:
-			Prerequisites: ~disabled
-	HPAD:
-		Buildable:
-			Prerequisites: ~disabled
-	OBLI:
-		Buildable:
-			Prerequisites: ~disabled
-	BRIK:
-		Buildable:
-			Prerequisites: ~disabled
-	TMPL:
-		Buildable:
-			Prerequisites: ~disabled
-	E5:
-		Buildable:
-			Prerequisites: ~disabled
-	RMBO:
-		Buildable:
-			Prerequisites: ~disabled
-	MLRS:
-		Buildable:
-			Prerequisites: ~disabled
-	MCV:
-		Buildable:
-			Prerequisites: ~disabled
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	LST:
-		Buildable:
-			Prerequisites: ~disabled
-	C17:
-		Buildable:
-			Prerequisites: ~disabled
-	GTWR:
-		Buildable:
-			Prerequisites: ~disabled
-	WEAP:
-		Buildable:
-			Prerequisites: ~disabled
-	EYE:
-		Buildable:
-			Prerequisites: ~disabled
-	ATWR:
-		Buildable:
-			Prerequisites: ~disabled
-	HARV:
-		Buildable:
-			Prerequisites: ~disabled
-		Harvester:
-			SearchFromOrderRadius: 24
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	FTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	STNK:
-		Buildable:
-			Prerequisites: ~disabled
-	ARTY:
-		Buildable:
-			Prerequisites: ~disabled
-	MTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	HTNK:
-		Buildable:
-			Prerequisites: ~disabled
-	ORCA:
-		Buildable:
-			Prerequisites: ~disabled
-	MSAM:
-		Buildable:
-			Prerequisites: ~disabled
-	SBAG:
-		Buildable:
-			Queue: Defence.GDI, Defence.Nod
-	HQ:
-		AirstrikePower:
-			Prerequisites: gdi
-			SquadSize: 1
-	A10:
-		Targetable:
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod05/rules.yaml

@@ -0,0 +1,253 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 5000
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	LuaScript:
+		Scripts: nod05.lua
+	MusicPlaylist:
+		StartingMusic: airstrik
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: Our brothers within GDI tell us of A-10 strike jets scheduled to be deployed here soon. Our suppliers have delivered new Surface to Air Missiles to aid you. Use the SAMs to defend your base, then seek out their base and destroy it.
+		BackgroundVideo: sethpre.vqa
+		BriefingVideo: nod5.vqa
+		StartVideo: samsite.vqa
+		WinVideo: insites.vqa
+		LossVideo: flag.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+	SmudgeLayer@CRATER:
+		InitialSmudges:
+			46,48: cr1,0
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^Wall:
+	Tooltip:
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy, Ally, Neutral
+		GenericStancePrefix: false
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+NUK2:
+	Buildable:
+		Prerequisites: ~disabled
+
+GUN:
+	Buildable:
+		Prerequisites: ~disabled
+
+CYCL:
+	Buildable:
+		Prerequisites: ~disabled
+
+FIX:
+	Buildable:
+		Prerequisites: ~disabled
+
+HPAD:
+	Buildable:
+		Prerequisites: ~disabled
+
+OBLI:
+	Buildable:
+		Prerequisites: ~disabled
+
+BRIK:
+	Buildable:
+		Prerequisites: ~disabled
+
+TMPL:
+	Buildable:
+		Prerequisites: ~disabled
+
+E5:
+	Buildable:
+		Prerequisites: ~disabled
+
+RMBO:
+	Buildable:
+		Prerequisites: ~disabled
+
+MLRS:
+	Buildable:
+		Prerequisites: ~disabled
+
+MCV:
+	Buildable:
+		Prerequisites: ~disabled
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+LST:
+	Buildable:
+		Prerequisites: ~disabled
+
+C17:
+	Buildable:
+		Prerequisites: ~disabled
+
+GTWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+WEAP:
+	Buildable:
+		Prerequisites: ~disabled
+
+EYE:
+	Buildable:
+		Prerequisites: ~disabled
+
+ATWR:
+	Buildable:
+		Prerequisites: ~disabled
+
+HARV:
+	Buildable:
+		Prerequisites: ~disabled
+	Harvester:
+		SearchFromOrderRadius: 24
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+FTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+STNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+ARTY:
+	Buildable:
+		Prerequisites: ~disabled
+
+MTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+HTNK:
+	Buildable:
+		Prerequisites: ~disabled
+
+ORCA:
+	Buildable:
+		Prerequisites: ~disabled
+
+MSAM:
+	Buildable:
+		Prerequisites: ~disabled
+
+SBAG:
+	Buildable:
+		Queue: Defence.GDI, Defence.Nod
+
+HQ:
+	AirstrikePower:
+		Prerequisites: gdi
+		SquadSize: 1
+
+A10:
+	Targetable:

mods/cnc/maps/nod06a/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -641,145 +643,4 @@ Actors:
 		Location: 57,32
 		Owner: GDI
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		EnemyWatcher:
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		LuaScript:
-			Scripts: nod06a.lua
-		MusicPlaylist:
-			StartingMusic: rout
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: GDI has imported a Nuclear Detonator in an attempt to sway a few local political leaders. Penetrate the base and steal the detonator. A chopper will be sent to meet you at a designated landing zone. Look for the landing flare once you have stolen the device.
-			BriefingVideo: nod6.vqa
-			StartVideo: sundial.vqa
-			LossVideo: banner.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		AnnounceOnSeen:
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	HARV:
-		Harvester:
-			SearchFromProcRadius: 64
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	FLARE:
-		Tooltip:
-			ShowOwnerRow: false
-	TRAN:
-		-Selectable:
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod06a/rules.yaml

@@ -0,0 +1,143 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	EnemyWatcher:
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	LuaScript:
+		Scripts: nod06a.lua
+	MusicPlaylist:
+		StartingMusic: rout
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: GDI has imported a Nuclear Detonator in an attempt to sway a few local political leaders. Penetrate the base and steal the detonator. A chopper will be sent to meet you at a designated landing zone. Look for the landing flare once you have stolen the device.
+		BriefingVideo: nod6.vqa
+		StartVideo: sundial.vqa
+		LossVideo: banner.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	AnnounceOnSeen:
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+HARV:
+	Harvester:
+		SearchFromProcRadius: 64
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+FLARE:
+	Tooltip:
+		ShowOwnerRow: false
+
+TRAN:
+	-Selectable:
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player

mods/cnc/maps/nod06b/map.yaml

@@ -1,4 +1,4 @@
-MapFormat: 9
+MapFormat: 10
 
 RequiresMod: cnc
 
@@ -16,6 +16,8 @@ Visibility: MissionSelector
 
 Type: Campaign
 
+LockPreview: True
+
 Players:
 	PlayerReference@GDI:
 		Name: GDI
@@ -584,143 +586,4 @@ Actors:
 		Owner: GDI
 		SubCell: 1
 
-Smudges:
+Rules: rules.yaml
-
-Rules:
-	^Palettes:
-		-PlayerColorPalette:
-		IndexedPlayerPalette:
-			BasePalette: terrain
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-		IndexedPlayerPalette@units:
-			BasePalette: terrain
-			BaseName: player-units
-			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-			PlayerIndex:
-				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
-				Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
-				Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-				Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
-	Player:
-		-ConquestVictoryConditions:
-		MissionObjectives:
-			EarlyGameOver: true
-		Shroud:
-			FogLocked: True
-			FogEnabled: True
-			ExploredMapLocked: True
-			ExploredMapEnabled: False
-		PlayerResources:
-			DefaultCashLocked: True
-			DefaultCash: 0
-	World:
-		-CrateSpawner:
-		-SpawnMPUnits:
-		-MPStartLocations:
-		ObjectivesPanel:
-			PanelName: MISSION_OBJECTIVES
-		LuaScript:
-			Scripts: nod06b.lua
-		MusicPlaylist:
-			StartingMusic: rout
-			VictoryMusic: nod_win1
-		MissionData:
-			Briefing: GDI has imported a Nuclear Detonator in an attempt to sway a few local political leaders. Penetrate the base and steal the detonator. A chopper will be sent to meet you at a designated landing zone. Look for the landing flare once you have stolen the device.
-			BriefingVideo: nod6.vqa
-			StartVideo: sundial.vqa
-			LossVideo: banner.vqa
-		MapCreeps:
-			Locked: True
-			Enabled: False
-		MapBuildRadius:
-			AllyBuildRadiusLocked: True
-			AllyBuildRadiusEnabled: False
-		MapOptions:
-			ShortGameLocked: True
-			ShortGameEnabled: False
-	^Vehicle:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Tank:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Infantry:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Helicopter:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^Plane:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Ship:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-	^Building:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CivBuilding:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	^CommonHuskDefaults:
-		Tooltip:
-			GenericVisibility: Enemy
-			ShowOwnerRow: false
-		RenderSprites:
-			PlayerPalette: player-units
-	^CivBuildingHusk:
-		Tooltip:
-			GenericVisibility: Enemy, Neutral
-			ShowOwnerRow: false
-	FLARE:
-		Tooltip:
-			ShowOwnerRow: false
-	TRAN:
-		-Selectable:
-	HARV:
-		RenderSprites:
-			PlayerPalette: player
-	MCV:
-		RenderSprites:
-			PlayerPalette: player
-	HARV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-	MCV.Husk:
-		RenderSprites:
-			PlayerPalette: player
-
-Sequences:
-
-VoxelSequences:
-
-Weapons:
-
-Voices:
-
-Music:
-
-Notifications:
-
-Translations:

mods/cnc/maps/nod06b/rules.yaml

@@ -0,0 +1,141 @@
+^Palettes:
+	-PlayerColorPalette:
+	IndexedPlayerPalette:
+		BasePalette: terrain
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@units:
+		BasePalette: terrain
+		BaseName: player-units
+		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+		PlayerIndex:
+			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
+			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+			Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+
+Player:
+	-ConquestVictoryConditions:
+	MissionObjectives:
+		EarlyGameOver: true
+	Shroud:
+		FogLocked: True
+		FogEnabled: True
+		ExploredMapLocked: True
+		ExploredMapEnabled: False
+	PlayerResources:
+		DefaultCashLocked: True
+		DefaultCash: 0
+
+World:
+	-CrateSpawner:
+	-SpawnMPUnits:
+	-MPStartLocations:
+	ObjectivesPanel:
+		PanelName: MISSION_OBJECTIVES
+	LuaScript:
+		Scripts: nod06b.lua
+	MusicPlaylist:
+		StartingMusic: rout
+		VictoryMusic: nod_win1
+	MissionData:
+		Briefing: GDI has imported a Nuclear Detonator in an attempt to sway a few local political leaders. Penetrate the base and steal the detonator. A chopper will be sent to meet you at a designated landing zone. Look for the landing flare once you have stolen the device.
+		BriefingVideo: nod6.vqa
+		StartVideo: sundial.vqa
+		LossVideo: banner.vqa
+	MapCreeps:
+		Locked: True
+		Enabled: False
+	MapBuildRadius:
+		AllyBuildRadiusLocked: True
+		AllyBuildRadiusEnabled: False
+	MapOptions:
+		ShortGameLocked: True
+		ShortGameEnabled: False
+
+^Vehicle:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Tank:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Infantry:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Helicopter:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^Plane:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Ship:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+
+^Building:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CivBuilding:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+^CommonHuskDefaults:
+	Tooltip:
+		GenericVisibility: Enemy
+		ShowOwnerRow: false
+	RenderSprites:
+		PlayerPalette: player-units
+
+^CivBuildingHusk:
+	Tooltip:
+		GenericVisibility: Enemy, Neutral
+		ShowOwnerRow: false
+
+FLARE:
+	Tooltip:
+		ShowOwnerRow: false
+
+TRAN:
+	-Selectable:
+
+HARV:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV:
+	RenderSprites:
+		PlayerPalette: player
+
+HARV.Husk:
+	RenderSprites:
+		PlayerPalette: player
+
+MCV.Husk:
+	RenderSprites:
+		PlayerPalette: player