Merge pull request #3777 from Mailaender/map-yaml

Removed sequences/map.yaml everywhere

OpenRA.FileFormats/Exts.cs

@@ -201,12 +201,11 @@ namespace OpenRA
 				d.Add(key, element);
 			}
 
-			// If any duplicates were found, log it and throw a descriptive error
+			// If any duplicates were found, throw a descriptive error
 			if (dupKeys.Count > 0)
 			{
 				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value.ToArray()))).ToArray());
 				var msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
-				Log.Write("debug", msg);
 				throw new ArgumentException(msg);
 			}
 

mods/cnc/mod.yaml

@@ -48,7 +48,7 @@ Sequences:
 	mods/cnc/sequences/vehicles.yaml
 	mods/cnc/sequences/infantry.yaml
 	mods/cnc/sequences/aircraft.yaml
-	mods/cnc/sequences/map.yaml
+	mods/cnc/sequences/decorations.yaml
 	mods/cnc/sequences/misc.yaml
 	mods/cnc/sequences/funpark.yaml
 	mods/cnc/sequences/civilian.yaml

mods/cnc/sequences/decorations.yaml

@@ -692,51 +692,4 @@ arco:
 
 arco.husk:
 	idle: arco
-		Start: 1
-
-hosp:
-	idle:
-		Start: 0
-		Length: 4
-		Tick: 100
-	damaged-idle:
-		Start: 4
-		Length: 4
-	make: hospmake
-		Start: 0
-		Length: *
-		Tick: 80
-
-hosp.husk:
-	idle: hosp
-		Start: 8
-
-bio:
-	idle:
-		Start: 0
-	damaged-idle:
-		Start: 1
-	make: biomake
-		Start: 0
-		Length: *
-		Tick: 80
-
-bio.husk:
-	idle: bio
-		Start: 2
-
-miss:
-	idle:
-		Start: 0
-	damaged-idle:
-		Start: 1
-	make: missmake
-		Start: 0
-		Length: *
-		Tick: 80
-	icon: missicnh
-		Start: 0
-
-miss.husk:
-	idle: miss
-		Start: 2
+		Start: 1

mods/cnc/sequences/structures.yaml

@@ -503,4 +503,51 @@ atwr:
 		Start: 0
 		Length: *
 	icon: atwricnh
-		Start: 0
+		Start: 0
+
+hosp:
+	idle:
+		Start: 0
+		Length: 4
+		Tick: 100
+	damaged-idle:
+		Start: 4
+		Length: 4
+	make: hospmake
+		Start: 0
+		Length: *
+		Tick: 80
+
+hosp.husk:
+	idle: hosp
+		Start: 8
+
+bio:
+	idle:
+		Start: 0
+	damaged-idle:
+		Start: 1
+	make: biomake
+		Start: 0
+		Length: *
+		Tick: 80
+
+bio.husk:
+	idle: bio
+		Start: 2
+
+miss:
+	idle:
+		Start: 0
+	damaged-idle:
+		Start: 1
+	make: missmake
+		Start: 0
+		Length: *
+		Tick: 80
+	icon: missicnh
+		Start: 0
+
+miss.husk:
+	idle: miss
+		Start: 2

mods/d2k/mod.yaml

@@ -34,7 +34,6 @@ Sequences:
 	mods/d2k/sequences/infantry.yaml
 	mods/d2k/sequences/structures.yaml
 	mods/d2k/sequences/misc.yaml
-	mods/d2k/sequences/map.yaml
 
 Cursors:
 	mods/d2k/cursors.yaml

mods/d2k/sequences/misc.yaml

@@ -273,3 +273,28 @@ icon:
 	deathhand: DATA.R8
 		Start: 4035
 		Offset: -30,-24
+
+crate:
+	idle: DATA.R8
+		Start: 102
+		ZOffset: -511
+		Offset: -16,-16
+	land: DATA.R8
+		Start: 102
+		ZOffset: -511
+		Offset: -16,-16
+
+spicebloom:
+	make: DATA.R8
+		Start: 107
+		Length: 3
+		Offset: -16,-16
+	active: DATA.R8
+		Start: 109
+		Length: 1
+		ZOffset: -511
+		Offset: -16,-16
+	idle: DATA.R8
+		Start: 109
+		ZOffset: -511
+		Offset: -16,-16

mods/ra/mod.yaml

@@ -47,7 +47,7 @@ Sequences:
 	mods/ra/sequences/infantry.yaml
 	mods/ra/sequences/aircraft.yaml
 	mods/ra/sequences/misc.yaml
-	mods/ra/sequences/map.yaml
+	mods/ra/sequences/decorations.yaml
 
 Cursors:
 	mods/ra/cursors.yaml

mods/ra/sequences/decorations.yaml

@@ -361,24 +361,57 @@ v19:
 		Start: 14
 		Length: 15
 
-barl:
+utilpol1:
 	idle:
 		Start: 0
