Have Tanya not shoot her pistols at buildings, and have her shoot pistols at barrels instead of using C4 on them

OpenRA.Mods.RA/C4Demolition.cs

@@ -10,8 +10,8 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using OpenRA.Effects;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Orders;
 using OpenRA.Traits;
@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA
 
 		public IEnumerable<IOrderTargeter> Orders
 		{
-			get { yield return new UnitTraitOrderTargeter<Building>( "C4", 6, "c4", true, false ); }
+			get { yield return new UnitTraitOrderTargeter<C4Demolishable>("C4", 6, "c4", true, false); }
 		}
 
 		public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
@@ -65,4 +65,7 @@ namespace OpenRA.Mods.RA
 			return (order.OrderString == "C4") ? "Attack" : null;
 		}
 	}
+
+	class C4DemolishableInfo : TraitInfo<C4Demolishable> { }
+	class C4Demolishable { }
 }

mods/cnc/rules/defaults.yaml

@@ -249,6 +249,7 @@
 	Sellable:
 	Capturable:
 	CapturableBar:
+	C4Demolishable:
 
 ^CivBuilding:
 	Inherits: ^Building
@@ -336,6 +337,7 @@
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
 	Sellable:
+	C4Demolishable:
 
 ^Tree:
 	Tooltip:

mods/d2k/rules/defaults.yaml

@@ -257,3 +257,4 @@
 		Types:Building
 	Sellable:
 	GivesBounty:
+	C4Demolishable:

mods/ra/maps/allies-01/map.yaml

@@ -359,7 +359,7 @@ Rules:
 			Range: 0
 	E7:
 		AutoTarget:
-			InitialStance: ReturnFire
+			InitialStance: Defend
 		Passenger:
 			Weight: 0
 	EINSTEIN:

mods/ra/maps/allies-02/map.yaml

@@ -2875,7 +2875,7 @@ Rules:
 			Damage: 0
 	E7:
 		AutoTarget:
-			InitialStance: ReturnFire
+			InitialStance: Defend
 		Passenger:
 			Weight: 0
 		Buildable:

mods/ra/rules/civilian.yaml

@@ -241,6 +241,9 @@ BARL:
 	Tooltip:
 		Name: Explosive Barrel
 	AutoTargetIgnore:
+	Armor:
+		Type: Light
+	-C4Demolishable:
 
 BRL3:
 	Inherits: ^TechBuilding
@@ -253,6 +256,9 @@ BRL3:
 	Tooltip:
 		Name: Explosive Barrel
 	AutoTargetIgnore:
+	Armor:
+		Type: Light
+	-C4Demolishable:
 
 MISS:
 	Inherits: ^TechBuilding

mods/ra/rules/defaults.yaml

@@ -217,6 +217,7 @@
 	AcceptsSupplies:
 	GivesBounty:
 	UpdatesPlayerStatistics:
+	C4Demolishable:
 
 ^Wall:
 	AppearsOnRadar:
@@ -250,6 +251,7 @@
 		Types:Wall
 	Sellable:
 	UpdatesPlayerStatistics:
+	C4Demolishable:
 
 ^TechBuilding:
 	Inherits: ^Building

mods/ra/weapons.yaml

@@ -7,11 +7,11 @@ Colt45:
 	Warhead:
 		Spread: 1
 		Versus:
-			Wood: 5%
+			Wood: 0%
 			Light: 5%
 			Heavy: 5%
 			Cybernetic: 5%
-			Concrete: 5%
+			Concrete: 0%
 		Explosion: piff
 		InfDeath: 2
 		Damage: 50