Merge remote-tracking branch 'darkademic/dev'

OpenRA.Mods.CA/Activities/Upgrade.cs

@@ -64,6 +64,8 @@ protected override void OnFirstRun(Actor self)
 				host = Target.FromActor(hostActor);
 				notifyResupplies = host.Actor.TraitsImplementing<INotifyResupply>().ToArray();
 			}
+			else
+				notifyResupplies = Array.Empty<INotifyResupply>();
 		}
 
 		/* Return true to complete. */
@@ -98,6 +100,9 @@ public override bool Tick(Actor self)
 
 			if (!isCloseEnough)
 			{
+				if (move == null)
+					return true;
+
 				QueueChild(move.MoveWithinRange(host, upgradeable.Info.UpgradeAtRange - WDist.FromCells(1), targetLineColor: targetLineColor));
 				return false;
 			}

OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs

@@ -351,7 +351,10 @@ void DoImpacts()
 					ImpactPosition = target,
 				};
 
-				args.Weapon.Impact(Target.FromPos(target), warheadArgs);
+				if (info.TrackTarget && args.Weapon.TargetActorCenter)
+					args.Weapon.Impact(args.GuidedTarget, warheadArgs);
+				else
+					args.Weapon.Impact(Target.FromPos(target), warheadArgs);
 			}
 		}
 

OpenRA.Mods.CA/Traits/Conditions/GrantTimedConditionOnDeploy.cs

@@ -72,6 +72,9 @@ public class GrantTimedConditionOnDeployInfo : PausableConditionalTraitInfo
 
 		public readonly bool StartsFullyCharged = false;
 
+		[Desc("If true, the condition will be granted instantly (not delayed by animations/activities).")]
+		public readonly bool Instant = false;
+
 		[VoiceReference]
 		public readonly string Voice = "Action";
 
@@ -171,7 +174,15 @@ void IResolveOrder.ResolveOrder(Actor self, Order order)
 				return;
 
 			if (!order.Queued)
-				self.CancelActivity();
+			{
+				if (Info.Instant)
+				{
+					Deploy();
+					return;
+				}
+				else
+					self.CancelActivity();
+			}
 
 			// Turn to the required facing.
 			if (Info.Facing != -1 && canTurn)
@@ -202,11 +213,17 @@ public void Deploy()
 				Game.Sound.Play(SoundType.World, Info.DeploySound, self.CenterPosition);
 
 			var wsb = wsbs.FirstEnabledTraitOrDefault();
+			var hasDeployAnimation = wsb != null && !string.IsNullOrEmpty(Info.DeployAnimation);
 
 			// If there is no animation to play just grant the upgrades that are used while deployed.
 			// Alternatively, play the deploy animation and then grant the upgrades.
-			if (string.IsNullOrEmpty(Info.DeployAnimation) || wsb == null)
+			if (Info.Instant || !hasDeployAnimation)
+			{
 				OnDeployCompleted();
+
+				if (hasDeployAnimation)
+					wsb.PlayCustomAnimation(self, Info.DeployAnimation);
+			}
 			else
 			{
 				if (deployingToken == Actor.InvalidConditionToken)

OpenRA.Mods.CA/Traits/TargetedLeapAbility.cs

@@ -49,7 +49,7 @@ public class TargetedLeapAbilityInfo : PausableConditionalTraitInfo, Requires<Mo
 
 		[CursorReference]
 		[Desc("Cursor to display when targeting a teleport location.")]
-		public readonly string TargetCursor = "chrono-target";
+		public readonly string TargetCursor = "ability";
 
 		[CursorReference]
 		[Desc("Cursor to display when the targeted location is blocked.")]

OpenRA.Mods.CA/Warheads/FireShrapnelWarhead.cs

@@ -48,6 +48,9 @@ public class FireShrapnelWarhead : WarheadAS, IRulesetLoaded<WeaponInfo>
 		[Desc("List of sounds that can be played on impact.")]
 		public readonly string[] ImpactSounds = Array.Empty<string>();
 
+		[Desc("Should the shrapnel target actors in order of distance?")]
+		public readonly bool TargetClosest = false;
+
 		WeaponInfo weapon;
 
 		public void RulesetLoaded(Ruleset rules, WeaponInfo info)
@@ -103,8 +106,12 @@ public override void DoImpact(in Target target, WarheadArgs args)
 						return true;
 
 					return false;
-				})
-				.Shuffle(world.SharedRandom);
+				});
+
+			if (TargetClosest)
+				availableTargetActors = availableTargetActors.OrderBy(x => (x.CenterPosition - epicenter).Length);
+			else
+				availableTargetActors = availableTargetActors.Shuffle(world.SharedRandom);
 
 			var targetActor = availableTargetActors.GetEnumerator();