From 229bac6777cb021a46d16e64755511cdc140e4f6 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 1 Jun 2019 18:53:02 +0000 Subject: [PATCH] Disable capturing while the make animation is playing. --- mods/cnc/maps/gdi01/rules.yaml | 4 ---- mods/cnc/rules/defaults.yaml | 1 + mods/d2k/rules/defaults.yaml | 1 + mods/ra/maps/allies-08a/rules.yaml | 4 ---- mods/ra/maps/allies-08b/rules.yaml | 4 ---- mods/ra/maps/fort-lonestar/rules.yaml | 2 -- mods/ra/maps/soviet-01/rules.yaml | 4 ---- mods/ra/rules/defaults.yaml | 1 + mods/ts/rules/civilian-structures.yaml | 2 ++ mods/ts/rules/defaults.yaml | 1 + 10 files changed, 6 insertions(+), 18 deletions(-) diff --git a/mods/cnc/maps/gdi01/rules.yaml b/mods/cnc/maps/gdi01/rules.yaml index b787a86806..f30f7cb46b 100644 --- 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 diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 5a7d0e67d4..465b27ca0b 100644 --- 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 diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 6ab7986e45..160ece3fe8 100644 --- 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 diff --git a/mods/ra/maps/allies-08a/rules.yaml b/mods/ra/maps/allies-08a/rules.yaml index a97818b2de..be2afae172 100644 --- 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: diff --git a/mods/ra/maps/allies-08b/rules.yaml b/mods/ra/maps/allies-08b/rules.yaml index f7ab51d433..27f5445370 100644 --- 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: diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index 256be6692f..eb09d2e187 100644 --- 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: diff --git a/mods/ra/maps/soviet-01/rules.yaml b/mods/ra/maps/soviet-01/rules.yaml index 0ebd33923d..73e305ae21 100644 --- 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: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 0cd8e82474..8908b71b1c 100644 --- 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: diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index 9414065e9a..8749df85df 100644 --- 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 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 2db4306124..a2a2fba4c8 100644 --- 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