Infrastructure for removing Categories and UnitCategory. Also, changed defensive structures to be in the same build-queue as normal structures. (mod it if you don't like it)

OpenRa.Game/Chrome.cs

@@ -47,7 +47,7 @@ namespace OpenRa.Game
 		// Build Palette tabs
 		string currentTab = "Building";
 		bool paletteOpen = false;
-		static string[] groups = new string[] { "Building", "Defense", "Infantry", "Vehicle", "Plane", "Ship" };
+		static string[] groups = new string[] { "Building", "Infantry", "Vehicle", "Plane", "Ship" };
 		readonly Dictionary<string, string[]> tabImageNames;
 		readonly Dictionary<string, Sprite> tabSprites;
 		
@@ -530,10 +530,10 @@ namespace OpenRa.Game
 
 			var buildableItems = Rules.TechTree.BuildableItems(Game.LocalPlayer, queueName).ToArray();
 
-			var allItems = Rules.TechTree.AllItems(Game.LocalPlayer, queueName)
-				.Where(a => Rules.NewUnitInfo[a].Traits.Contains<BuildableInfo>())
-				.Where(a => Rules.NewUnitInfo[a].Traits.Get<BuildableInfo>().Owner.Contains(Game.LocalPlayer.Race))
-				.OrderBy(a => Rules.NewUnitInfo[a].Traits.Get<BuildableInfo>().TechLevel);
+			var allBuildables = Rules.TechTree.AllBuildables(Game.LocalPlayer, queueName)
+				.Where(a => a.Traits.Contains<BuildableInfo>())
+				.Where(a => a.Traits.Get<BuildableInfo>().Owner.Contains(Game.LocalPlayer.Race))
+				.OrderBy(a => a.Traits.Get<BuildableInfo>().TechLevel);
 
 			var queue = Game.LocalPlayer.PlayerActor.traits.Get<Traits.ProductionQueue>();
 
@@ -546,7 +546,7 @@ namespace OpenRa.Game
 
 			// Draw the icons
 			int lasty = -1;
-			foreach (var item in allItems)
+			foreach (var item in allBuildables)
 			{
 				// Draw the background for this row
 				if (y != lasty)
@@ -560,12 +560,12 @@ namespace OpenRa.Game
 				var drawPos = Game.viewport.Location + new float2(rect.Location);
 				var isBuildingSomething = queue.CurrentItem(queueName) != null;
 
-				shpRenderer.DrawSprite(tabSprites[item], drawPos, PaletteType.Chrome);
+				shpRenderer.DrawSprite(tabSprites[item.Name], drawPos, PaletteType.Chrome);
 
-				var firstOfThis = queue.AllItems(queueName).FirstOrDefault(a => a.Item == item);
+				var firstOfThis = queue.AllItems(queueName).FirstOrDefault(a => a.Item == item.Name);
 
 				if (rect.Contains(lastMousePos.ToPoint()))
-					tooltipItem = item;
+					tooltipItem = item.Name;
 
 				var overlayPos = drawPos + new float2((64 - ready.Image.size.X) / 2, 2);
 
@@ -589,7 +589,7 @@ namespace OpenRa.Game
 						overlayBits.Add(Pair.New(ready.Image, overlayPos));
 					}
 
-					var repeats = queue.AllItems(queueName).Count(a => a.Item == item);
+					var repeats = queue.AllItems(queueName).Count(a => a.Item == item.Name);
 					if (repeats > 1 || queue.CurrentItem(queueName) != firstOfThis)
 					{
 						var offset = -22;
@@ -604,11 +604,11 @@ namespace OpenRa.Game
 					}
 				}
 				else
-					if (!buildableItems.Contains(item) || isBuildingSomething)
+					if (!buildableItems.Contains(item.Name) || isBuildingSomething)
 						overlayBits.Add(Pair.New(cantBuild.Image, drawPos));
 
-				var closureItem = item;
-				AddButton(rect, isLmb => HandleBuildPalette(closureItem, isLmb));
+				var closureItemName = item.Name;
+				AddButton(rect, isLmb => HandleBuildPalette(closureItemName, isLmb));
 
 	
 				if (++x == columns) { x = 0; y++; }
