Merge remote-tracking branch 'darkademic/dev'

Author: Inq8

OpenRA.Mods.CA/Traits/HarvesterBalancer.cs

@@ -49,6 +49,7 @@ public HarvesterBalancer(HarvesterBalancerInfo info)
 
 		protected override void Created(Actor self)
 		{
+			base.Created(self);
 			movingToResources = true;
 			unlinkedBuffTicks = Info.UnlinkedDuration;
 		}

OpenRA.Mods.CA/Traits/Infiltration/InfiltrateToCreateProxyActor.cs

@@ -100,6 +100,9 @@ void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<Target
 
 		void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
 		{
+			if (!info.LinkedToParent)
+				return;
+
 			foreach (var a in spawnedActors)
 			{
 				if (!a.IsDead)

OpenRA.Mods.CA/Traits/LinkedProducerSource.cs

@@ -25,9 +25,11 @@ public class LinkedProducerSource : INotifyProduction, INotifyOwnerChanged, INot
 	{
 		HashSet<LinkedProducerTarget> linkedProducerTargets = new HashSet<LinkedProducerTarget>();
 		public IEnumerable<string> ProductionTypes { get; private set; }
+		public Actor Actor { get; private set; }
 
 		public LinkedProducerSource(Actor self, LinkedProducerSourceInfo info)
 		{
+			Actor = self;
 			ProductionTypes =  self.Info.TraitInfos<ProductionInfo>().SelectMany(p => p.Produces);
 		}
 

OpenRA.Mods.CA/Traits/LinkedProducerTarget.cs

@@ -72,6 +72,7 @@ public class LinkedProducerTarget : ConditionalTrait<ConditionalTraitInfo>, IIss
 		bool delayUntilNext;
 
 		public string[] Types => info.Types;
+		public LinkedProducerSource Source => linkedProducerSource;
 
 		public LinkedProducerTarget(Actor self, LinkedProducerTargetInfo info)
 			: base(info)

OpenRA.Mods.CA/Traits/MindController.cs

@@ -164,6 +164,7 @@ public MindController(Actor self, MindControllerInfo info)
 
 		protected override void Created(Actor self)
 		{
+			base.Created(self);
 			deployTrait = self.TraitOrDefault<GrantConditionOnDeploy>();
 		}
 

OpenRA.Mods.CA/Traits/Multipliers/SeedsResourceMultiplier.cs

@@ -0,0 +1,32 @@
+#region Copyright & License Information
+/**
+ * Copyright (c) The OpenRA Combined Arms Developers (see CREDITS).
+ * This file is part of OpenRA Combined Arms, which is free software.
+ * It is made available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version. For more information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Mods.Common.Traits;
+
+namespace OpenRA.Mods.CA.Traits
+{
+	[Desc("Modifies the interval between seeding resources.")]
+	public class SeedsResourceMultiplierInfo : ConditionalTraitInfo
+	{
+		[FieldLoader.Require]
+		[Desc("Percentage modifier to apply.")]
+		public readonly int Modifier = 100;
+
+		public override object Create(ActorInitializer init) { return new SeedsResourceMultiplier(this); }
+	}
+
+	public class SeedsResourceMultiplier : ConditionalTrait<SeedsResourceMultiplierInfo>, ISeedsResourceIntervalModifier
+	{
+		public SeedsResourceMultiplier(SeedsResourceMultiplierInfo info)
+			: base(info) { }
+
+		int ISeedsResourceIntervalModifier.GetModifier() => IsTraitDisabled ? 100 : Info.Modifier;
+	}
+}

OpenRA.Mods.CA/Traits/Player/ProductionTracker.cs

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.CA.Traits
 	public class ProductionTrackerInfo : TraitInfo
 	{
 		[Desc("Maximum number of build order items to track.")]
-		public readonly int MaxBuildOrderItems = 12;
+		public readonly int MaxBuildOrderItems = 18;
 
 		public override object Create(ActorInitializer init) { return new ProductionTracker(init.Self, this); }
 	}

OpenRA.Mods.CA/Traits/Player/UpgradesManager.cs

@@ -27,17 +27,17 @@ public class UpgradesManager
 	{
 		readonly Actor self;
 		Dictionary<string, UpgradeInfo> upgrades;
-		HashSet<string> unlockedUpgradeTypes;
+		Dictionary<string, int> unlockedUpgradeTypes;
 
 		public int Hash { get; private set; }
 
-		public HashSet<string> UnlockedUpgradeTypes => unlockedUpgradeTypes;
+		public Dictionary<string, int> UnlockedUpgradeTypes => unlockedUpgradeTypes;
 
 		public UpgradesManager(Actor self, UpgradesManagerInfo info)
 		{
 			this.self = self;
 			upgrades = new Dictionary<string, UpgradeInfo>();
-			unlockedUpgradeTypes = new HashSet<string>();
+			unlockedUpgradeTypes = new Dictionary<string, int>();
 			Hash = 0;
 		}
 
@@ -79,23 +79,26 @@ public UpgradeInfo UpgradeableActorCreated(Upgradeable upgradeable, string upgra
 
 		public void UpgradeProviderCreated(string type)
 		{
-			if (IsUnlocked(type))
-				return;
+			if (unlockedUpgradeTypes.ContainsKey(type))
+				unlockedUpgradeTypes[type]++;
+			else
+				unlockedUpgradeTypes.Add(type, 1);
 
-			Update();
-
-			unlockedUpgradeTypes.Add(type);
-			var upgradeables = self.World.ActorsWithTrait<Upgradeable>().Where(x => x.Trait.Info.Type == type && x.Actor.Owner == self.Owner).ToList();
+			if (!IsUnlocked(type))
+			{
+				var upgradeables = self.World.ActorsWithTrait<Upgradeable>().Where(x => x.Trait.Info.Type == type && x.Actor.Owner == self.Owner).ToList();
 
-			foreach (var p in upgradeables)
-				p.Trait.Unlock();
+				foreach (var p in upgradeables)
+					p.Trait.Unlock();
+			}
 
 			UpgradeCompleted?.Invoke(type);
+			Update();
 		}
 
 		public bool IsUnlocked(string upgradeType)
 		{
-			return unlockedUpgradeTypes.Contains(upgradeType);
+			return unlockedUpgradeTypes.ContainsKey(upgradeType);
 		}
 
 		int CalculateCost(string sourceActorType, string targetActorType)

OpenRA.Mods.CA/Traits/ProductionQueueFromSelectionCA.cs

@@ -53,12 +53,27 @@ void INotifySelection.SelectionChanged()
 				.SelectMany(a => a.TraitsImplementing<ProductionQueue>())
 				.FirstOrDefault(q => q.Enabled);
 
+			// Linked producer queue
+			if (queue == null)
+			{
+				queue = world.Selection.Actors
+					.Where(a => a.IsInWorld && a.World.LocalPlayer == a.Owner)
+					.SelectMany(a => a.TraitsImplementing<LinkedProducerTarget>())
+					.Where(t => t.Source?.Actor != null)
+					.Select(t => t.Source.Actor)
+					.SelectMany(s => s.TraitsImplementing<ProductionQueue>())
+					.FirstOrDefault(q => q.Enabled);
+			}
+
 			// Queue-per-player
 			if (queue == null)
 			{
 				var types = world.Selection.Actors.Where(a => a.IsInWorld && a.World.LocalPlayer == a.Owner)
 					.SelectMany(a => a.TraitsImplementing<Production>().Where(p => !p.IsTraitDisabled))
-					.SelectMany(t => t.Info.Produces);
+					.SelectMany(t => t.Info.Produces)
+					.Concat(world.Selection.Actors.Where(a => a.IsInWorld && a.World.LocalPlayer == a.Owner)
+					.SelectMany(a => a.TraitsImplementing<LinkedProducerTarget>())
+					.SelectMany(t => t.Types));
 
 				queue = world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>()
 					.FirstOrDefault(q => q.Enabled && types.Contains(q.Info.Type));

OpenRA.Mods.CA/Traits/ProvidesUpgrade.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Traits;
 
 namespace OpenRA.Mods.CA.Traits
 {
@@ -22,7 +21,7 @@ public class ProvidesUpgradeInfo : ConditionalTraitInfo
 		public override object Create(ActorInitializer init) { return new ProvidesUpgrade(init.Self, this); }
 	}
 
-	public class ProvidesUpgrade : ConditionalTrait<ProvidesUpgradeInfo>, INotifyCreated
+	public class ProvidesUpgrade : ConditionalTrait<ProvidesUpgradeInfo>
 	{
 		public readonly new ProvidesUpgradeInfo Info;
 		readonly string type;
@@ -39,16 +38,6 @@ public ProvidesUpgrade(Actor self, ProvidesUpgradeInfo info)
 				type = self.Info.Name;
 		}
 
-		protected override void Created(Actor self)
-		{
-			if (IsTraitDisabled)
-				return;
-
-			upgradesManager.UpgradeProviderCreated(type);
-
-			base.Created(self);
-		}
-
 		protected override void TraitEnabled(Actor self)
 		{
 			upgradesManager.UpgradeProviderCreated(type);