Merge remote-tracking branch 'darkademic/dev' into WIPUrban

Author: Inq8

OpenRA.Mods.CA/Projectiles/ArcLaserZap.cs

@@ -74,7 +74,7 @@ public class ArcLaserZap : IProjectile, ISync
 		readonly Color color;
 
 		[Sync]
-		readonly WPos source;
+		WPos source;
 
 		int ticks = 0;
 		bool doneDamage;
@@ -104,6 +104,8 @@ public ArcLaserZap(ArcLaserZapInfo info, ProjectileArgs args, Color color)
 
 		public void Tick(World world)
 		{
+			source = args.CurrentSource();
+
 			// Beam tracks target
 			if (info.TrackTarget && args.GuidedTarget.IsValidFor(args.SourceActor))
 				target = args.Weapon.TargetActorCenter ? args.GuidedTarget.CenterPosition : args.GuidedTarget.Positions.PositionClosestTo(source);
@@ -141,13 +143,13 @@ public void Tick(World world)
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
 			if (wr.World.FogObscures(target) &&
-				wr.World.FogObscures(args.Source))
+				wr.World.FogObscures(source))
 				yield break;
 
 			if (ticks < info.Duration)
 			{
 				var rc = Color.FromArgb((info.Duration - ticks) * color.A / info.Duration, color);
-				yield return new ArcRenderable(args.Source, target, info.ZOffset, info.Angle, rc, info.Width, info.QuantizedSegments);
+				yield return new ArcRenderable(source, target, info.ZOffset, info.Angle, rc, info.Width, info.QuantizedSegments);
 			}
 
 			if (hitanim != null)

OpenRA.Mods.CA/Traits/MindControllable.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
@@ -34,21 +33,15 @@ public class MindControllableInfo : PausableConditionalTraitInfo
 		[Desc("What happens to cargo on being mind controlled, and when control is lost.")]
 		public readonly CargoBehaviour CargoBehaviour = CargoBehaviour.DoNothing;
 
-		[ActorReference(dictionaryReference: LintDictionaryReference.Keys)]
+		[GrantedConditionReference]
 		[Desc("Condition to grant when under mindcontrol.",
 			"A dictionary of [actor id]: [condition].")]
-		public readonly Dictionary<string, string> ControlledConditions = new Dictionary<string, string>();
+		public readonly string ControlledCondition = null;
 
-		[ActorReference(dictionaryReference: LintDictionaryReference.Keys)]
+		[GrantedConditionReference]
 		[Desc("Condition to grant when revoking mindcontrol.",
 			"A dictionary of [actor id]: [condition].")]
-		public readonly Dictionary<string, string> RevokingConditions = new Dictionary<string, string>();
-
-		[GrantedConditionReference]
-		public IEnumerable<string> LinterControlledConditions { get { return ControlledConditions.Values; } }
-
-		[GrantedConditionReference]
-		public IEnumerable<string> LinterRevokingConditions { get { return RevokingConditions.Values; } }
+		public readonly string RevokingCondition = null;
 
 		public override object Create(ActorInitializer init) { return new MindControllable(init.Self, this); }
 	}
@@ -90,8 +83,8 @@ public void LinkMaster(Actor self, Actor masterActor)
 			var mindController = masterActor.TraitsImplementing<MindController>().Single(mc => mc.Info.ControlType == info.ControlType);
 			Master = new TraitPair<MindController>(masterActor, mindController);
 
-			if (controlledToken == Actor.InvalidConditionToken && Info.ControlledConditions.ContainsKey(masterActor.Info.Name))
-				controlledToken = self.GrantCondition(Info.ControlledConditions[masterActor.Info.Name]);
+			if (controlledToken == Actor.InvalidConditionToken && Info.ControlledCondition != null)
+				controlledToken = self.GrantCondition(Info.ControlledCondition);
 
 			if (masterActor.Owner == creatorOwner)
 				UnlinkMaster(self);
@@ -136,8 +129,6 @@ public void RevokeMindControl(Actor self, int ticks)
 			if (Master == null)
 				return;
 
-			var masterActor = Master.Value.Actor;
-			var masterName = masterActor.Info.Name;
 			UnlinkMaster(self);
 
 			if (ticks == 0)
@@ -147,8 +138,8 @@ public void RevokeMindControl(Actor self, int ticks)
 				revokeTicks = ticks;
 				revoking = true;
 
