Implements a disguise decoration to Spies. Deprecates WithDecorationDisguised in favor of a refactor in Disguise.

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -114,7 +114,6 @@
     <Compile Include="Scripting\Properties\ParadropProperties.cs" />
     <Compile Include="Scripting\Properties\ParatroopersProperties.cs" />
     <Compile Include="Traits\Render\WithDisguisingInfantryBody.cs" />
-    <Compile Include="Traits\Render\WithDecorationDisguised.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

OpenRA.Mods.RA/Traits/Disguise.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -61,18 +62,15 @@ namespace OpenRA.Mods.RA.Traits
 	{
 		[VoiceReference] public readonly string Voice = "Action";
 
+		[UpgradeGrantedReference]
+		[Desc("Upgrades to grant when disguised.")]
+		public readonly string[] Upgrades = { "disguise" };
+
 		public object Create(ActorInitializer init) { return new Disguise(init.Self, this); }
 	}
 
 	class Disguise : IEffectiveOwner, IIssueOrder, IResolveOrder, IOrderVoice, IRadarColorModifier, INotifyAttack
 	{
-		readonly DisguiseInfo info;
-
-		public Disguise(Actor self, DisguiseInfo info)
-		{
-			this.info = info;
-		}
-
 		public Player AsPlayer { get; private set; }
 		public string AsSprite { get; private set; }
 		public ITooltipInfo AsTooltipInfo { get; private set; }
@@ -80,6 +78,18 @@ namespace OpenRA.Mods.RA.Traits
 		public bool Disguised { get { return AsPlayer != null; } }
 		public Player Owner { get { return AsPlayer; } }
 
+		readonly Actor self;
+		readonly DisguiseInfo info;
+		readonly Lazy<UpgradeManager> um;
+
+		public Disguise(Actor self, DisguiseInfo info)
+		{
+			this.self = self;
+			this.info = info;
+
+			um = Exts.Lazy(() => self.TraitOrDefault<UpgradeManager>());
+		}
+
 		public IEnumerable<IOrderTargeter> Orders
 		{
 			get
@@ -101,7 +111,7 @@ namespace OpenRA.Mods.RA.Traits
 			if (order.OrderString == "Disguise")
 			{
 				var target = order.TargetActor != self && order.TargetActor.IsInWorld ? order.TargetActor : null;
-				DisguiseAs(self, target);
+				DisguiseAs(target);
 			}
 		}
 
@@ -118,8 +128,9 @@ namespace OpenRA.Mods.RA.Traits
 			return AsPlayer.Color.RGB;
 		}
 
-		void DisguiseAs(Actor self, Actor target)
+		void DisguiseAs(Actor target)
 		{
+			var oldDisguiseSetting = Disguised;
 			var oldEffectiveOwner = AsPlayer;
 
 			if (target != null)
@@ -150,8 +161,22 @@ namespace OpenRA.Mods.RA.Traits
 
 			foreach (var t in self.TraitsImplementing<INotifyEffectiveOwnerChanged>())
 				t.OnEffectiveOwnerChanged(self, oldEffectiveOwner, AsPlayer);
+
+			if (Disguised != oldDisguiseSetting && um.Value != null)
+			{
+				foreach (var u in info.Upgrades)
+				{
+					if (!um.Value.AcceptsUpgrade(self, u))
+						continue;
+
+					if (Disguised)
+						um.Value.GrantUpgrade(self, u, this);
+					else
+						um.Value.RevokeUpgrade(self, u, this);
+				}
+			}
 		}
 
-		public void Attacking(Actor self, Target target, Armament a, Barrel barrel) { DisguiseAs(self, null); }
+		public void Attacking(Actor self, Target target, Armament a, Barrel barrel) { DisguiseAs(null); }
 	}
 }

OpenRA.Mods.RA/Traits/Render/WithDecorationDisguised.cs

@@ -1,42 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, 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. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA.Traits
-{
-	public class WithDecorationDisguisedInfo : WithDecorationInfo, Requires<DisguiseInfo>
-	{
-		[Desc("Require an active disguise to render this decoration?")]
-		public readonly bool RequireDisguise = true;
-
-		public override object Create(ActorInitializer init) { return new WithDecorationDisguised(init.Self, this); }
-	}
-
-	public class WithDecorationDisguised : WithDecoration
-	{
-		readonly WithDecorationDisguisedInfo info;
-		readonly Disguise disguise;
-
-		public WithDecorationDisguised(Actor self, WithDecorationDisguisedInfo info)
-			: base(self, info)
-		{
-			this.info = info;
-			disguise = self.Trait<Disguise>();
-		}
-
-		public override bool ShouldRender(Actor self)
-		{
-			return !info.RequireDisguise || disguise.Disguised;
-		}
-	}
-}

mods/ra/rules/infantry.yaml

@@ -235,6 +235,15 @@ SPY:
 		AttackSequence: shoot
 		IdleSequences: idle1,idle2
 		StandSequences: stand,stand2
+	WithDecoration@disguise:
+		Image: pips
+		Sequence: pip-disguise
+		Palette: effect
+		ReferencePoint: Top, Right
+		Offset: 4, -2
+		ZOffset: 256
+		UpgradeTypes: disguise
+		UpgradeMinEnabledLevel: 1
 	Armament:
 		Weapon: SilencedPPK
 	AttackFrontal:

mods/ra/sequences/misc.yaml

@@ -84,6 +84,9 @@ pips:
 		Start: 4
 	pip-blue: pips2
 		Start: 5
+	pip-disguise: pip-disguise
+		Length: *
+		Tick: 300
 
 v2:
 	idle:

mods/ts/rules/civilian-infantry.yaml

@@ -58,6 +58,15 @@ CHAMSPY:
 		Range: 9c0
 	Passenger:
 	Disguise:
+	WithDecoration@disguise:
+		Image: pips
+		Sequence: pip-disguise
+		Palette: pips
+		ReferencePoint: Top, Right
+		Offset: 4, -2
+		ZOffset: 256
+		UpgradeTypes: disguise
+		UpgradeMinEnabledLevel: 1
 	Infiltrates:
 		Types: SpyInfiltrate
 	-AutoTarget:

mods/ts/sequences/misc.yaml

@@ -94,6 +94,9 @@ pips:
 	pip-ammo: ammopips
 	pip-ammoempty: ammopips
 		Start: 1
+	pip-disguise: pip-disguise
+		Length: *
+		Tick: 300
 # TODO:
 	pip-empty-building:
 	pip-green-building: