From 8b12cce250f5910b498d4dceaa8c7e58a5a5db10 Mon Sep 17 00:00:00 2001
From: Mustafa Alperen Seki <mustafaoyunda37@gmail.com>
Date: Tue, 6 Oct 2020 10:35:10 +0300
Subject: [PATCH] Disable neutral Oil Derricks in TD and RA.

---
 mods/cnc/rules/tech.yaml    | 3 +++
 mods/ra/rules/civilian.yaml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
index 76015bfba0..efeb701c75 100644
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -4,6 +4,7 @@ V19:
 		Bounds: 24,24
 	CashTrickler:
 		Amount: 10
+		RequiresCondition: enabled
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -20,6 +21,8 @@ V19:
 	SpawnActorOnDeath:
 		Actor: V19.Husk
 	UpdatesDerrickCount:
+	GrantConditionOnCombatantOwner:
+		Condition: enabled
 
 V19.Husk:
 	Inherits: ^CivBuildingHusk
diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index dd1514b4ba..56e0497c14 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -545,6 +545,7 @@ OILB:
 	CashTrickler:
 		Interval: 375
 		Amount: 100
+		RequiresCondition: enabled
 	Tooltip:
 		Name: Oil Derrick
 	TooltipDescription@ally:
@@ -561,6 +562,8 @@ OILB:
 	GivesCashOnCapture:
 		Amount: 100
 	UpdatesDerrickCount:
+	GrantConditionOnCombatantOwner:
+		Condition: enabled
 
 BR1:
 	Inherits: ^Bridge