Replace UnitTraitOrderTargeter with TargetTypeOrderTargeter.

This also makes naval buildings untargetable for c4 and demo trucks, as they don't make much sense.

OpenRA.Mods.RA/C4Demolition.cs

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA
 
 		public IEnumerable<IOrderTargeter> Orders
 		{
-			get { yield return new UnitTraitOrderTargeter<C4Demolishable>("C4", 6, "c4", true, false); }
+			get { yield return new TargetTypeOrderTargeter("C4", "C4", 6, "c4", true, false); }
 		}
 
 		public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
@@ -62,7 +62,4 @@ namespace OpenRA.Mods.RA
 			return (order.OrderString == "C4") ? "Attack" : null;
 		}
 	}
-
-	class C4DemolishableInfo : TraitInfo<C4Demolishable> { }
-	class C4Demolishable { }
 }

OpenRA.Mods.RA/Captures.cs

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA
 
 		public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
 		{
-			if( order.OrderID == "CaptureActor" )
+			if (order.OrderID == "CaptureActor")
 				return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
 
 			return null;
@@ -64,7 +64,8 @@ namespace OpenRA.Mods.RA
 		{
 			if (order.OrderString == "CaptureActor")
 			{
-				if (!CanCapture(order.TargetActor)) return;
+				if (!CanCapture(order.TargetActor))
+					return;
 
 				self.SetTargetLine(Target.FromOrder(order), Color.Red);
 
@@ -76,17 +77,17 @@ namespace OpenRA.Mods.RA
 		bool CanCapture(Actor target)
 		{
 			var c = target.TraitOrDefault<Capturable>();
-			return c != null && ( !c.CaptureInProgress || c.Captor.Owner.Stances[self.Owner] != Stance.Ally );
+			return c != null && (!c.CaptureInProgress || c.Captor.Owner.Stances[self.Owner] != Stance.Ally);
 		}
 	}
 
-	class CaptureOrderTargeter : UnitTraitOrderTargeter<Capturable>
+	class CaptureOrderTargeter : UnitOrderTargeter
 	{
 		readonly string[] captureTypes;
 		readonly Func<Actor, bool> useEnterCursor;
 
 		public CaptureOrderTargeter(string[] captureTypes, Func<Actor, bool> useEnterCursor)
-			: base( "CaptureActor", 6, "enter", true, true)
+			: base("CaptureActor", 6, "enter", true, true)
 		{
 			this.captureTypes = captureTypes;
 			this.useEnterCursor = useEnterCursor;
@@ -94,19 +95,26 @@ namespace OpenRA.Mods.RA
 
 		public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
 		{
-			if( !base.CanTargetActor( self, target, forceAttack, forceQueued, ref cursor ) ) return false;
+			if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
+				return false;
 
-			var ci = target.Info.Traits.Get<CapturableInfo>();
+			var ci = target.Info.Traits.GetOrDefault<CapturableInfo>();
-			var playerRelationship = self.Owner.Stances[ target.Owner ];
+			if (ci == null)
+				return false;
 
-			if( playerRelationship == Stance.Ally && !ci.AllowAllies ) return false;
+			var playerRelationship = self.Owner.Stances[target.Owner];
-			if( playerRelationship == Stance.Enemy && !ci.AllowEnemies ) return false;
+			if (playerRelationship == Stance.Ally && !ci.AllowAllies)
-			if( playerRelationship == Stance.Neutral && !ci.AllowNeutral ) return false;
+				return false;
+
+			if (playerRelationship == Stance.Enemy && !ci.AllowEnemies)
+				return false;
+
+			if (playerRelationship == Stance.Neutral && !ci.AllowNeutral)
+				return false;
 
 			IsQueued = forceQueued;
 
 			var Info = self.Info.Traits.Get<CapturesInfo>();
-
 			if (captureTypes.Contains(ci.Type))
 			{
 				cursor = (Info.WastedAfterwards) ? (useEnterCursor(target) ? "enter" : "enter-blocked") : "attack";

OpenRA.Mods.RA/DemoTruck.cs

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA
 		{
 			get
 			{
-				yield return new UnitTraitOrderTargeter<Building>("DemoAttack", 5, "attack", true, false) { ForceAttack = false };
+				yield return new TargetTypeOrderTargeter("DemoTruck", "DemoAttack", 5, "attack", true, false) { ForceAttack = false };
 				yield return new DeployOrderTargeter("DemoDeploy", 5);
 			}
 		}

OpenRA.Mods.RA/EngineerRepair.cs

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA
 			}
 		}
 
-		class EngineerRepairOrderTargeter : UnitTraitOrderTargeter<Building>
+		class EngineerRepairOrderTargeter : UnitOrderTargeter
 		{
 			public EngineerRepairOrderTargeter()
 				: base("EngineerRepair", 6, "goldwrench", false, true) { }

OpenRA.Mods.RA/Infiltrates.cs

@@ -88,13 +88,14 @@ namespace OpenRA.Mods.RA
 			return false;
 		}
 
-		class InfiltratorOrderTargeter : UnitTraitOrderTargeter<IAcceptInfiltrator>
+		class InfiltratorOrderTargeter : UnitOrderTargeter
 		{
 			readonly Func<Actor, bool> useEnterCursor;
 			
-			public InfiltratorOrderTargeter(Func<Actor, bool> useEnterCursor) : base("Infiltrate", 7, "enter", true, false)
+			public InfiltratorOrderTargeter(Func<Actor, bool> useEnterCursor)
+				: base("Infiltrate", 7, "enter", true, false)
 			{
-				ForceAttack=false;
+				ForceAttack = false;
 				this.useEnterCursor = useEnterCursor;
 			}
 			
@@ -102,7 +103,10 @@ namespace OpenRA.Mods.RA
 			{
 				if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
 					return false;
-				
+
+				if (!target.HasTrait<IAcceptInfiltrator>())
+					return false;
+
 				if (!useEnterCursor(target))
 					cursor = "enter-blocked";
 

OpenRA.Mods.RA/Orders/EnterBuildingOrderTargeter.cs

@@ -12,14 +12,14 @@ using System;
 
 namespace OpenRA.Mods.RA.Orders
 {
-	public class EnterOrderTargeter<T> : UnitTraitOrderTargeter<T>
+	public class EnterOrderTargeter<T> : UnitOrderTargeter
 	{
 		readonly Func<Actor, bool> canTarget;
 		readonly Func<Actor, bool> useEnterCursor;
 
-		public EnterOrderTargeter( string order, int priority, bool targetEnemy, bool targetAlly,
+		public EnterOrderTargeter(string order, int priority, bool targetEnemy, bool targetAlly,
-			Func<Actor, bool> canTarget, Func<Actor, bool> useEnterCursor )
+			Func<Actor, bool> canTarget, Func<Actor, bool> useEnterCursor)
-			: base( order, priority, "enter", targetEnemy, targetAlly )
+			: base (order, priority, "enter", targetEnemy, targetAlly)
 		{
 			this.canTarget = canTarget;
 			this.useEnterCursor = useEnterCursor;
@@ -27,8 +27,15 @@ namespace OpenRA.Mods.RA.Orders
 
 		public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
 		{
-			if( !base.CanTargetActor( self, target, forceAttack, forceQueued, ref cursor ) ) return false;
+			if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
-			if( !canTarget( target ) ) return false;
+				return false;
+
+			if (!target.HasTrait<T>())
+				return false;
+
+			if (!canTarget(target))
+				return false;
+
 			cursor = useEnterCursor(target) ? "enter" : "enter-blocked";
 			IsQueued = forceQueued;
 			return true;

OpenRA.Mods.RA/Orders/UnitOrderTargeter.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Orders
@@ -57,17 +58,23 @@ namespace OpenRA.Mods.RA.Orders
 		public virtual bool IsQueued { get; protected set; }
 	}
 
-	public class UnitTraitOrderTargeter<T> : UnitOrderTargeter
+	public class TargetTypeOrderTargeter : UnitOrderTargeter
 	{
-		public UnitTraitOrderTargeter( string order, int priority, string cursor, bool targetEnemyUnits, bool targetAllyUnits )
+		string targetType;
-			: base( order, priority, cursor, targetEnemyUnits, targetAllyUnits )
+
+		public TargetTypeOrderTargeter(string targetType, string order, int priority, string cursor, bool targetEnemyUnits, bool targetAllyUnits)
+			: base(order, priority, cursor, targetEnemyUnits, targetAllyUnits)
 		{
+			this.targetType = targetType;
 		}
 
 		public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
 		{
-			if( !base.CanTargetActor( self, target, forceAttack, forceQueued, ref cursor ) ) return false;
+			if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
-			if( !target.HasTrait<T>() ) return false;
+				return false;
+
+			if (!target.TraitsImplementing<ITargetable>().Any(t => t.TargetTypes.Contains(targetType)))
+			    return false;
 
 			IsQueued = forceQueued;
 

OpenRA.Mods.RA/Spy.cs

@@ -84,7 +84,7 @@ namespace OpenRA.Mods.RA
 		{
 			get
 			{
-				yield return new UnitTraitOrderTargeter<RenderInfantry>("Disguise", 7, "ability", true, true) { ForceAttack=false };
+				yield return new TargetTypeOrderTargeter("Disguise", "Disguise", 7, "ability", true, true) { ForceAttack=false };
 			}
 		}
 

OpenRA.Mods.RA/SupplyTruck.cs

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA
 			}
 		}
 
-		class SupplyTruckOrderTargeter : UnitTraitOrderTargeter<Building>
+		class SupplyTruckOrderTargeter : UnitOrderTargeter
 		{
 			public SupplyTruckOrderTargeter()
 				: base("DeliverSupplies", 5, "enter", false, true)
@@ -72,9 +72,14 @@ namespace OpenRA.Mods.RA
 
 			public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
 			{
-				if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor)) return false;
+				if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
-				if (target.AppearsHostileTo(self)) return false;
+					return false;
-				if (!target.HasTrait<AcceptsSupplies>()) return false;
+
+				if (target.AppearsHostileTo(self))
+					return false;
+
+				if (!target.HasTrait<AcceptsSupplies>())
+					return false;
 
 				IsQueued = forceQueued;
 				return true;

mods/cnc-classic/rules/defaults.yaml

@@ -208,7 +208,7 @@
 	Selectable:
 		Priority: 3
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Armor:
 		Type: Wood
 	RepairableBuilding:

mods/cnc/rules/defaults.yaml

@@ -225,7 +225,7 @@
 	Selectable:
 		Priority: 3
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Armor:
 		Type: Wood
 	RepairableBuilding:
@@ -267,7 +267,6 @@
 	Sellable:
 	Capturable:
 	CapturableBar:
-	C4Demolishable:
 	DebugMuzzlePositions:
 
 ^CivBuilding:
@@ -339,7 +338,7 @@
 		Adjacent: 7
 		TerrainTypes: Clear,Road
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Wall:
 		CrushClasses: wall
 		CrushSound: sandbag2.aud
@@ -356,7 +355,6 @@
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
 	Sellable:
-	C4Demolishable:
 
 ^Tree:
 	Tooltip:

mods/d2k/rules/defaults.yaml

@@ -215,7 +215,7 @@
 	Selectable:
 		Priority: 2
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Building:
 		Dimensions: 1,1
 		Footprint: x
@@ -263,6 +263,5 @@
 		Types:Building
 	Sellable:
 	GivesBounty:
-	C4Demolishable:
 	DebugMuzzlePositions:
 	Bib:

mods/d2k/rules/structures.yaml

@@ -433,7 +433,7 @@ WALL:
 	#Selectable:
 	#	Priority: 1
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	RenderBuildingWall:
 		HasMakeAnimation: false
 	#GivesExperience:

mods/ra-classic/rules/defaults.yaml

@@ -83,7 +83,7 @@
 	Selectable:
 		Voice: GenericVoice
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, Disguise
 	RenderInfantry:
 	AutoTarget:
 	AttackMove:
@@ -164,7 +164,7 @@
 	Selectable:
 		Priority: 3
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4, DemoTruck
 	Building:
 		Dimensions: 1,1
 		Footprint: x
@@ -210,7 +210,7 @@
 	Selectable:
 		Priority: 1
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4, DemoTruck
 	RenderBuildingWall:
 		HasMakeAnimation: false
 		Palette: terrain

mods/ra/rules/civilian.yaml

@@ -246,7 +246,8 @@ BARL:
 	AutoTargetIgnore:
 	Armor:
 		Type: Light
-	-C4Demolishable:
+	TargetableBuilding:
+		TargetTypes: Ground, DemoTruck
 
 BRL3:
 	Inherits: ^TechBuilding
@@ -261,7 +262,8 @@ BRL3:
 	AutoTargetIgnore:
 	Armor:
 		Type: Light
-	-C4Demolishable:
+	TargetableBuilding:
+		TargetTypes: Ground, DemoTruck
 
 MISS:
 	Inherits: ^TechBuilding

mods/ra/rules/defaults.yaml

@@ -96,7 +96,7 @@
 	Selectable:
 		Voice: GenericVoice
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, Disguise
 	RenderInfantry:
 	AutoTarget:
 	DebugRetiliateAgainstAggressor:
@@ -196,7 +196,7 @@
 	Selectable:
 		Priority: 3
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4, DemoTruck
 	Building:
 		Dimensions: 1,1
 		Footprint: x
@@ -227,7 +227,6 @@
 	AcceptsSupplies:
 	GivesBounty:
 	UpdatesPlayerStatistics:
-	C4Demolishable:
 	DebugMuzzlePositions:
 
 ^Wall:
@@ -249,7 +248,7 @@
 	Selectable:
 		Priority: 1
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4, DemoTruck
 	RenderBuildingWall:
 		HasMakeAnimation: false
 		Palette: terrain
@@ -262,7 +261,6 @@
 		Types:Wall
 	Sellable:
 	UpdatesPlayerStatistics:
-	C4Demolishable:
 
 ^TechBuilding:
 	Inherits: ^Building