Standardise Theater -> Tileset.

OpenRA.Editor/Form1.cs

@@ -94,7 +94,7 @@ namespace OpenRA.Editor
 		void PrepareMapResources(Manifest manifest, Map map)
 		{
 			Rules.LoadRules(manifest, map);
-			tileset = Rules.TileSets[map.Theater];
+			tileset = Rules.TileSets[map.Tileset];
 			tileset.LoadTiles();
 			var palette = new Palette(FileSystem.Open(tileset.Palette), true);
 

OpenRA.Editor/MapSelect.Designer.cs

@@ -256,7 +256,7 @@
 			this.lblTheater.Name = "lblTheater";
 			this.lblTheater.Size = new System.Drawing.Size(47, 13);
 			this.lblTheater.TabIndex = 11;
-			this.lblTheater.Text = "Theater:";
+			this.lblTheater.Text = "Tileset:";
 			// 
 			// txtAuthor
 			// 

OpenRA.Editor/MapSelect.cs

@@ -42,7 +42,7 @@ namespace OpenRA.Editor
                 var map = new Map(new Folder(Path.Combine(MapFolderPath, MapList.SelectedItems[0].Text), 0));
                 txtTitle.Text = map.Title;
                 txtAuthor.Text = map.Author;
-                txtTheater.Text = map.Theater;
+                txtTheater.Text = map.Tileset;
                 txtDesc.Text = map.Description;
 				pbMinimap.Image = null;
                 try

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -221,7 +221,7 @@
 			this.label4.Name = "label4";
 			this.label4.Size = new System.Drawing.Size(44, 13);
 			this.label4.TabIndex = 14;
-			this.label4.Text = "Theater";
+			this.label4.Text = "Tileset";
 			// 
 			// theater
 			// 

OpenRA.Editor/RenderUtils.cs

@@ -97,9 +97,9 @@ namespace OpenRA.Editor
 		{
 			var ri = info.Traits.Get<RenderSimpleInfo>();
 			string image = null;
-			if (ri.OverrideTheater != null)
+			if (ri.OverrideTileset != null)
-				for (int i = 0; i < ri.OverrideTheater.Length; i++)
+				for (int i = 0; i < ri.OverrideTileset.Length; i++)
-					if (ri.OverrideTheater[i] == tileset.Id)
+					if (ri.OverrideTileset[i] == tileset.Id)
 						image = ri.OverrideImage[i];
 
 			image = image ?? ri.Image ?? info.Name;

OpenRA.Game/Map.cs

@@ -52,7 +52,6 @@ namespace OpenRA
 		// Temporary compat hacks
 		public int XOffset { get { return TopLeft.X; } }
 		public int YOffset { get { return TopLeft.Y; } }
-		public string Theater { get { return Tileset; } }
 		public Rectangle Bounds { get { return Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); } }
 
 		public Map()

OpenRA.Game/ModData.cs

@@ -52,7 +52,7 @@ namespace OpenRA
 			return paths.Select(p => new MapStub(new Folder(p, int.MaxValue))).ToDictionary(m => m.Uid);
 		}
 		
-		string cachedTheatre = null;
+		string cachedTileset = null;
 		bool previousMapHadSequences = true;
 		IFolder previousMapMount = null;
 
@@ -78,13 +78,13 @@ namespace OpenRA
 
 			Rules.LoadRules(Manifest, map);
 
