diff --git a/OpenRA.FileFormats/Map.cs b/OpenRA.FileFormats/Map.cs
index 6d51f2bb3b..9a39786521 100644
--- a/OpenRA.FileFormats/Map.cs
+++ b/OpenRA.FileFormats/Map.cs
@@ -28,7 +28,6 @@ namespace OpenRA.FileFormats
{
public class Map
{
- public readonly string BinaryPart;
public readonly string Title;
public readonly string Theater;
public readonly int INIFormat;
@@ -54,11 +53,12 @@ namespace OpenRA.FileFormats
public string TileSuffix { get { return "." + Truncate(Theater, 3); } }
- public Map(IniFile file)
+ public Map(string Filename)
{
+ IniFile file = new IniFile(FileSystem.Open(Filename));
+
IniSection basic = file.GetSection("Basic");
Title = basic.GetValue("Name", "(null)");
- BinaryPart = basic.GetValue("BinaryPart", "scm02ea.bin");
INIFormat = int.Parse(basic.GetValue("NewINIFormat", "0"));
IniSection map = file.GetSection("Map");
@@ -87,7 +87,7 @@ namespace OpenRA.FileFormats
}
else // CNC
{
- UnpackCncTileData(FileSystem.Open(BinaryPart));
+ UnpackCncTileData(FileSystem.Open(Filename.Substring(0,Filename.Length-4)+".bin"));
ReadCncTrees(file);
}
diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs
index f3cdf00080..fd4f86ea5a 100644
--- a/OpenRA.Game/Chrome.cs
+++ b/OpenRA.Game/Chrome.cs
@@ -251,7 +251,7 @@ namespace OpenRA
public MapInfo(string filename)
{
Filename = filename.ToLowerInvariant();
- Map = new Map(new IniFile(FileSystem.Open(Filename)));
+ Map = new Map(Filename);
}
};
@@ -318,9 +318,10 @@ namespace OpenRA
var y = r.Top + 50;
- int numListItems = ((r.Bottom - 60 - y ) / 20);
+ int maxListItems = ((r.Bottom - 60 - y ) / 20);
- for(int i = mapOffset; i < numListItems + mapOffset; i++, y += 20){
+ for(int i = mapOffset; i < Math.Min(maxListItems + mapOffset, mapList.Value.Count()); i++, y += 20){
+
var map = mapList.Value.ElementAt(i);
var itemRect = new Rectangle(r.Left + 50, y - 2, r.Width - 340, 20);
if (map == currentMap)
@@ -355,7 +356,7 @@ namespace OpenRA
AddUiButton(new int2(mapRect.Left + mapRect.Width / 2, y), "\\/",
_ =>
{
- mapOffset = (mapOffset + 1 > mapList.Value.Count() - numListItems) ? mapOffset : mapOffset + 1;
+ mapOffset = (mapOffset + 1 > mapList.Value.Count() - maxListItems) ? mapOffset : mapOffset + 1;
});
AddButton(r, _ => { });
diff --git a/OpenRA.Game/Graphics/Minimap.cs b/OpenRA.Game/Graphics/Minimap.cs
index 3dd872fbbd..156c30f94c 100644
--- a/OpenRA.Game/Graphics/Minimap.cs
+++ b/OpenRA.Game/Graphics/Minimap.cs
@@ -107,8 +107,8 @@ namespace OpenRA.Graphics
/* todo: do this a bit nicer */
var terrain = RenderTerrainBitmap(map, tileset);
- foreach (var sp in map.SpawnPoints)
- terrain.SetPixel(sp.X, sp.Y, Color.White);
+ //foreach (var sp in map.SpawnPoints)
+ // terrain.SetPixel(sp.X, sp.Y, Color.White);
return terrain;
}
diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs
index 0cb656328b..0657173785 100644
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -75,8 +75,7 @@ namespace OpenRA
public World()
{
Timer.Time( "----World.ctor" );
-
- Map = new Map( Rules.AllRules );
+ Map = new Map( Game.LobbyInfo.GlobalSettings.Map );
Timer.Time( "new Map: {0}" );
TileSet = new TileSet( Map.TileSuffix );
SpriteSheetBuilder.Initialize( Map );
diff --git a/mods/cnc/missions.pkt b/mods/cnc/missions.pkt
new file mode 100644
index 0000000000..6b2d17d9a6
--- /dev/null
+++ b/mods/cnc/missions.pkt
@@ -0,0 +1,17 @@
+[Missions]
+SCM01EA.INI=Green Acres
+SCM02EA.INI=Sand Trap
+SCM03EA.INI=Lost Arena
+SCM04EA.INI=River Raid
+SCM05EA.INI=Eye of the Storm
+SCM06EA.INI=Lakefront Clash
+SCM07EA.INI=Desert Madness
+SCM08EA.INI=Pitfall
+SCM09EA.INI=Moosehead Barrons
+SCM70EA.INI=Winter Waterland
+SCM71EA.INI=One Pass Fits All
+SCM72EA.INI=Straight and Narrow
+SCM73EA.INI=King takes Pawn
+SCM74EA.INI=Nowhere to Hide
+SCM77EA.INI=Marooned
+SCM96EA.INI=Tiberium Garden
diff --git a/mods/cnc/scm01ea.ini b/mods/cnc/scm01ea.ini
deleted file mode 100644
index 06fa23f723..0000000000
--- a/mods/cnc/scm01ea.ini
+++ /dev/null
@@ -1,565 +0,0 @@
-; Scenario 20 control for house GoodGuy.
-
-[Basic]
-BinaryPart=scm01ea.bin
-CarryOverCap=-1
-CarryOverMoney=100
-Intro=x
-BuildLevel=1
-Theme=No theme
-Percent=0
-Player=Multi1
-Action=LAND
-Lose=GAMEOVER
-Win=x
-Brief=GDI1
-Name=GREEN ACRES
-
-[MAP]
-Height=49
-Width=58
-Y=11
-X=3
-Theater=TEMPERATE
-
-[Multi1]
-FlagHome=1031
-FlagLocation=5127
-MaxBuilding=150
-Allies=Multi1,Multi2,Multi3
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi2]
-FlagHome=952
-FlagLocation=5048
-MaxBuilding=150
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxUnit=150
-Edge=North
-Credits=0
-a
-[Multi3]
-FlagHome=3510
-FlagLocation=7606
-MaxBuilding=150
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi4]
-FlagHome=3466
-FlagLocation=7562
-MaxBuilding=150
-Allies=Multi2,Multi3,Multi4
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Base]
-Count=0
-
-[TERRAIN]
-1004=TC04,None
-1002=TC03,None
-2274=TC03,None
-2145=TC04,None
-2741=TC04,None
-2679=TC02,None
-2521=T02,None
-2588=T01,None
-1677=SPLIT2,None
-2900=SPLIT3,None
-3498=SPLIT3,None
-2269=SPLIT3,None
-1462=SPLIT2,None
-738=SPLIT3,None
-1935=TC01,None
-1997=T17,None
-1732=TC05,None
-2058=TC04,None
-1170=TC04,None
-2000=TC02,None
-1874=T07,None
-2397=T06,None
-1828=T07,None
-1443=T06,None
-1570=T07,None
-1770=T07,None
-2847=T07,None
-2977=T16,None
-2910=T17,None
-2911=TC02,None
-1641=TC04,None
-2665=TC04,None
-2640=TC04,None
-755=T02,None
-780=T02,None
-779=T03,None
-2764=T16,None
-3603=TC02,None
-1124=T16,None
-806=T17,None
-870=TC01,None
-814=TC02,None
-3349=T07,None
-3286=TC04,None
-992=TC04,None
-1247=TC02,None
-981=TC01,None
-1169=T01,None
-2095=TC04,None
-2031=TC01,None
-2701=SPLIT2,None
-1382=SPLIT2,None
-2798=SPLIT3,None
-3452=T01,None
-1658=TC05,None
-1720=TC04,None
-1718=TC03,None
-1716=TC02,None
-1779=TC01,None
-2289=TC02,None
-2221=TC04,None
-2351=TC03,None
-
-[OVERLAY]
-3819=TI1
-3756=TI6
-3755=TI10
-3754=TI11
-3692=TI4
-3691=TI1
-3690=TI8
-3689=TI6
-3628=TI11
-3627=TI6
-3626=TI8
-3625=TI1
-3624=TI1
-3564=TI7
-3563=TI7
-3561=TI8
-3560=TI6
-3559=TI2
-3558=TI6
-3500=TI12
-3499=TI7
-3498=TI10
-3497=TI3
-3495=TI2
-3494=TI6
-3436=TI12
-3435=TI6
-3434=TI11
-3433=TI4
-3432=TI5
-3431=TI12
-3183=TI12
-3159=TI10
-3119=TI8
-3118=TI5
-3117=TI2
-3116=TI11
-3115=TI5
-3114=TI9
-3095=TI10
-3093=TI3
-3092=TI10
-3057=TI5
-3056=TI4
-3055=TI7
-3054=TI1
-3053=TI7
-3052=TI4
-3051=TI2
-3050=TI12
-3049=TI6
-3031=TI12
-3030=TI2
-3029=TI10
-3028=TI5
-3027=TI7
-2992=TI9
-2991=TI9
-2990=TI3
-2989=TI9
-2988=TI12
-2987=TI10
-2986=TI11
-2985=TI12
-2984=TI3
-2966=TI3
-2965=TI3
-2963=TI9
-2962=TI11
-2930=TI8
-2929=TI6
-2928=TI5
-2927=TI7
-2926=TI10
-2925=TI5
-2923=TI9
-2922=TI10
-2921=TI3
-2920=TI2
-2919=TI12
-2901=TI4
-2900=TI5
-2899=TI1
-2898=TI9
-2897=TI3
-2896=TI1
-2894=TI9
-2893=TI6
-2892=TI5
-2891=TI5
-2890=TI8
-2866=TI2
-2865=TI5
-2864=TI5
-2861=TI1
-2855=TI2
-2854=TI10
-2836=TI4
-2835=TI4
-2834=TI12
-2833=TI1
-2832=TI9
-2831=TI9
-2830=TI3
-2829=TI3
-2827=TI2
-2826=TI4
-2825=TI3
-2803=TI5
-2802=TI7
-2801=TI12
-2796=TI1
-2769=TI11
-2767=TI5
-2766=TI6
-2764=TI2
-2763=TI9
-2762=TI1
-2761=TI5
-2737=TI3
-2736=TI10
-2733=TI12
-2732=TI4
-2703=TI2
-2702=TI12
-2701=TI12
-2700=TI12
-2699=TI12
-2698=TI7
-2674=TI8
-2673=TI7
-2672=TI2
-2671=TI6
-2670=TI4
-2669=TI12
-2639=TI3
-2609=TI6
-2397=TI4
-2396=TI7
-2395=TI5
-2394=TI5
-2393=TI4
-2336=TI12
-2335=TI5
-2334=TI2
-2332=TI2
-2331=TI5
-2330=TI1
-2329=TI3
-2328=TI5
-2327=TI7
-2272=TI3
-2270=TI10
-2269=TI10
-2268=TI1
-2267=TI8
-2266=TI8
-2265=TI7
-2264=TI11
-2263=TI2
-2208=TI8
-2207=TI8
-2206=TI1
-2205=TI2
-2204=TI3
-2203=TI5
-2202=TI12
-2201=TI3
-2200=TI12
-2144=TI3
-2143=TI10
-2142=TI12
-2141=TI6
-2139=TI11
-2080=TI11
-2079=TI11
-2078=TI4
-2015=TI6
-1998=TI3
-1997=TI6
-1996=TI3
-1995=TI6
-1994=TI8
-1937=TI3
-1936=TI8
-1934=TI8
-1933=TI9
-1932=TI11
-1931=TI9
-1930=TI1
-1929=TI5
-1873=TI1
-1872=TI2
-1871=TI1
-1870=TI9
-1868=TI8
-1867=TI5
-1866=TI11
-1865=TI10
-1810=TI12
-1809=TI8
-1808=TI7
-1806=TI8
-1805=TI5
-1804=TI12
-1803=TI4
-1768=TI5
-1767=TI12
-1764=TI10
-1763=TI7
-1747=TI3
-1745=TI3
-1744=TI3
-1743=TI6
-1740=TI11
-1739=TI1
-1715=TI8
-1704=TI7
-1702=TI12
-1701=TI4
-1699=TI5
-1698=TI5
-1681=TI10
-1680=TI11
-1679=TI4
-1678=TI9
-1676=TI5
-1675=TI10
-1651=TI6
-1650=TI11
-1640=TI5
-1639=TI2
-1637=TI1
-1636=TI4
-1633=TI11
-1619=TI11
-1618=TI2
-1617=TI12
-1616=TI5
-1615=TI4
-1614=TI11
-1613=TI7
-1612=TI7
-1611=TI1
-1610=TI2
-1595=TI10
-1594=TI3
-1593=TI11
-1592=TI2
-1591=TI8
-1590=TI12
-1589=TI5
-1588=TI4
-1587=TI11
-1577=TI4
-1576=TI1
-1575=TI12
-1573=TI2
-1572=TI4
-1571=TI7
-1570=TI7
-1569=TI5
-1553=TI5
-1552=TI9
-1551=TI3
-1550=TI9
-1549=TI5
-1548=TI2
-1547=TI6
-1530=TI10
-1529=TI9
-1528=TI7
-1527=TI8
-1525=TI3
-1524=TI5
-1512=TI9
-1511=TI1
-1510=TI6
-1509=TI4
-1506=TI12
-1505=TI9
-1489=TI9
-1468=TI12
-1466=TI2
-1465=TI9
-1464=TI10
-1463=TI10
-1447=TI1
-1445=TI9
-1444=TI2
-1443=TI8
-1442=TI5
-1441=TI2
-1404=TI11
-1403=TI12
-1384=TI7
-1383=TI12
-1382=TI8
-1381=TI5
-1380=TI9
-1379=TI5
-1377=TI4
-1320=TI8
-1318=TI4
-1317=TI8
-1316=TI12
-877=TI1
-869=TI5
-868=TI8
-867=TI4
-866=TI11
-865=TI10
-817=TI4
-816=TI2
-813=TI5
-812=TI4
-811=TI11
-810=TI9
-809=TI10
-808=TI9
-807=TI4
-805=TI10
-804=TI1
-803=TI7
-801=TI9
-800=TI7
-799=TI5
-754=TI9
-751=TI11
-750=TI8
-749=TI8
-748=TI7
-747=TI1
-746=TI10
-745=TI3
-744=TI8
-743=TI3
-742=TI5
-741=TI3
-740=TI5
-738=TI6
-737=TI10
-736=TI8
-735=TI7
-
-[SMUDGE]
-
-[INFANTRY]
-
-[UNITS]
-
-[STRUCTURES]
-
-[Waypoints]
-31=-1
-30=-1
-29=-1
-28=-1
-27=2272
-26=2272
-25=-1
-24=-1
-23=-1
-22=-1
-21=-1
-20=-1
-19=-1
-18=-1
-17=-1
-16=-1
-15=-1
-14=-1
-13=-1
-12=-1
-11=-1
-10=-1
-9=-1
-8=-1
-7=3464
-6=3573
-5=2298
-4=3745
-3=2216
-2=953
-1=786
-0=1221
-
-
-[Neutral]
-FlagHome=0
-FlagLocation=0
-Allies=Neutral
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[GoodGuy]
-FlagHome=0
-FlagLocation=0
-Allies=GoodGuy,Neutral
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[BadGuy]
-FlagHome=0
-FlagLocation=0
-Allies=BadGuy
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Special]
-FlagHome=0
-FlagLocation=0
-Allies=Special
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi5]
-Allies=Multi5
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi6]
-Allies=Multi6
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
diff --git a/mods/cnc/scm02ea.ini b/mods/cnc/scm02ea.ini
deleted file mode 100644
index 912b9acde6..0000000000
--- a/mods/cnc/scm02ea.ini
+++ /dev/null
@@ -1,597 +0,0 @@
-; Scenario 2 control for house Multi1.
-
-[Basic]
-BinaryPart=scm02ea.bin
-CarryOverCap=-1
-CarryOverMoney=50
-Intro=x
-BuildLevel=2
-Theme=No theme
-Percent=0
-Player=Multi3
-Action=LAND
-Lose=GAMEOVER
-Win=x
-Brief=GDI1
-Name=Sand Trap
-
-[MAP]
-Height=58
-Width=57
-Y=3
-X=3
-Theater=DESERT
-
-[Waypoints]
-31=-1
-30=-1
-29=3249
-28=901
-27=2337
-26=2337
-25=-1
-24=-1
-23=-1
-22=-1
-21=-1
-20=-1
-19=-1
-18=-1
-17=-1
-16=-1
-15=-1
-14=-1
-13=-1
-12=-1
-11=-1
-10=-1
-9=-1
-8=-1
-7=340
-6=376
-5=2292
-4=3334
-3=3737
-2=3760
-1=1057
-0=1030
-
-[Neutral]
-Allies=Neutral
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi1]
-Allies=Multi1,Multi2,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi2]
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi3]
-Allies=Multi2,Multi3,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi4]
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[STRUCTURES]
-
-[OVERLAY]
-3862=TI1
-3860=TI1
-3859=TI1
-3858=TI1
-3857=TI1
-3856=TI1
-3855=TI1
-3854=TI1
-3850=TI1
-3849=TI1
-3848=TI1
-3847=TI1
-3846=TI1
-3845=TI1
-3844=TI1
-3843=TI1
-3819=TI10
-3818=TI11
-3799=TI11
-3798=TI6
-3797=TI7
-3796=TI5
-3795=TI6
-3794=TI12
-3793=TI3
-3791=TI5
-3785=TI6
-3784=TI2
-3783=TI3
-3782=TI11
-3781=TI11
-3780=TI3
-3756=TI6
-3755=TI7
-3754=TI5
-3735=TI3
-3734=TI6
-3733=TI2
-3732=TI10
-3731=TI12
-3730=TI7
-3729=TI5
-3728=TI6
-3726=TI2
-3722=TI4
-3721=TI8
-3720=TI9
-3719=TI1
-3718=TI12
-3694=TI9
-3693=TI5
-3692=TI2
-3691=TI4
-3690=TI8
-3670=TI12
-3669=TI6
-3668=TI8
-3667=TI10
-3666=TI3
-3665=TI8
-3664=TI8
-3658=TI9
-3631=TI9
-3630=TI12
-3629=TI6
-3628=TI1
-3627=TI10
-3626=TI12
-3604=TI9
-3602=TI4
-3567=TI8
-3566=TI4
-3564=TI1
-3563=TI8
-3562=TI2
-3541=TI5
-3540=TI10
-3502=TI5
-3501=TI7
-3499=TI6
-3437=TI4
-3436=TI5
-3435=TI5
-3434=TI6
-3372=TI2
-3371=TI3
-3370=TI1
-3258=TI5
-3194=TI5
-3193=TI9
-3130=TI9
-3129=TI7
-3128=TI12
-3066=TI8
-3065=TI2
-3013=TI3
-3001=TI3
-2999=TI8
-2954=TI12
-2953=TI7
-2950=TI12
-2949=TI8
-2948=TI8
-2939=TI9
-2938=TI2
-2936=TI5
-2935=TI9
-2925=TI10
-2890=TI8
-2889=TI4
-2888=TI4
-2887=TI5
-2886=TI6
-2885=TI5
-2884=TI10
-2874=TI5
-2873=TI6
-2872=TI8
-2826=TI7
-2824=TI7
-2822=TI11
-2821=TI12
-2820=TI2
-2811=TI7
-2809=TI4
-2771=TI4
-2768=TI4
-2759=TI12
-2758=TI11
-2757=TI5
-2756=TI5
-2746=TI7
-2745=TI10
-2709=TI10
-2708=TI1
-2707=TI12
-2705=TI5
-2703=TI1
-2702=TI1
-2695=TI5
-2694=TI1
-2693=TI9
-2692=TI5
-2681=TI9
-2648=TI12
-2647=TI10
-2646=TI4
-2645=TI9
-2644=TI6
-2642=TI10
-2641=TI11
-2640=TI1
-2639=TI7
-2638=TI2
-2631=TI12
-2630=TI11
-2617=TI9
-2583=TI9
-2582=TI12
-2581=TI10
-2580=TI11
-2578=TI7
-2577=TI2
-2576=TI11
-2575=TI3
-2553=TI7
-2518=TI4
-2517=TI12
-2516=TI10
-2515=TI12
-2514=TI5
-2513=TI2
-2512=TI6
-2511=TI4
-2453=TI3
-2452=TI11
-2451=TI5
-2449=TI1
-2448=TI2
-2388=TI5
-2386=TI10
-2385=TI4
-2351=TI12
-2350=TI8
-2349=TI5
-2288=TI8
-2286=TI9
-2285=TI3
-2284=TI5
-2283=TI11
-2282=TI5
-2252=TI11
-2251=TI3
-2223=TI2
-2222=TI4
-2221=TI1
-2220=TI3
-2219=TI6
-2218=TI11
-2187=TI5
-2186=TI11
-2185=TI5
-2158=TI11
-2157=TI10
-2156=TI6
-2155=TI11
-2154=TI8
-2153=TI7
-2152=TI3
-2145=TI11
-2123=TI6
-2121=TI9
-2093=TI1
-2092=TI3
-2091=TI4
-2090=TI9
-2089=TI6
-2088=TI6
-2061=TI3
-2059=TI10
-2058=TI12
-2054=TI10
-2053=TI12
-2027=TI8
-2026=TI4
-2025=TI11
-1996=TI8
-1995=TI2
-1994=TI3
-1990=TI7
-1989=TI3
-1963=TI4
-1931=TI11
-1930=TI10
-1929=TI10
-1928=TI10
-1927=TI2
-1926=TI4
-1925=TI1
-1924=TI6
-1866=TI7
-1865=TI4
-1864=TI9
-1863=TI1
-1862=TI4
-1861=TI10
-1860=TI3
-1801=TI4
-1800=TI8
-1799=TI1
-1798=TI2
-1797=TI3
-1796=TI2
-1795=TI8
-1737=TI1
-1735=TI4
-1734=TI12
-1733=TI3
-1732=TI4
-1731=TI9
-1690=TI12
-1689=TI8
-1670=TI8
-1669=TI4
-1668=TI4
-1624=TI10
-1559=TI6
-1558=TI12
-1498=TI7
-1497=TI11
-1496=TI11
-1495=TI12
-1494=TI6
-1493=TI10
-1492=TI5
-1491=TI1
-1465=TI11
-1433=TI11
-1432=TI6
-1431=TI11
-1430=TI3
-1429=TI9
-1428=TI9
-1427=TI9
-1401=TI12
-1369=TI9
-1368=TI2
-1367=TI6
-1366=TI9
-1365=TI2
-1364=TI1
-1363=TI12
-1337=TI8
-1336=TI2
-1326=TI3
-1324=TI1
-1322=TI12
-1321=TI12
-1320=TI6
-1303=TI1
-1302=TI11
-1301=TI2
-1300=TI1
-1273=TI5
-1263=TI9
-1260=TI11
-1259=TI9
-1258=TI7
-1256=TI10
-1240=TI2
-1239=TI9
-1238=TI5
-1237=TI3
-1236=TI8
-1199=TI5
-1198=TI4
-1195=TI5
-1194=TI4
-1193=TI1
-1176=TI11
-1175=TI8
-1173=TI2
-1172=TI6
-1133=TI12
-1132=TI8
-1131=TI7
-1130=TI6
-1129=TI4
-1128=TI9
-1127=TI1
-1126=TI11
-1109=TI5
-1108=TI6
-1107=TI3
-1068=TI12
-1067=TI11
-1066=TI5
-1065=TI9
-1064=TI10
-1063=TI10
-1062=TI6
-1044=TI6
-1043=TI11
-1004=TI9
-1003=TI2
-1002=TI3
-1001=TI9
-1000=TI11
-999=TI12
-998=TI3
-980=TI10
-978=TI7
-939=TI10
-938=TI12
-937=TI2
-936=TI3
-935=TI7
-934=TI10
-873=TI1
-872=TI4
-528=TI8
-527=TI5
-526=TI2
-523=TI6
-522=TI11
-521=TI2
-520=TI12
-463=TI5
-462=TI8
-461=TI8
-460=TI8
-459=TI7
-458=TI12
-457=TI2
-456=TI3
-455=TI3
-454=TI3
-398=TI10
-397=TI11
-396=TI8
-395=TI10
-394=TI11
-393=TI10
-392=TI9
-391=TI10
-390=TI4
-389=TI11
-371=TI6
-370=TI5
-369=TI4
-368=TI5
-367=TI10
-366=TI3
-363=TI7
-362=TI3
-361=TI2
-360=TI11
-333=TI10
-332=TI11
-330=TI1
-329=TI11
-327=TI7
-326=TI11
-325=TI4
-307=TI8
-306=TI8
-305=TI3
-304=TI4
-303=TI7
-302=TI6
-301=TI12
-300=TI8
-299=TI3
-298=TI9
-296=TI3
-295=TI12
-268=TI9
-267=TI2
-266=TI8
-265=TI10
-264=TI7
-263=TI9
-262=TI10
-261=TI4
-260=TI8
-242=TI11
-239=TI5
-238=TI6
-236=TI2
-235=TI4
-231=TI3
-
-[Base]
-Count=0
-
-[TERRAIN]
-3541=SPLIT3,None
-1235=SPLIT3,None
-264=SPLIT3,None
-1987=T18,None
-2198=T18,None
-2394=T18,None
-2372=T08,None
-2439=T08,None
-2373=T08,None
-925=ROCK1,None
-323=ROCK1,None
-364=ROCK6,None
-2741=T08,None
-1142=T08,None
-3573=T08,None
-2085=T08,None
-2151=T08,None
-2086=T08,None
-2030=T08,None
-771=ROCK1,None
-1958=ROCK1,None
-2267=T08,None
-2759=SPLIT3,None
-2515=SPLIT3,None
-3436=SPLIT3,None
-876=SPLIT3,None
-2153=SPLIT3,None
-233=SPLIT3,None
-
-[SMUDGE]
-
-[GoodGuy]
-Allies=GoodGuy,Neutral
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[BadGuy]
-Allies=BadGuy
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Special]
-Allies=Special
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi5]
-Allies=Multi5
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi6]
-Allies=Multi6
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
diff --git a/mods/cnc/scm70ea.ini b/mods/cnc/scm70ea.ini
deleted file mode 100644
index 6e686d2c5d..0000000000
--- a/mods/cnc/scm70ea.ini
+++ /dev/null
@@ -1,531 +0,0 @@
-; Scenario 70 control for house Multi1.
-
-[Basic]
-BinaryPart=scm70ea.bin
-CarryOverCap=-1
-Percent=0
-CarryOverMoney=100
-BuildLevel=70
-Theme=No theme
-Player=Multi3
-Action=LANDING
-Lose=GAMEOVER
-Win=CONSYARD
-Brief=x
-Intro=x
-Name=Winter Waterland
-
-[MAP]
-Height=62
-Width=62
-Y=1
-X=1
-Theater=WINTER
-
-[Waypoints]
-27=2080
-26=2080
-25=-1
-24=-1
-23=-1
-22=-1
-21=-1
-20=-1
-19=-1
-18=-1
-17=-1
-16=-1
-15=-1
-14=-1
-13=-1
-12=-1
-11=-1
-10=-1
-9=-1
-8=-1
-7=-1
-6=794
-5=1542
-4=312
-3=3831
-2=200
-1=1565
-0=3463
-
-[GoodGuy]
-Allies=GoodGuy,Neutral
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[BadGuy]
-Allies=BadGuy
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Neutral]
-Allies=Neutral
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Special]
-Allies=Special
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi1]
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi2]
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi3]
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi4]
-Allies=Multi1,Multi2,Multi3,Multi4
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi5]
-Allies=Multi5
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[Multi6]
-Allies=Multi6
-MaxBuilding=150
-MaxUnit=150
-Edge=North
-Credits=0
-
-[TERRAIN]
-2101=T01,None
-1909=T02,None
-1848=T01,None
-519=TC04,None
-402=T16,None
-89=T16,None
-154=T17,None
-413=T15,None
-804=T15,None
-164=TC01,None
-759=T14,None
-573=T14,None
-488=TC02,None
-299=T17,None
-109=T17,None
-1003=T17,None
-993=T17,None
-687=T16,None
-752=T08,None
-486=T08,None
-1012=T08,None
-1150=T08,None
-597=T08,None
-1395=T08,None
-1326=T10,None
-1390=T07,None
-1444=T07,None
-1575=T07,None
-608=T07,None
-790=T07,None
-915=T07,None
-1748=T07,None
-1302=T07,None
-1241=T05,None
-1499=T06,None
-2013=T10,None
-1753=T10,None
-1635=T16,None
-1764=T16,None
-2023=T15,None
-1489=T13,None
-921=TC04,None
-2478=TC04,None
-2801=T01,None
-2988=T01,None
-1519=T01,None
-1212=T01,None
-1277=T01,None
-1717=T02,None
-1902=T03,None
-1725=T03,None
-2040=T03,None
-2301=T03,None
-2738=T03,None
-2806=T03,None
-2620=TC01,None
-3252=TC01,None
-3513=TC04,None
-2459=T01,None
-2390=T03,None
-2334=T05,None
-2596=T06,None
-3106=T06,None
-3440=T06,None
-3569=T06,None
-3495=T06,None
-3553=T06,None
-3945=T10,None
-3901=T12,None
-3369=T12,None
-3879=T12,None
-964=T01,None
-1226=T02,None
-1346=T10,None
-1475=T08,None
-1422=T08,None
-1737=T11,None
-1735=T07,None
-1864=T07,None
-2307=T06,None
-2826=T06,None
-3085=T06,None
-3145=T01,None
-3271=T03,None
-3457=T10,None
-3586=T08,None
-3406=T08,None
-3409=T06,None
-3846=TC04,None
-3923=T16,None
-3933=T16,None
-
-[OVERLAY]
-4030=TI1
-4029=TI1
-4028=TI1
-4027=TI1
-3996=TI1
-3986=TI1
-3985=TI1
-3984=TI1
-3983=TI1
-3966=TI8
-3964=TI5
-3933=TI9
-3932=TI8
-3923=TI1
-3922=TI1
-3921=TI3
-3920=TI9
-3919=TI8
-3902=TI12
-3901=TI12
-3900=TI6
-3869=TI6
-3868=TI12
-3867=TI12
-3859=TI7
-3858=TI3
-3854=TI11
-3838=TI11
-3837=TI2
-3805=TI1
-3804=TI2
-3803=TI3
-3774=TI10
-3344=TI1
-3343=TI7
-3342=TI11
-3311=TI2
-3310=TI8
-3309=TI9
-3308=TI4
-3307=TI12
-3306=TI11
-3281=TI6
-3280=TI9
-3279=TI5
-3278=TI6
-3277=TI6
-3258=TI9
-3257=TI3
-3256=TI3
-3255=TI11
-3245=TI7
-3244=TI2
-3243=TI12
-3242=TI11
-3241=TI3
-3240=TI1
-3239=TI8
-3217=TI10
-3216=TI2
-3214=TI1
-3213=TI2
-3194=TI1
-3193=TI1
-3192=TI5
-3191=TI4
-3129=TI10
-3128=TI1
-3127=TI12
-3063=TI5
-3015=TI2
-3014=TI12
-3013=TI4
-3011=TI6
-3010=TI12
-3009=TI2
-2961=TI12
-2958=TI8
-2951=TI4
-2950=TI6
-2949=TI11
-2947=TI6
-2946=TI12
-2945=TI9
-2899=TI7
-2897=TI11
-2894=TI7
-2854=TI8
-2849=TI7
-2835=TI2
-2834=TI10
-2833=TI3
-2832=TI11
-2831=TI7
-2791=TI5
-2790=TI6
-2789=TI9
-2788=TI7
-2787=TI5
-2786=TI8
-2785=TI10
-2769=TI12
-2768=TI10
-2724=TI3
-2723=TI2
-2722=TI9
-2659=TI5
-2658=TI12
-2520=TI1
-2519=TI11
-2518=TI6
-2459=TI4
-2458=TI4
-2457=TI10
-2456=TI9
-2455=TI11
-2396=TI4
-2395=TI3
-2394=TI2
-2393=TI10
-2370=TI5
-2369=TI5
-2360=TI7
-2359=TI4
-2307=TI6
-2306=TI12
-2305=TI9
-2296=TI4
-2243=TI5
-2242=TI1
-2241=TI3
-2233=TI12
-2232=TI3
-2179=TI9
-2178=TI4
-2177=TI2
-2170=TI5
-2169=TI2
-2168=TI5
-2139=TI2
-2138=TI8
-2137=TI5
-2113=TI3
-2106=TI6
-2105=TI6
-2075=TI4
-2074=TI4
-2073=TI11
-2072=TI3
-2042=TI5
-2041=TI8
-2009=TI5
-2008=TI2
-2007=TI9
-1943=TI2
-1942=TI11
-1885=TI12
-1884=TI11
-1820=TI5
-1819=TI2
-1755=TI4
-1754=TI10
-1753=TI1
-1752=TI8
-1689=TI12
-1688=TI7
-1649=TI7
-1648=TI9
-1647=TI5
-1646=TI9
-1624=TI10
-1623=TI7
-1598=TI3
-1597=TI1
-1596=TI9
-1595=TI11
-1586=TI8
-1585=TI11
-1584=TI2
-1582=TI11
-1581=TI5
-1575=TI11
-1574=TI2
-1573=TI12
-1533=TI3
-1532=TI1
-1531=TI12
-1522=TI6
-1512=TI10
-1511=TI4
-1510=TI7
-1509=TI4
-1470=TI7
-1469=TI11
-1468=TI2
-1458=TI10
-1448=TI9
-1446=TI2
-1445=TI3
-1444=TI10
-1443=TI8
-1421=TI11
-1406=TI11
-1405=TI4
-1358=TI8
-1357=TI10
-1294=TI9
-1293=TI10
-1230=TI3
-1229=TI8
-1166=TI8
-1165=TI12
-1102=TI7
-1101=TI10
-1062=TI2
-1036=TI11
-1018=TI10
-1017=TI5
-1016=TI12
-998=TI6
-957=TI10
-956=TI3
-955=TI1
-934=TI12
-897=TI3
-894=TI6
-893=TI6
-870=TI6
-837=TI5
-836=TI3
-835=TI10
-834=TI7
-833=TI12
-806=TI11
-805=TI6
-804=TI7
-790=TI2
-789=TI10
-785=TI6
-772=TI11
-771=TI11
-770=TI1
-769=TI1
-741=TI8
-740=TI11
-729=TI11
-728=TI4
-727=TI10
-726=TI7
-725=TI5
-721=TI12
-720=TI11
-708=TI5
-707=TI3
-706=TI1
-677=TI6
-676=TI3
-665=TI6
-664=TI4
-663=TI10
-662=TI10
-661=TI11
-657=TI1
-656=TI9
-612=TI5
-593=TI2
-592=TI8
-529=TI5
-528=TI6
-476=TI2
-475=TI7
-465=TI12
-414=TI1
-413=TI12
-412=TI6
-411=TI11
-410=TI5
-409=TI6
-408=TI6
-407=TI2
-402=TI8
-401=TI12
-343=TI9
-342=TI3
-318=TI12
-317=TI10
-260=TI5
-259=TI6
-254=TI12
-253=TI12
-252=TI7
-196=TI4
-195=TI9
-194=TI10
-193=TI5
-190=TI6
-189=TI6
-188=TI5
-131=TI8
-130=TI9
-129=TI6
-126=TI11
-125=TI9
-124=TI7
-123=TI4
-067=TI10
-066=TI12
-065=TI1
-
-[Base]
-Count=0
-
-[SMUDGE]
diff --git a/mods/cnc/sequences-map.xml b/mods/cnc/sequences-map.xml
index bc5b10faa9..afaad26eb6 100644
--- a/mods/cnc/sequences-map.xml
+++ b/mods/cnc/sequences-map.xml
@@ -85,6 +85,10 @@
+
+
+
+
@@ -101,6 +105,10 @@
+
+
+
+
diff --git a/mods/cnc/trees.yaml b/mods/cnc/trees.yaml
index 3007aab123..be37e3b71f 100644
--- a/mods/cnc/trees.yaml
+++ b/mods/cnc/trees.yaml
@@ -28,6 +28,9 @@ T02:
T03:
Inherits: ^Tree
+T04:
+ Inherits: ^Tree
+
T05:
Inherits: ^Tree
@@ -43,6 +46,12 @@ T08:
Footprint: x_
Dimensions: 2,1
+T09:
+ Inherits: ^Tree
+ Building:
+ Footprint: x_
+ Dimensions: 2,1
+
T10:
Inherits: ^Tree
Building: