Merge pull request #3726 from pchote/cloak-fix

Cloak fixes

mods/cnc/rules/defaults.yaml

@@ -28,13 +28,18 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	AttackMove:
-	AcceptsCloakCrate:
 	WithSmoke:
 	DebugMuzzlePositions:
 	Guard:
 	Guardable:
 	BodyOrientation:
 	UpdatesPlayerStatistics:
+	Cloak:
+		RequiresCrate: true
+		InitialDelay: 15
+		CloakDelay: 90
+		CloakSound: trans1.aud
+		UncloakSound: trans1.aud
 
 ^Tank:
 	AppearsOnRadar:
@@ -66,7 +71,6 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	AttackMove:
-	AcceptsCloakCrate:
 	WithSmoke:
 	Explodes:
 		Weapon: UnitExplodeSmall
@@ -76,6 +80,12 @@
 	Guardable:
 	BodyOrientation:
 	UpdatesPlayerStatistics:
+	Cloak:
+		RequiresCrate: true
+		InitialDelay: 15
+		CloakDelay: 90
+		CloakSound: trans1.aud
+		UncloakSound: trans1.aud
 
 ^Helicopter:
 	AppearsOnRadar:

mods/cnc/rules/system.yaml

@@ -393,10 +393,6 @@ CRATE:
 		SelectionShares: 5
 	CloakCrateAction:
 		SelectionShares: 5
-		InitialDelay: 15
-		CloakDelay: 90
-		CloakSound: trans1.aud
-		UncloakSound: trans1.aud
 		Effect: cloak
 	GiveMcvCrateAction:
 		SelectionShares: 0

mods/cnc/rules/vehicles.yaml

@@ -33,7 +33,7 @@ MCV:
 	LeavesHusk:
 		HuskActor: MCV.Husk
 	-GainsExperience:
-	-AcceptsCloakCrate:
+	-Cloak:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
@@ -519,6 +519,7 @@ STNK:
 	RevealsShroud:
 		Range: 7
 	Cloak:
+		RequiresCrate: false
 		InitialDelay: 90
 		CloakDelay: 90
 		CloakSound: trans1.aud

mods/d2k/rules/system.yaml

@@ -554,13 +554,6 @@ CRATE:
 		SelectionShares: 0
 		NoBaseSelectionShares: 9001
 		Unit: mcvo
-	CloakCrateAction:
-		SelectionShares: 15
-		InitialDelay: 15
-		CloakDelay: 90
-		CloakSound: STEALTH1.WAV
-		UncloakSound: STEALTH2.WAV
-		Effect: cloak
 	RenderSimple:
 	ProximityCaptor:
 		Types:Crate