-				if (revokingToken == Actor.InvalidConditionToken && Info.RevokingConditions.ContainsKey(masterName))
-					revokingToken = self.GrantCondition(Info.RevokingConditions[masterName]);
+				if (revokingToken == Actor.InvalidConditionToken && Info.RevokingCondition != null)
+					revokingToken = self.GrantCondition(Info.RevokingCondition);
 			}
 		}
 

OpenRA.Mods.CA/Traits/MindController.cs

@@ -288,7 +288,8 @@ public void ResolveOrder(Actor self, Order order)
 				if (order.Target.Type != TargetType.Actor)
 					return;
 
-				slaves.First(s => s.Actor == order.Target.Actor).Trait.RevokeMindControl(order.Target.Actor, 0);
+				var slave = slaves.SingleOrDefault(s => s.Actor == order.Target.Actor);
+				slave.Trait?.RevokeMindControl(order.Target.Actor, 0);
 
 				if (Info.SlaveDeployEffect == SlaveDeployEffect.Kill)
 				{
@@ -485,7 +486,7 @@ public void ReleaseSlaves(Actor self, int ticks)
 				if (s.Actor.IsDead || s.Actor.Disposed)
 					continue;
 
-				if (s.Trait.Master.Value.Actor != self)
+				if (s.Trait.Master.HasValue && s.Trait.Master.Value.Actor != self)
 					continue;
 
 				s.Trait.RevokeMindControl(s.Actor, ticks);
@@ -671,41 +672,35 @@ void INotifyEnteredCargo.OnEnteredCargo(Actor self, Actor cargo)
 		{
 			if (Info.TransferToTransport)
 			{
-				//self.World.AddFrameEndTask(w => {
-					var transportMc = cargo.TraitsImplementing<MindController>().FirstOrDefault(mc => mc.Info.ControlType == info.ControlType);
-					if (transportMc != null)
+				var transportMc = cargo.TraitsImplementing<MindController>().FirstOrDefault(mc => mc.Info.ControlType == info.ControlType);
+				if (transportMc != null)
+				{
+					foreach (var s in slaves)
 					{
-						foreach (var s in slaves)
-						{
-							if (s.Actor.IsDead || s.Actor.Disposed)
-								continue;
-
-							TextNotificationsManager.Debug("transferring {0} to {1}", s.Actor, cargo);
-							transportMc.AddSlave(cargo, s.Actor, true);
-						}
+						if (s.Actor.IsDead || s.Actor.Disposed)
+							continue;
+
+						transportMc.AddSlave(cargo, s.Actor, true);
 					}
-				//});
+				}
 			}
 		}
 
 		void INotifyExitedCargo.OnExitedCargo(Actor self, Actor cargo)
 		{
 			if (Info.TransferToTransport)
 			{
-				//self.World.AddFrameEndTask(w => {
-					var transportMc = cargo.TraitsImplementing<MindController>().FirstOrDefault(mc => mc.Info.ControlType == info.ControlType);
-					if (transportMc != null)
+				var transportMc = cargo.TraitsImplementing<MindController>().FirstOrDefault(mc => mc.Info.ControlType == info.ControlType);
+				if (transportMc != null)
+				{
+					foreach (var s in transportMc.Slaves)
 					{
-						foreach (var s in transportMc.Slaves)
-						{
-							if (s.Actor.IsDead || s.Actor.Disposed)
-								continue;
-
-							TextNotificationsManager.Debug("transferring {0} to {1}", s.Actor, self);
-							AddSlave(self, s.Actor, true);
-						}
+						if (s.Actor.IsDead || s.Actor.Disposed)
+							continue;
+
+						AddSlave(self, s.Actor, true);
 					}
-				//});
+				}
 			}
 		}
 	}

OpenRA.Mods.CA/Traits/PeriodicExplosion.cs

@@ -72,6 +72,9 @@ class PeriodicExplosion : ConditionalTrait<PeriodicExplosionInfo>, ITick, INotif
 
 		List<(int Tick, Action Action)> delayedActions = new List<(int, Action)>();
 
+		IFirepowerModifier[] firepowerModifiers;
+		IReloadModifier[] reloadModifiers;
+
 		public PeriodicExplosion(Actor self, PeriodicExplosionInfo info)
 			: base(info)
 		{
@@ -87,6 +90,17 @@ protected override void Created(Actor self)
 		{
 			ammoPool = self.TraitsImplementing<AmmoPool>().FirstOrDefault(la => la.Info.Name == Info.AmmoPoolName);
 
+			if (info.ApplyModifiers)
+			{
+				firepowerModifiers = self.TraitsImplementing<IFirepowerModifier>().ToArray();
+				reloadModifiers = self.TraitsImplementing<IReloadModifier>().ToArray();
+			}
+			else
+			{
+				firepowerModifiers = Array.Empty<IFirepowerModifier>();
+				reloadModifiers = Array.Empty<IReloadModifier>();
+			}
+
 			base.Created(self);
 		}
 
@@ -123,7 +137,7 @@ void ITick.Tick(Actor self)
 				};
 
 				if (info.ApplyModifiers)
