diff --git a/OpenRA.FileFormats/MiniYaml.cs b/OpenRA.FileFormats/MiniYaml.cs index 3200c32f71..3abf5aa3df 100755 --- a/OpenRA.FileFormats/MiniYaml.cs +++ b/OpenRA.FileFormats/MiniYaml.cs @@ -114,7 +114,7 @@ namespace OpenRA.FileFormats public static Dictionary FromString(string text) { - return FromLines(text.Split('\n')); + return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries)); } public static Dictionary Merge( Dictionary a, Dictionary b ) diff --git a/mods/ra/maps/scm09ea/map.bin b/mods/ra/maps/scm09ea/map.bin new file mode 100644 index 0000000000..73e7803464 Binary files /dev/null and b/mods/ra/maps/scm09ea/map.bin differ diff --git a/mods/ra/maps/scm09ea/map.uid b/mods/ra/maps/scm09ea/map.uid new file mode 100644 index 0000000000..d34cf748f8 --- /dev/null +++ b/mods/ra/maps/scm09ea/map.uid @@ -0,0 +1 @@ +bc53e69ed95d602fb35730b9e18ea1a4deffad40 \ No newline at end of file diff --git a/mods/ra/maps/scm09ea/map.yaml b/mods/ra/maps/scm09ea/map.yaml new file mode 100644 index 0000000000..38ae8a88b9 --- /dev/null +++ b/mods/ra/maps/scm09ea/map.yaml @@ -0,0 +1,112 @@ +Selectable: True + +MapFormat: 1 + +Title: NORTH BY NORTHWEST (4-8) + +Author: Westwood Studios + +PlayerCount: 8 + +Tileset: SNOW + +MapSize: 128,128 + +TopLeft: 16,15 + +BottomRight: 112,111 + +Actors: + Actor0: mine Neutral 19,107 + Actor1: mine Neutral 108,107 + Actor2: mine Neutral 108,18 + Actor3: mine Neutral 19,18 + Actor4: tc04 Neutral 37,61 + Actor5: tc03 Neutral 34,62 + Actor6: tc03 Neutral 63,87 + Actor7: tc02 Neutral 63,90 + Actor8: tc02 Neutral 88,62 + Actor9: tc01 Neutral 92,61 + Actor10: t17 Neutral 91,62 + Actor11: tc01 Neutral 63,37 + Actor12: t16 Neutral 63,34 + Actor13: tc02 Neutral 63,32 + Actor14: t17 Neutral 64,35 + Actor15: tc04 Neutral 32,88 + Actor16: tc05 Neutral 34,91 + Actor17: tc03 Neutral 31,93 + Actor18: tc02 Neutral 31,30 + Actor19: tc01 Neutral 35,31 + Actor20: t14 Neutral 32,33 + Actor21: t13 Neutral 35,34 + Actor22: tc02 Neutral 94,29 + Actor23: tc03 Neutral 90,32 + Actor24: tc04 Neutral 92,33 + Actor25: tc04 Neutral 101,22 + Actor26: t16 Neutral 100,24 + Actor27: tc02 Neutral 102,101 + Actor28: t17 Neutral 101,99 + Actor29: tc05 Neutral 93,93 + Actor30: tc04 Neutral 91,89 + Actor31: tc03 Neutral 94,91 + Actor32: tc03 Neutral 24,101 + Actor33: tc02 Neutral 24,23 + Actor34: t17 Neutral 26,24 + Actor35: mine Neutral 71,63 + Actor36: mine Neutral 64,56 + Actor37: mine Neutral 57,63 + Actor38: mine Neutral 64,70 + Actor39: t07 Neutral 42,40 + Actor40: t07 Neutral 85,40 + Actor41: t06 Neutral 85,83 + Actor42: t01 Neutral 42,83 + Actor43: t02 Neutral 52,58 + Actor44: t03 Neutral 58,67 + Actor45: t05 Neutral 69,55 + Actor46: t06 Neutral 75,61 + Actor47: t07 Neutral 60,52 + Actor48: t08 Neutral 53,65 + Actor49: t10 Neutral 60,73 + Actor50: t12 Neutral 70,66 + Actor51: t14 Neutral 69,58 + Actor52: t16 Neutral 50,61 + Actor53: t16 Neutral 68,71 + Actor54: tc02 Neutral 35,86 + Actor55: t17 Neutral 39,89 + Actor56: tc01 Neutral 90,86 + Actor57: t16 Neutral 87,89 + Actor58: t15 Neutral 87,34 + Actor59: t14 Neutral 91,38 + Actor60: t14 Neutral 28,27 + Actor61: t16 Neutral 29,96 + Actor62: tc01 Neutral 98,95 + Actor63: tc01 Neutral 95,31 + Actor64: tc01 Neutral 50,42 + Actor65: t17 Neutral 44,51 + Actor66: t16 Neutral 45,46 + Actor67: t15 Neutral 50,47 + Actor68: t12 Neutral 46,79 + Actor69: tc04 Neutral 49,81 + Actor70: tc03 Neutral 45,75 + Actor71: t17 Neutral 42,70 + Actor72: tc03 Neutral 82,75 + Actor73: tc05 Neutral 75,80 + Actor74: tc03 Neutral 83,49 + Actor75: tc01 Neutral 72,40 + Actor76: t16 Neutral 76,45 + Actor77: t14 Neutral 79,42 + +Waypoints: + spawn0: 47,23 + spawn1: 80,102 + spawn2: 103,46 + spawn3: 24,79 + spawn4: 24,46 + spawn5: 103,79 + spawn6: 79,23 + spawn7: 47,102 + +Smudges: + +Rules: + diff --git a/mods/ra/maps/scm09ea/preview.png b/mods/ra/maps/scm09ea/preview.png new file mode 100644 index 0000000000..9b2b34f037 Binary files /dev/null and b/mods/ra/maps/scm09ea/preview.png differ diff --git a/mods/ra/maps/scm10ea/map.bin b/mods/ra/maps/scm10ea/map.bin new file mode 100644 index 0000000000..5b28f04857 Binary files /dev/null and b/mods/ra/maps/scm10ea/map.bin differ diff --git a/mods/ra/maps/scm10ea/map.uid b/mods/ra/maps/scm10ea/map.uid new file mode 100644 index 0000000000..6a18c79491 --- /dev/null +++ b/mods/ra/maps/scm10ea/map.uid @@ -0,0 +1 @@ +e5e14175e30472174b3763b90fc94ffb95054a66 \ No newline at end of file diff --git a/mods/ra/maps/scm10ea/map.yaml b/mods/ra/maps/scm10ea/map.yaml new file mode 100644 index 0000000000..58f55a7468 --- /dev/null +++ b/mods/ra/maps/scm10ea/map.yaml @@ -0,0 +1,61 @@ +Selectable: True + +MapFormat: 1 + +Title: first come first serve (4) + +Author: Westwood Studios + +PlayerCount: 4 + +Tileset: TEMPERAT + +MapSize: 128,128 + +TopLeft: 22,22 + +BottomRight: 106,106 + +Actors: + Actor0: mine Neutral 40,92 + Actor1: mine Neutral 89,35 + Actor2: mine Neutral 64,64 + Actor3: tc05 Neutral 43,87 + Actor4: tc04 Neutral 42,75 + Actor5: tc02 Neutral 57,75 + Actor6: tc02 Neutral 62,86 + Actor7: tc04 Neutral 64,38 + Actor8: tc04 Neutral 84,29 + Actor9: tc02 Neutral 96,40 + Actor10: tc03 Neutral 66,79 + Actor11: tc02 Neutral 54,88 + Actor12: tc01 Neutral 41,80 + Actor13: tc04 Neutral 52,29 + Actor14: tc03 Neutral 94,30 + Actor15: tc05 Neutral 39,95 + Actor16: t17 Neutral 35,87 + Actor17: tc05 Neutral 68,50 + Actor18: mine Neutral 74,45 + Actor19: mine Neutral 52,81 + Actor20: tc03 Neutral 86,94 + Actor21: tc04 Neutral 32,29 + Actor22: tc01 Neutral 42,57 + Actor23: tc03 Neutral 83,45 + Actor24: tc03 Neutral 89,79 + Actor25: tc01 Neutral 81,78 + Actor26: t16 Neutral 37,45 + Actor27: tc04 Neutral 64,30 + Actor28: tc01 Neutral 77,39 + Actor29: t16 Neutral 73,54 + Actor30: t16 Neutral 37,90 + +Waypoints: + spawn0: 40,67 + spawn1: 89,61 + spawn2: 54,39 + spawn3: 70,89 + +Smudges: + +Rules: + diff --git a/mods/ra/maps/scm10ea/preview.png b/mods/ra/maps/scm10ea/preview.png new file mode 100644 index 0000000000..cf56eb6f83 Binary files /dev/null and b/mods/ra/maps/scm10ea/preview.png differ diff --git a/mods/ra/maps/scm11ea/map.bin b/mods/ra/maps/scm11ea/map.bin new file mode 100644 index 0000000000..4c0dc18b3b Binary files /dev/null and b/mods/ra/maps/scm11ea/map.bin differ diff --git a/mods/ra/maps/scm11ea/map.uid b/mods/ra/maps/scm11ea/map.uid new file mode 100644 index 0000000000..88069a6460 --- /dev/null +++ b/mods/ra/maps/scm11ea/map.uid @@ -0,0 +1 @@ +97dbcf90ac8ebea32902ac5b42f67214f40123dd \ No newline at end of file diff --git a/mods/ra/maps/scm11ea/map.yaml b/mods/ra/maps/scm11ea/map.yaml new file mode 100644 index 0000000000..60a53dbb9a --- /dev/null +++ b/mods/ra/maps/scm11ea/map.yaml @@ -0,0 +1,57 @@ +Selectable: True + +MapFormat: 1 + +Title: Island hoppers (4) + +Author: Westwood Studios + +PlayerCount: 4 + +Tileset: SNOW + +MapSize: 128,128 + +TopLeft: 11,19 + +BottomRight: 107,115 + +Actors: + Actor0: t01 Neutral 62,77 + Actor1: tc01 Neutral 61,80 + Actor2: t08 Neutral 59,76 + Actor3: tc05 Neutral 53,99 + Actor4: tc05 Neutral 18,68 + Actor5: tc05 Neutral 59,34 + Actor6: tc04 Neutral 98,68 + Actor7: tc04 Neutral 39,24 + Actor8: tc04 Neutral 80,105 + Actor9: tc03 Neutral 41,105 + Actor10: tc02 Neutral 18,80 + Actor11: tc02 Neutral 57,23 + Actor12: tc01 Neutral 98,81 + Actor13: t17 Neutral 97,50 + Actor14: t16 Neutral 67,101 + Actor15: t15 Neutral 31,103 + Actor16: t14 Neutral 21,48 + Actor17: t11 Neutral 62,26 + Actor18: t10 Neutral 93,66 + Actor19: mine Neutral 44,59 + Actor20: mine Neutral 87,48 + Actor21: mine Neutral 84,89 + Actor22: mine Neutral 45,86 + Actor23: mine Neutral 70,26 + Actor24: mine Neutral 66,103 + Actor25: mine Neutral 46,102 + Actor26: mine Neutral 50,31 + +Waypoints: + spawn0: 41,53 + spawn1: 79,84 + spawn2: 81,50 + spawn3: 40,84 + +Smudges: + +Rules: + diff --git a/mods/ra/maps/scm11ea/preview.png b/mods/ra/maps/scm11ea/preview.png new file mode 100644 index 0000000000..cb9cff1919 Binary files /dev/null and b/mods/ra/maps/scm11ea/preview.png differ diff --git a/mods/ra/maps/scm12ea/map.bin b/mods/ra/maps/scm12ea/map.bin new file mode 100644 index 0000000000..65e6925509 Binary files /dev/null and b/mods/ra/maps/scm12ea/map.bin differ diff --git a/mods/ra/maps/scm12ea/map.uid b/mods/ra/maps/scm12ea/map.uid new file mode 100644 index 0000000000..b6c88a2c01 --- /dev/null +++ b/mods/ra/maps/scm12ea/map.uid @@ -0,0 +1 @@ +69a3a157788e9c2c52a9ead3bf6a8e890134fc5a \ No newline at end of file diff --git a/mods/ra/maps/scm12ea/map.yaml b/mods/ra/maps/scm12ea/map.yaml new file mode 100644 index 0000000000..66032643b6 --- /dev/null +++ b/mods/ra/maps/scm12ea/map.yaml @@ -0,0 +1,105 @@ +Selectable: True + +MapFormat: 1 + +Title: raraku (4-8) + +Author: Westwood Studios + +PlayerCount: 8 + +Tileset: TEMPERAT + +MapSize: 128,128 + +TopLeft: 15,15 + +BottomRight: 111,111 + +Actors: + Actor0: tc04 Neutral 57,17 + Actor1: tc05 Neutral 61,22 + Actor2: tc03 Neutral 55,25 + Actor3: tc02 Neutral 65,16 + Actor4: t17 Neutral 62,18 + Actor5: tc04 Neutral 51,14 + Actor6: tc03 Neutral 68,29 + Actor7: tc01 Neutral 58,29 + Actor8: tc05 Neutral 50,38 + Actor9: tc02 Neutral 45,30 + Actor10: tc05 Neutral 97,16 + Actor11: tc04 Neutral 96,15 + Actor12: tc03 Neutral 96,24 + Actor13: tc05 Neutral 26,30 + Actor14: tc04 Neutral 15,28 + Actor15: tc05 Neutral 16,29 + Actor16: tc03 Neutral 25,32 + Actor17: tc04 Neutral 23,92 + Actor18: tc05 Neutral 24,93 + Actor19: tc03 Neutral 96,90 + Actor20: tc05 Neutral 96,76 + Actor21: tc01 Neutral 86,77 + Actor22: t16 Neutral 90,80 + Actor23: tc02 Neutral 37,86 + Actor24: t17 Neutral 80,56 + Actor25: tc02 Neutral 76,66 + Actor26: tc04 Neutral 56,61 + Actor27: tc05 Neutral 52,59 + Actor28: tc03 Neutral 30,49 + Actor29: tc02 Neutral 25,69 + Actor30: t16 Neutral 34,72 + Actor31: tc03 Neutral 42,54 + Actor32: mine Neutral 73,79 + Actor33: mine Neutral 49,34 + Actor34: mine Neutral 105,22 + Actor35: mine Neutral 101,80 + Actor36: mine Neutral 43,107 + Actor37: mine Neutral 24,47 + Actor38: tc01 Neutral 84,90 + Actor39: t16 Neutral 83,91 + Actor40: tc02 Neutral 18,101 + Actor41: tc01 Neutral 17,107 + Actor42: t16 Neutral 15,95 + Actor43: tc04 Neutral 17,16 + Actor44: tc01 Neutral 42,28 + Actor45: tc05 Neutral 79,31 + Actor46: tc03 Neutral 109,15 + Actor47: tc02 Neutral 107,15 + Actor48: tc02 Neutral 105,33 + Actor49: tc02 Neutral 104,32 + Actor50: tc04 Neutral 45,85 + Actor51: tc05 Neutral 75,97 + Actor52: t16 Neutral 76,99 + Actor53: tc01 Neutral 88,89 + Actor54: tc02 Neutral 35,91 + Actor55: tc01 Neutral 39,31 + Actor56: tc03 Neutral 14,59 + Actor57: tc02 Neutral 15,57 + Actor58: tc01 Neutral 21,14 + Actor59: mine Neutral 74,62 + Actor60: mine Neutral 43,21 + Actor61: tc02 Neutral 36,109 + Actor62: tc01 Neutral 109,44 + Actor63: tc02 Neutral 98,38 + Actor64: tc03 Neutral 72,69 + Actor65: tc01 Neutral 89,14 + Actor66: tc04 Neutral 81,47 + Actor67: tc01 Neutral 100,94 + Actor68: tc02 Neutral 102,86 + Actor69: tc05 Neutral 89,54 + Actor70: tc01 Neutral 89,53 + +Waypoints: + spawn0: 26,102 + spawn1: 88,24 + spawn2: 90,97 + spawn3: 26,23 + spawn4: 63,88 + spawn5: 59,53 + spawn6: 29,61 + spawn7: 104,51 + +Smudges: + +Rules: + diff --git a/mods/ra/maps/scm12ea/preview.png b/mods/ra/maps/scm12ea/preview.png new file mode 100644 index 0000000000..5bff09100b Binary files /dev/null and b/mods/ra/maps/scm12ea/preview.png differ