-			if (map.Theater != cachedTheatre 
+			if (map.Tileset != cachedTileset
 				|| previousMapHadSequences || map.Sequences.Count > 0)
 			{
 				SpriteSheetBuilder.Initialize( Rules.TileSets[map.Tileset] );
 				CursorProvider.Initialize(Manifest.Cursors);
 				SequenceProvider.Initialize(Manifest.Sequences, map.Sequences);
-				cachedTheatre = map.Theater;
+				cachedTileset = map.Tileset;
 			}
 
 			previousMapHadSequences = map.Sequences.Count > 0;

OpenRA.Game/Traits/Render/RenderSimple.cs

@@ -17,7 +17,7 @@ namespace OpenRA.Traits
 	public abstract class RenderSimpleInfo : ITraitInfo
 	{
 		public readonly string Image = null;
-		public readonly string[] OverrideTheater = null;
+		public readonly string[] OverrideTileset = null;
 		public readonly string[] OverrideImage = null;
 		public readonly string Palette = null;
 		public abstract object Create(ActorInitializer init);
@@ -35,9 +35,9 @@ namespace OpenRA.Traits
 				return cachedImage;
 			
 			var Info = self.Info.Traits.Get<RenderSimpleInfo>();
-			if (Info.OverrideTheater != null)
+			if (Info.OverrideTileset != null)
-				for (int i = 0; i < Info.OverrideTheater.Length; i++)
+				for (int i = 0; i < Info.OverrideTileset.Length; i++)
-					if (Info.OverrideTheater[i] == self.World.Map.Theater)
+					if (Info.OverrideTileset[i] == self.World.Map.Tileset)
 						return cachedImage = Info.OverrideImage[i];
 			
 			return cachedImage = Info.Image ?? self.Info.Name;

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -276,7 +276,6 @@
     <Compile Include="ReplaceWithActor.cs" />
     <Compile Include="OreRefineryDockAction.cs" />
     <Compile Include="StoresOre.cs" />
-    <Compile Include="PaletteFromCurrentTheatre.cs" />
     <Compile Include="Widgets\Delegates\OrderButtonsChromeDelegate.cs" />
     <Compile Include="RadarColorFromTerrain.cs" />
     <Compile Include="EngineerRepair.cs" />
@@ -312,6 +311,7 @@
     <Compile Include="ServerTraits\PlayerCommands.cs" />
     <Compile Include="ServerTraits\LobbyCommands.cs" />
     <Compile Include="Scripting\RASpecialPowers.cs" />
+    <Compile Include="PaletteFromCurrentTileset.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Mods.RA/PaletteFromCurrentTileset.cs

@@ -13,20 +13,20 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	class PaletteFromCurrentTheatreInfo : ITraitInfo
+	class PaletteFromCurrentTilesetInfo : ITraitInfo
 	{
 		public readonly string Name = null;
 		public readonly bool Transparent = true;
 
-		public object Create(ActorInitializer init) { return new PaletteFromCurrentTheatre(init.world, this); }
+		public object Create(ActorInitializer init) { return new PaletteFromCurrentTileset(init.world, this); }
 	}
 
-	class PaletteFromCurrentTheatre : IPalette
+	class PaletteFromCurrentTileset : IPalette
 	{
 		readonly World world;
-		readonly PaletteFromCurrentTheatreInfo info;
+		readonly PaletteFromCurrentTilesetInfo info;
 
-		public PaletteFromCurrentTheatre(World world, PaletteFromCurrentTheatreInfo info)
+		public PaletteFromCurrentTileset(World world, PaletteFromCurrentTilesetInfo info)
 		{
 			this.world = world;
 			this.info = info;

OpenRA.Mods.RA/PaletteFromFile.cs

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA
 	class PaletteFromFileInfo : ITraitInfo
 	{
 		public readonly string Name = null;
-		public readonly string Theater = null;
+		public readonly string Tileset = null;
 		public readonly string Filename = null;
 		public readonly bool Transparent = true;
 
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA
 
 		public void InitPalette( WorldRenderer wr )
 		{
-			if( info.Theater == null || info.Theater.ToLowerInvariant() == world.Map.Theater.ToLowerInvariant() )
+			if( info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant() )
 				wr.AddPalette( info.Name, new Palette( FileSystem.Open( info.Filename ), info.Transparent ) );
 		}
 	}

OpenRA.Mods.RA/PaletteFromRGBA.cs

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA
 	class PaletteFromRGBAInfo : ITraitInfo
 	{
 		public readonly string Name = null;
-		public readonly string Theatre = null;
+		public readonly string Tileset = null;
 		public readonly int R = 0;
 		public readonly int G = 0;
 		public readonly int B = 0;
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA
 
 		public void InitPalette( WorldRenderer wr )
 		{
-			if (info.Theatre == null || info.Theatre.ToLowerInvariant() == world.Map.Theater.ToLowerInvariant())
+			if (info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant())
 			{
 				// TODO: This shouldn't rely on a base palette
 				var pal = wr.GetPalette("terrain");

mods/cnc/rules/civilian.yaml

@@ -1,7 +1,7 @@
 V01:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v25
 	Building:
 		Footprint: xx xx
@@ -12,7 +12,7 @@ V01:
 V02:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v20
 	Building:
 		Footprint: xx xx
@@ -24,7 +24,7 @@ V03:
 		Footprint: xx xx
 		Dimensions: 2,2
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v21
 
 V04:
@@ -33,7 +33,7 @@ V04:
 		Footprint: xx xx
 		Dimensions: 2,2
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v24
 
 V05:
@@ -42,7 +42,7 @@ V05:
 		Footprint: xx
 		Dimensions: 2,1
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v22
 
 V06:
@@ -51,7 +51,7 @@ V06:
 		Footprint: xx
 		Dimensions: 2,1
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v26
 
 V07:
@@ -60,43 +60,43 @@ V07:
 		Footprint: xx
 		Dimensions: 2,1
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v30
 
 V08:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v23
 
 V09:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v27
 
 V10:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v28
 
 V11:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v29
 
 V12:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v34
 
 V13:
 	Inherits: ^CivBuilding
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v35
 
 V14:
@@ -121,7 +121,7 @@ V31:
 		Dimensions: 2,1
 	RenderBuilding:
 		Image: v05
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v31
 V32:
 	Inherits: ^CivBuilding
@@ -130,7 +130,7 @@ V32:
 		Dimensions: 2,1
 	RenderBuilding:
 		Image: v05
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v32
 V33:
 	Inherits: ^CivBuilding
@@ -139,7 +139,7 @@ V33:
 		Dimensions: 2,1
 	RenderBuilding:
 		Image: v05
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v33
 
 ARCO:

mods/cnc/rules/defaults.yaml

@@ -230,7 +230,7 @@
 	Tooltip:
 		Name: Field
 	RenderBuilding:
-		OverrideTheater: DESERT
+		OverrideTileset: DESERT
 		OverrideImage: v23
 
 ^Wall:

mods/cnc/rules/system.yaml

@@ -82,7 +82,7 @@ World:
 	UnitInfluence:
 	BridgeLayer:
 		Bridges: bridge1, bridge2, bridge3, bridge4
-	PaletteFromCurrentTheatre:
+	PaletteFromCurrentTileset:
 		Name: terrain
 	PaletteFromFile@chrome:
 		Name: chrome

mods/d2k/rules/system.yaml

@@ -11,7 +11,7 @@ World:
 	BuildingInfluence:
 	UnitInfluence:
 	ChooseBuildTabOnSelect:
-	PaletteFromCurrentTheatre:
+	PaletteFromCurrentTileset:
 		Name: terrain
 	PlayerColorPalette:
 		BasePalette: units

mods/ra/rules/system.yaml

@@ -147,7 +147,7 @@ World:
 		Maximum: 3
 		SpawnInterval: 120
 		WaterChance: .2
-	PaletteFromCurrentTheatre:
+	PaletteFromCurrentTileset:
 		Name: terrain
 	PaletteFromFile@chrome:
 		Name: chrome