Disable capturing while the make animation is playing.

2019-06-01 18:53:02 +00:00
parent 3ff8fb3cd2
commit 229bac6777
10 changed files with 6 additions and 18 deletions
--- a/mods/cnc/maps/gdi01/rules.yaml
+++ b/mods/cnc/maps/gdi01/rules.yaml
@@ -15,8 +15,6 @@ NUKE:
 	-Sellable:
 	Demolishable:
 		-Condition:
-	WithMakeAnimation:
-		-Condition:
 	Buildable:
 		BuildLimit: 1

@@ -24,8 +22,6 @@ PYLE:
 	-Sellable:
 	Demolishable:
 		-Condition:
-	WithMakeAnimation:
-		-Condition:
 	Buildable:
 		BuildLimit: 1

--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -758,6 +758,7 @@
 		SellSounds: cashturn.aud
 	CaptureManager:
 	Capturable:
+		RequiresCondition: !build-incomplete
 		Types: building-sabotage
 	WithMakeAnimation:
 		Condition: build-incomplete
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -394,6 +394,7 @@
 		AreaTypes: building
 	CaptureManager:
 	Capturable:
+		RequiresCondition: !build-incomplete
 		Types: building
 	SoundOnDamageTransition:
 		DamagedSounds: EXPLSML1.WAV
--- a/mods/ra/maps/allies-08a/rules.yaml
+++ b/mods/ra/maps/allies-08a/rules.yaml
@@ -77,8 +77,6 @@ ATEK:
 	-Sellable:
 	Demolishable:
 		-Condition:
-	WithMakeAnimation:
-		-Condition:

 PDOX:
 	Inherits@IDISABLE: ^DisableOnLowPower
@@ -91,8 +89,6 @@ PDOX:
 	-Sellable:
 	Demolishable:
 		-Condition:
-	WithMakeAnimation:
-		-Condition:

 IRON:
 	Buildable:
--- a/mods/ra/maps/allies-08b/rules.yaml
+++ b/mods/ra/maps/allies-08b/rules.yaml
@@ -73,8 +73,6 @@ ATEK:
 	GpsPower:
 		ChargeInterval: 15000
 	-Sellable:
-	WithMakeAnimation:
-		-Condition:
 	Demolishable:
 		-Condition:
 	CaptureManager:
@@ -87,8 +85,6 @@ PDOX:
 	ChronoshiftPower@chronoshift:
 		Prerequisites: ~disabled
 	-Sellable:
-	WithMakeAnimation:
-		-Condition:
 	Demolishable:
 		-Condition:
 	CaptureManager:
--- a/mods/ra/maps/fort-lonestar/rules.yaml
+++ b/mods/ra/maps/fort-lonestar/rules.yaml
@@ -175,8 +175,6 @@ TENT:
 	-Sellable:
 	Demolishable:
 		-Condition:
-	WithMakeAnimation:
-		-Condition:
 	BaseProvider:
 		Range: 12c0
 	Power:
--- a/mods/ra/maps/soviet-01/rules.yaml
+++ b/mods/ra/maps/soviet-01/rules.yaml
@@ -48,8 +48,6 @@ DOME:
 	-Sellable:
 	Demolishable:
 		-Condition:
-	WithMakeAnimation:
-		-Condition:

 POWR:
 	CaptureManager:
@@ -57,5 +55,3 @@ POWR:
 	-Sellable:
 	Demolishable:
 		-Condition:
-	WithMakeAnimation:
-		-Condition:
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -692,6 +692,7 @@
 	CaptureManager:
 		BeingCapturedCondition: being-captured
 	Capturable:
+		RequiresCondition: !build-incomplete
 		Types: building
 	CapturableProgressBar:
 	CapturableProgressBlink:
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -1423,6 +1423,8 @@ GALITE:
 	-ExternalCondition@CRATE-CLOAK:
 	MapEditorData:
 		Categories: Civilian building
+	Capturable:
+		-RequiresCondition:

 TSTLAMP:
 	Inherits: GALITE
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -359,6 +359,7 @@
 		AreaTypes: building
 	CaptureManager:
 	Capturable:
+		RequiresCondition: !build-incomplete
 		Types: building
 	RepairableBuilding:
 		RepairStep: 700