From b014af11b0b588fc5569d3a4b76d7e5953186968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Fri, 14 Feb 2014 13:28:06 +0100
Subject: [PATCH 1/2] allow vehicle demolition with C4 in ra and d2k

---
 CHANGELOG                    | 4 +++-
 mods/d2k/rules/defaults.yaml | 6 ++++--
 mods/ra/rules/defaults.yaml  | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c59d25b2e8..583b47201e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ NEW:
 		Shroud is now displayed by default again (disable it in the lobby settings).
 		Removed the build radius restrictions.
 		Added the BLOXXMAS terrain tiles from the 1.06 patch.
+		Saboteur can now plant C4 on vehicles.
 	Red Alert:
 		Transports will now open their doors when at shore.
 		Tanya can now plant C4 on bridges.
@@ -25,7 +26,8 @@ NEW:
 		Increased torpedo splash damage and raised multiplier vs. concrete.
 		Fixed transparency glitches in the sniper icon.
 		Removed health bars and selection boxes from walls.
-		Fixed build-limited units such as Tanya being unavailable after using the Chronosphere on a vehicle she is in.
+		Fixed Tanya being unavailable after using the Chronosphere on a vehicle she is in.
+		Tanya can now plant C4 on vehicles.
 	Tiberian Dawn:
 		Commando can now plant C4 on bridges.
 		Added the Asset Browser to the Extras menu.
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index 06249ec5d9..7662ad9118 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -15,7 +15,7 @@
 	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Passenger:
 		CargoType: Vehicle
 	AttackMove:
@@ -37,6 +37,7 @@
 	UpdatesPlayerStatistics:
 	Huntable:
 	LuaScriptEvents:
+	Demolishable:
 
 ^Tank:
 	AppearsOnRadar:
@@ -55,7 +56,7 @@
 	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Passenger:
 		CargoType: Vehicle
 	AttackMove:
@@ -77,6 +78,7 @@
 	UpdatesPlayerStatistics:
 	Huntable:
 	LuaScriptEvents:
+	Demolishable:
 
 ^Husk:
 	Health:
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 68614ca384..0b2e0ee669 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -15,7 +15,7 @@
 	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Repairable:
 	Chronoshiftable:
 	Passenger:
@@ -45,6 +45,7 @@
 		EjectInAir: no
 	Huntable:
 	LuaScriptEvents:
+	Demolishable:
 
 ^Tank:
 	AppearsOnRadar:
@@ -63,7 +64,7 @@
 	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Repairable:
 	Chronoshiftable:
 	Passenger:
@@ -93,6 +94,7 @@
 		EjectInAir: no
 	Huntable:
 	LuaScriptEvents:
+	Demolishable:
 
 ^Infantry:
 	AppearsOnRadar:

From e7874b850d85afbd4177205a6d75769abc65b401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Fri, 31 Jan 2014 13:13:49 +0100
Subject: [PATCH 2/2] never allow C4 on barrels

---
 mods/ra/rules/civilian.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index 4461fbcc5a..e0aab116ba 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -274,6 +274,7 @@ BARL:
 		TargetTypes: Ground, DemoTruck
 	-ShakeOnDeath:
 	-SoundOnDamageTransition:
+	-Demolishable:
 
 BRL3:
 	Inherits: ^TechBuilding
@@ -292,6 +293,7 @@ BRL3:
 		TargetTypes: Ground, DemoTruck
 	-ShakeOnDeath:
 	-SoundOnDamageTransition:
+	-Demolishable:
 
 AMMOBOX1:
 	Inherits: ^AmmoBox