From 03185fe46bb50965dca7ce2e40f4bdf7fab2473c Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Tue, 4 Jan 2011 11:43:46 +1300
Subject: [PATCH] Fix #429. Capturable Oil Derricks.

---
 OpenRA.Mods.RA/EngineerRepair.cs | 5 +++--
 mods/cnc/rules/tech.yaml         | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.RA/EngineerRepair.cs b/OpenRA.Mods.RA/EngineerRepair.cs
index e7ad5fc848..86732c3783 100644
--- a/OpenRA.Mods.RA/EngineerRepair.cs
+++ b/OpenRA.Mods.RA/EngineerRepair.cs
@@ -49,7 +49,6 @@ namespace OpenRA.Mods.RA
 								
 				self.CancelActivity();
 				self.QueueActivity(new Enter(order.TargetActor));
-				//self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));
 				self.QueueActivity(new RepairBuilding(order.TargetActor));
 			}
 		}
@@ -64,7 +63,9 @@ namespace OpenRA.Mods.RA
 			public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceMove, bool forceQueued, ref string cursor)
 			{
 				if( !base.CanTargetActor( self, target, forceAttack, forceMove, forceQueued, ref cursor ) ) return false;
-
+				if (!target.HasTrait<RepairableBuilding>())
+					return false;
+				
 				IsQueued = forceQueued;
 
 				if( target.GetDamageState() == DamageState.Undamaged )
diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
index 46cc12fb79..5768bb5998 100644
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -2,9 +2,12 @@
 V19:
 	Inherits: ^CivBuilding
 	RenderBuilding:
+	CashTrickler:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
+		Capturable: true
+		Unsellable: true
 	-DeadBuildingState:
 	Tooltip:
 		Name: Oil Derrick