@@ -645,7 +645,7 @@ namespace OpenRa.Game
 		void StartProduction( string item )
 		{
 			var group = Rules.UnitCategory[item];
-			Sound.Play((group == "Building" || group == "Defense") ? "abldgin1.aud" : "train1.aud");
+			Sound.Play((group == "Building") ? "abldgin1.aud" : "train1.aud");
 			Game.controller.AddOrder(Order.StartProduction(Game.LocalPlayer, item));
 		}
 
@@ -664,7 +664,7 @@ namespace OpenRa.Game
 				{
 					if (producing.Done)
 					{
-						if (group == "Building" || group == "Defense")
+						if (group == "Building")
 							Game.controller.orderGenerator = new PlaceBuildingOrderGenerator(player.PlayerActor, item);
 						return;
 					}

OpenRa.Game/GameRules/NewUnitInfo.cs

@@ -8,15 +8,24 @@ namespace OpenRa.Game.GameRules
 {
 	class NewUnitInfo
 	{
-		public readonly TypeDictionary Traits = new TypeDictionary();
 		public readonly string Name;
+		public readonly string Category;
+		public readonly TypeDictionary Traits = new TypeDictionary();
 
 		public NewUnitInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
-			Name = name;
+			var mergedNode = MergeWithParent( node, allUnits ).Nodes;
 
-			foreach( var t in MergeWithParent( node, allUnits ).Nodes )
-				if( t.Key != "Inherits" )
+			Name = name;
+			MiniYaml categoryNode;
+			if( mergedNode.TryGetValue( "Category", out categoryNode ) )
+				Category = categoryNode.Value;
+
+			if( Rules.UnitCategory.ContainsKey( name ) && Category != Rules.UnitCategory[ name ] )
+				throw new NotImplementedException( "wrong category");
+
+			foreach( var t in mergedNode )
+				if( t.Key != "Inherits" && t.Key != "Category" )
 					Traits.Add( LoadTraitInfo( t.Key, t.Value ) );
 		}
 

OpenRa.Game/GameRules/Rules.cs

@@ -56,7 +56,6 @@ namespace OpenRa.Game
 
 			LoadCategories(
 				"Building",
-				"Defense",
 				"Infantry",
 				"Vehicle",
 				"Ship",

OpenRa.Game/GameRules/TechTree.cs

@@ -11,9 +11,8 @@ namespace OpenRa.Game.GameRules
 
 		public TechTree()
 		{
-			foreach( var b in Rules.Categories[ "Building" ] )
+			foreach( var info in Rules.NewUnitInfo.Values )
 			{
-				var info = Rules.NewUnitInfo[ b ];
 				var pi = info.Traits.GetOrDefault<ProductionInfo>();
 				if (pi != null)
 					foreach( var p in pi.Produces )
@@ -51,19 +50,22 @@ namespace OpenRa.Game.GameRules
 				return false;
 
 			return true;
-		} 
+		}
 
 		public IEnumerable<string> BuildableItems( Player player, params string[] categories )
 		{
 			var playerBuildings = GatherBuildings( player );
-			foreach( var unit in categories.SelectMany( x => Rules.Categories[ x ] ).Select( x => Rules.NewUnitInfo[ x ] ) )
+			foreach( var unit in AllBuildables( player, categories ) )
 				if( CanBuild( unit, player, playerBuildings ) )
 					yield return unit.Name;
 		}
 
-		public IEnumerable<string> AllItems(Player player, params string[] categories)
+		public IEnumerable<NewUnitInfo> AllBuildables(Player player, params string[] categories)
 		{
-			return categories.SelectMany(x => Rules.Categories[x]).Select(x => Rules.NewUnitInfo[x].Name);
+			return Rules.NewUnitInfo.Values
+				.Where( x => x.Name[ 0 ] != '^' )
+				.Where( x => categories.Contains( Rules.UnitCategory[ x.Name ] ) )
+				.Where( x => x.Traits.Contains<BuildableInfo>() );
 		}
 
 		public IEnumerable<NewUnitInfo> UnitBuiltAt( NewUnitInfo info )

OpenRa.Game/Traits/ProductionQueue.cs

@@ -52,7 +52,7 @@ namespace OpenRa.Game.Traits
 							() => Game.world.AddFrameEndTask(
 								_ =>
 								{
-									var isBuilding = group == "Building" || group == "Defense";
+									var isBuilding = group == "Building";
 									if( !hasPlayedSound && order.Player == Game.LocalPlayer )
 									{
 										Sound.Play( isBuilding ? "conscmp1.aud" : "unitrdy1.aud" );