-					args.DamageModifiers = self.TraitsImplementing<IFirepowerModifier>().Select(a => a.GetFirepowerModifier()).ToArray();
+					args.DamageModifiers = firepowerModifiers.Select(a => a.GetFirepowerModifier()).ToArray();
 
 				weapon.Impact(Target.FromPos(self.CenterPosition + localoffset), args);
 
@@ -144,7 +158,7 @@ void ITick.Tick(Actor self)
 				{
 					if (info.ApplyModifiers)
 					{
-						var modifiers = self.TraitsImplementing<IReloadModifier>().Select(m => m.GetReloadModifier());
+						var modifiers = reloadModifiers.Select(m => m.GetReloadModifier());
 						fireDelay = Util.ApplyPercentageModifiers(weapon.ReloadDelay, modifiers);
 					}
 					else

OpenRA.Mods.CA/Traits/Render/RenderLine.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.Traits;

OpenRA.Mods.CA/Traits/Render/WithFlashEffect.cs

@@ -0,0 +1,70 @@
+#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.Effects;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Primitives;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.CA.Traits.Render
+{
+	[Desc("Flashes the target at a set interval.")]
+	class WithFlashEffectInfo : ConditionalTraitInfo
+	{
+		[Desc("Interval in ticks between flashes.")]
+		public readonly int Interval = 25;
+
+		[Desc("Flash color.")]
+		public readonly Color Color = Color.FromArgb(80, Color.Red);
+
+		public override object Create(ActorInitializer init) { return new WithFlashEffect(this); }
+	}
+
+	class WithFlashEffect : ConditionalTrait<WithFlashEffectInfo>, ITick
+	{
+		public new readonly WithFlashEffectInfo Info;
+		int intervalTicks;
+
+		public WithFlashEffect(WithFlashEffectInfo info)
+			: base(info)
+		{
+			Info = info;
+		}
+
+		void ITick.Tick(Actor self)
+		{
+			if (IsTraitDisabled || !self.IsInWorld)
+				return;
+
+			if (intervalTicks == 0)
+			{
+				self.World.AddFrameEndTask(w =>
+				{
+					w.Add(new FlashTarget(self, Info.Color, 0.5f, 1, 2, 0));
+				});
+			}
+
+			intervalTicks++;
+
+			if (intervalTicks >= Info.Interval)
+				intervalTicks = 0;
+		}
+
+		protected override void TraitEnabled(Actor self)
+		{
+			intervalTicks = 0;
+		}
+
+		protected override void TraitDisabled(Actor self)
+		{
+			intervalTicks = 0;
+		}
+	}
+}

OpenRA.Mods.CA/Traits/Render/WithRadiatingCircle.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using System;
+using System.Linq;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
@@ -62,6 +62,7 @@ class WithRadiatingCircle : ConditionalTrait<WithRadiatingCircleInfo>, ITick, IR
 		Queue<RadiatingCircle> activeCircles;
 		int intervalTicks;
 		bool flash;
+		WDist radiusChangePerTick;
 
 		struct RadiatingCircle
 		{
@@ -165,7 +166,6 @@ void ITick.Tick(Actor self)
 			}
 
 			// Update all active circles
-			var radiusChangePerTick = (Info.EndRadius - Info.StartRadius) / Info.Duration;
 			var tempCircles = new Queue<RadiatingCircle>();
 			var circleCompleted = false;
 
@@ -195,7 +195,15 @@ void ITick.Tick(Actor self)
 
 		protected override void TraitEnabled(Actor self)
 		{
-			activeCircles.Enqueue(new RadiatingCircle(Info.StartRadius));
+			if (Info.Duration > 0)
+				radiusChangePerTick = (Info.EndRadius - Info.StartRadius) / Info.Duration;
+			else
+				radiusChangePerTick = WDist.Zero;
+
+			if (Info.Interval == 0 || !activeCircles.Any())
+				activeCircles.Enqueue(new RadiatingCircle(Info.StartRadius));
+
+			intervalTicks = 0;
 		}
 
 		protected override void TraitDisabled(Actor self)