-		Length: *
+	damaged-idle:
+		Start: 1
+	dead:
+		Start: 1
 
-brl3:
+utilpol2:
 	idle:
 		Start: 0
-		Length: *
+	damaged-idle:
+		Start: 1
+	dead:
+		Start: 1
 
-minp:
+ammobox1:
+	idle:
+		Start: 0
+		Length: 1
+
+ammobox2:
+	idle:
+		Start: 0
+		Length: 1
+
+ammobox3:
+	idle:
+		Start: 0
+		Length: 1
+
+tanktrap1:
 	idle:
 		Start: 0
 
-minv:
+tanktrap2:
 	idle:
 		Start: 0
 
+rushouse:
+	idle:
+		Start: 0
+	damaged-idle:
+		Start: 1
+
+asianhut:
+	idle:
+		Start: 0
+	damaged-idle:
+		Start: 1
+
 barb:
 	idle:
 		Start: 0
@@ -395,68 +428,63 @@ wood:
 		Start: 16
 		Length: 16
 
+barl:
+	idle:
+		Start: 0
+		Length: *
+
+brl3:
+	idle:
+		Start: 0
+		Length: *
+
+# Interior Terrain
 boxes01:
 	idle:
 		Start: 0
 		Length: *
+
 boxes02:
 	idle:
 		Start: 0
 		Length: *
+
 boxes03:
 	idle:
 		Start: 0
 		Length: *
+
 boxes04:
 	idle:
 		Start: 0
 		Length: *
+
 boxes05:
 	idle:
 		Start: 0
 		Length: *
+
 boxes06:
 	idle:
 		Start: 0
 		Length: *
+
 boxes07:
 	idle:
 		Start: 0
 		Length: *
+
 boxes08:
 	idle:
 		Start: 0
 		Length: *
+
 boxes09:
 	idle:
 		Start: 0
 		Length: *
 
-overlay:
-	build-valid-desert:
-		Start: 0
-	build-valid-interior:
-		Start: 0
-	build-valid-snow:
-		Start: 2
-	build-valid-temperat:
-		Start: 0
-	build-invalid:
-		Start: 1
-	target-select:
-		Start: 2
-	target-valid-desert:
-		Start: 0
-	target-valid-interior:
-		Start: 0
-	target-valid-snow:
-		Start: 2
-	target-valid-temperat:
-		Start: 0
-	target-invalid:
-		Start: 1
-
-#Desert Terrain Expansion 
+#Desert Terrain Expansion
 rock1:
 	idle:
 		Start: 0
@@ -617,75 +645,4 @@ v37:
 	idle:
 		Start: 0
 	damaged-idle:
-		Start: 1
-
-utilpol1:
-	idle:
-		Start: 0
-	damaged-idle:
-		Start: 1
-	dead:
-		Start: 1
-
-utilpol2:
-	idle:
-		Start: 0
-	damaged-idle:
-		Start: 1
-	dead:
-		Start: 1
-
-ammobox1:
-	idle:
-		Start: 0
-		Length: 1
-
-ammobox2:
-	idle:
-		Start: 0
-		Length: 1
-
-
-ammobox3:
-	idle:
-		Start: 0
-		Length: 1
-
-
-tanktrap1:
-	idle:
-		Start: 0
-
-tanktrap2:
-	idle:
-		Start: 0
-
-rushouse:
-	idle:
-		Start: 0
-	damaged-idle:
-		Start: 1
-
-asianhut:
-	idle:
-		Start: 0
-	damaged-idle:
-		Start: 1
-
-quee:
-	idle:
-		Start: 0
-		Length: 10
-	damaged-idle:
-		Start: 10
-		Length: 10
-
-lar1:
-	idle:
-		Start: 0
-		Length: *
-
-lar2:
-	idle:
-		Start: 0
-		Length: *
+		Start: 1

mods/ra/sequences/misc.yaml

@@ -415,10 +415,56 @@ icon:
 	sonar: sonricon
 		Start: 0
 
+quee:
+	idle:
+		Start: 0
+		Length: 10
+	damaged-idle:
+		Start: 10
+		Length: 10
+
+lar1:
+	idle:
+		Start: 0
+		Length: *
+
+lar2:
+	idle:
+		Start: 0
+		Length: *
+
 minp:
+	idle:
+		Start: 0
 	icon: jmin
 		Start: 0
 
 minv:
+	idle:
+		Start: 0
 	icon: jmin
-		Start: 0
+		Start: 0
+
+overlay:
+	build-valid-desert:
+		Start: 0
+	build-valid-interior:
+		Start: 0
+	build-valid-snow:
+		Start: 2
+	build-valid-temperat:
+		Start: 0
+	build-invalid:
+		Start: 1
+	target-select:
+		Start: 2
+	target-valid-desert:
+		Start: 0
+	target-valid-interior:
+		Start: 0
+	target-valid-snow:
+		Start: 2
+	target-valid-temperat:
+		Start: 0
+	target-invalid:
+		Start: 1