change map format to remove redundant crap

OpenRA.FileFormats/Map/ActorReference.cs

@@ -12,13 +12,14 @@ namespace OpenRA.FileFormats
 {
 	public class ActorReference
 	{
-		public readonly string Id;
+		public string Id { get; private set; }
 		public readonly string Type;
 		public readonly int2 Location;
 		public readonly string Owner;
 		
-		public ActorReference(MiniYaml my)
+		public ActorReference( string id, MiniYaml my)
 		{
+			Id = id;
 			FieldLoader.Load(this, my);
 		}
 		

OpenRA.FileFormats/Map/Map.cs

@@ -132,7 +132,7 @@ namespace OpenRA.FileFormats
 			{
 				foreach (var kv in yaml["Actors"].Nodes)
 				{
-					var a = new ActorReference(kv.Value);
+					var a = new ActorReference(kv.Key, kv.Value);
 					Actors.Add(a.Id, a);
 				}
 			}
@@ -172,7 +172,7 @@ namespace OpenRA.FileFormats
 
 			root.Add("Actors",
 				new MiniYaml(null, Actors.ToDictionary(
-					a => "ActorReference@{0}".F(a.Key),
+					a => "{0}".F(a.Key),
 					a => FieldSaver.Save(a.Value))));
 			
 			root.Add("Waypoints", MiniYaml.FromDictionary<string, int2>(Waypoints));

mods/ra/maps/map/map.yaml

@@ -27,83 +27,67 @@ Players:
 		NonCombatant: True
 
 Actors:
-	ActorReference@Actor0:
+	Actor0:
-		Id: Actor0
 		Type: mine
 		Location: 23,107
 		Owner: Neutral
-	ActorReference@Actor1:
+	Actor1:
-		Id: Actor1
 		Type: mine
 		Location: 20,105
 		Owner: Neutral
-	ActorReference@Actor4:
+	Actor4:
-		Id: Actor4
 		Type: mine
 		Location: 23,20
 		Owner: Neutral
-	ActorReference@Actor3:
+	Actor3:
-		Id: Actor3
 		Type: mine
 		Location: 20,23
 		Owner: Neutral
-	ActorReference@Actor5:
+	Actor5:
-		Id: Actor5
 		Type: mine
 		Location: 104,19
 		Owner: Neutral
-	ActorReference@Actor6:
+	Actor6:
-		Id: Actor6
 		Type: mine
 		Location: 108,22
 		Owner: Neutral
-	ActorReference@Actor7:
+	Actor7:
-		Id: Actor7
 		Type: mine
 		Location: 105,108
 		Owner: Neutral
-	ActorReference@Actor8:
+	Actor8:
-		Id: Actor8
 		Type: mine
 		Location: 108,105
 		Owner: Neutral
-	ActorReference@Actor2:
+	Actor2:
-		Id: Actor2
 		Type: mine
 		Location: 71,109
 		Owner: Neutral
-	ActorReference@Actor9:
+	Actor9:
-		Id: Actor9
 		Type: mine
 		Location: 75,109
 		Owner: Neutral
-	ActorReference@Actor10:
+	Actor10:
-		Id: Actor10
 		Type: mine
 		Location: 109,47
 		Owner: Neutral
-	ActorReference@Actor11:
+	Actor11:
-		Id: Actor11
 		Type: mine
 		Location: 109,44
 		Owner: Neutral
-	ActorReference@Actor12:
+	Actor12:
-		Id: Actor12
 		Type: mine
 		Location: 53,18
 		Owner: Neutral
-	ActorReference@Actor13:
+	Actor13:
-		Id: Actor13
 		Type: mine
 		Location: 49,18
 		Owner: Neutral
-	ActorReference@Actor14:
+	Actor14:
-		Id: Actor14
 		Type: mine
 		Location: 18,80
 		Owner: Neutral
-	ActorReference@Actor15:
+	Actor15:
-		Id: Actor15
 		Type: mine
 		Location: 18,75
 		Owner: Neutral