Remove "Primary" tag.

OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs

@@ -25,16 +25,25 @@ namespace OpenRA.Mods.Common.Traits
 	}
 
 	[Desc("Used together with ClassicProductionQueue.")]
-	public class PrimaryBuildingInfo : TraitInfo<PrimaryBuilding> { }
-
-	public class PrimaryBuilding : IIssueOrder, IResolveOrder, ITags
+	public class PrimaryBuildingInfo : ITraitInfo, Requires<UpgradeManagerInfo>
 	{
-		bool isPrimary = false;
-		public bool IsPrimary { get { return isPrimary; } }
+		[UpgradeGrantedReference, Desc("The upgrades to grant while the primary building.")]
+		public readonly string[] Upgrades = { "primary" };
 
-		public IEnumerable<TagType> GetTags()
+		public object Create(ActorInitializer init) { return new PrimaryBuilding(init.Self, this); }
+	}
+
+	public class PrimaryBuilding : IIssueOrder, IResolveOrder
+	{
+		readonly PrimaryBuildingInfo info;
+		readonly UpgradeManager manager;
+
+		public bool IsPrimary { get; private set; }
+
+		public PrimaryBuilding(Actor self, PrimaryBuildingInfo info)
 		{
-			yield return isPrimary ? TagType.Primary : TagType.None;
+			this.info = info;
+			manager = self.Trait<UpgradeManager>();
 		}
 
 		public IEnumerable<IOrderTargeter> Orders
@@ -53,14 +62,16 @@ namespace OpenRA.Mods.Common.Traits
 		public void ResolveOrder(Actor self, Order order)
 		{
 			if (order.OrderString == "PrimaryProducer")
-				SetPrimaryProducer(self, !isPrimary);
+				SetPrimaryProducer(self, !IsPrimary);
 		}
 
 		public void SetPrimaryProducer(Actor self, bool state)
 		{
 			if (state == false)
 			{
-				isPrimary = false;
+				IsPrimary = false;
+				foreach (var up in info.Upgrades)
+					manager.RevokeUpgrade(self, up, this);
 				return;
 			}
 
@@ -78,7 +89,9 @@ namespace OpenRA.Mods.Common.Traits
 					b.Trait.SetPrimaryProducer(b.Actor, false);
 			}
 
-			isPrimary = true;
+			IsPrimary = true;
+			foreach (var up in info.Upgrades)
+				manager.GrantUpgrade(self, up, this);
 
 			Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", "PrimaryBuildingSelected", self.Owner.Faction.InternalName);
 		}

OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
 	{
 		// depends on the order of pips in TraitsInterfaces.cs!
 		static readonly string[] PipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue", "pip-ammo", "pip-ammoempty" };
-		static readonly string[] TagStrings = { "", "tag-primary" };
+		static readonly string[] TagStrings = { "" };
 
 		public readonly SelectionDecorationsInfo Info;
 		readonly Actor self;

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -2749,6 +2749,19 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						node.Value.Nodes.Add(new MiniYamlNode("ReferencePoint", "Top"));
 						node.Value.Nodes.Add(new MiniYamlNode("ZOffset", "256"));
 					}
+
+					if (depth == 0 && node.Value.Nodes.Any(n => n.Key.StartsWith("PrimaryBuilding")))
+					{
+						var decNodes = new List<MiniYamlNode>();
+						decNodes.Add(new MiniYamlNode("RequiresSelection", "true"));
+						decNodes.Add(new MiniYamlNode("Image", "pips"));
+						decNodes.Add(new MiniYamlNode("Sequence", "tag-primary"));
+						decNodes.Add(new MiniYamlNode("ReferencePoint", "Top"));
+						decNodes.Add(new MiniYamlNode("ZOffset", "256"));
+						decNodes.Add(new MiniYamlNode("UpgradeTypes", "primary"));
+						decNodes.Add(new MiniYamlNode("UpgradeMinEnabledLevel", "1"));
+						node.Value.Nodes.Add(new MiniYamlNode("WithDecoration@primary", new MiniYaml("", decNodes)));
+					}
 				}
 
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);