From b5390cb23cb4c8e9fe82160bc2cdff6e0c240021 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Wed, 14 Dec 2016 19:53:47 +0000
Subject: [PATCH] Split out ^AcceptsCloakCrate template.

---
 mods/cnc/rules/defaults.yaml | 18 ++++++++++--------
 mods/cnc/rules/vehicles.yaml | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 504b8dd02e..c0be31ff26 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -116,6 +116,16 @@
 		RequiresCondition: rank-elite
 		ZOffset: 256
 
+^AcceptsCloakCrate:
+	Cloak:
+		InitialDelay: 15
+		CloakDelay: 90
+		CloakSound: trans1.aud
+		UncloakSound: trans1.aud
+		RequiresCondition: cloak
+	ExternalConditions@CLOAK:
+		Conditions: cloak
+
 ^Vehicle:
 	Inherits@1: ^ExistsInWorld
 	Inherits@3: ^SpriteActor
@@ -152,14 +162,6 @@
 	Guardable:
 	Tooltip:
 		GenericName: Vehicle
-	Cloak:
-		InitialDelay: 15
-		CloakDelay: 90
-		CloakSound: trans1.aud
-		UncloakSound: trans1.aud
-		RequiresCondition: cloak
-	ExternalConditions@CLOAK:
-		Conditions: cloak
 	MustBeDestroyed:
 	Voiced:
 		VoiceSet: VehicleVoice
diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml
index d2bde44795..9adc23d032 100644
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -31,12 +31,12 @@ MCV:
 	BaseBuilding:
 	SpawnActorOnDeath:
 		Actor: MCV.Husk
-	-Cloak:
 	SelectionDecorations:
 		VisualBounds: 36,36
 
 HARV:
 	Inherits: ^Tank
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -77,6 +77,7 @@ HARV:
 APC:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -126,6 +127,7 @@ APC:
 ARTY:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -162,6 +164,7 @@ ARTY:
 FTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -196,6 +199,7 @@ FTNK:
 BGGY:
 	Inherits: ^Vehicle
 	Inherits@@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -231,6 +235,7 @@ BGGY:
 BIKE:
 	Inherits: ^Vehicle
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -268,6 +273,7 @@ BIKE:
 JEEP:
 	Inherits: ^Vehicle
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 400
 	Tooltip:
@@ -303,6 +309,7 @@ JEEP:
 LTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 700
 	Tooltip:
@@ -339,6 +346,7 @@ LTNK:
 MTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -376,6 +384,7 @@ MTNK:
 HTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -426,6 +435,7 @@ HTNK:
 MSAM:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -463,6 +473,7 @@ MSAM:
 MLRS:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@CLOAK: ^AcceptsCloakCrate
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -526,7 +537,6 @@ STNK:
 	RevealsShroud:
 		Range: 7c0
 	Cloak:
-		-RequiresCondition:
 		InitialDelay: 90
 		CloakDelay: 90
 		CloakSound: trans1.aud