diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 71363ace40..1c53911fae 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -125,11 +125,11 @@ CloakDelay: 90 CloakSound: trans1.aud UncloakSound: trans1.aud - RequiresCondition: cloak && !uncloak + RequiresCondition: cloak-crate-collected && !cloak-force-disabled ExternalCondition@CLOAK: - Condition: cloak + Condition: cloak-crate-collected GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical ^Vehicle: diff --git a/mods/cnc/rules/misc.yaml b/mods/cnc/rules/misc.yaml index efeab016f0..97be8cc0e8 100644 --- a/mods/cnc/rules/misc.yaml +++ b/mods/cnc/rules/misc.yaml @@ -19,7 +19,7 @@ CRATE: GrantExternalConditionCrateAction@cloak: SelectionShares: 5 Effect: cloak - Condition: cloak + Condition: cloak-crate-collected GiveMcvCrateAction: SelectionShares: 0 NoBaseSelectionShares: 120 diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index c4e1b50e9c..d22ff46b6d 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -547,9 +547,9 @@ STNK: CloakDelay: 90 CloakSound: trans1.aud UncloakSound: trans1.aud - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical Armament: Weapon: 227mm.stnk diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 65803d9396..5221b9f457 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -152,9 +152,9 @@ fremen: CloakSound: STEALTH1.WAV UncloakSound: STEALTH2.WAV IsPlayerPalette: true - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical -MustBeDestroyed: Voiced: @@ -250,9 +250,9 @@ saboteur: UncloakSound: STEALTH2.WAV UncloakOn: Attack, Unload, Infiltrate, Demolish, Move, Damage IsPlayerPalette: true - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical Voiced: VoiceSet: SaboteurVoice diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 95921990c3..ab75f5bd15 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -394,9 +394,9 @@ stealth_raider: CloakSound: STEALTH1.WAV UncloakSound: STEALTH2.WAV IsPlayerPalette: true - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical AutoTarget: InitialStance: HoldFire diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index c7547d592d..a291b986b5 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -508,9 +508,9 @@ HIJACKER: UncloakOn: Attack, Unload, Infiltrate, Demolish, Move CloakTypes: Cloak, Hijacker IsPlayerPalette: true - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical Mobile: Speed: 85 @@ -593,9 +593,9 @@ SNIPER: UncloakSound: UncloakOn: Attack, Unload, Infiltrate, Demolish, Move IsPlayerPalette: true - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical DetectCloaked: CloakTypes: Cloak, Hijacker diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index c391718cba..bf4d35046d 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -36,9 +36,9 @@ SS: UncloakSound: subshow1.aud CloakedCondition: underwater Palette: submerged - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical Armament: Weapon: TorpTube @@ -97,9 +97,9 @@ MSUB: UncloakSound: subshow1.aud CloakedCondition: underwater Palette: submerged - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical Armament@PRIMARY: Weapon: SubMissile diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 681e22f34e..0e2614d6db 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -626,9 +626,9 @@ HBOX: InitialDelay: 125 CloakDelay: 60 IsPlayerPalette: true - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical Turreted: TurnSpeed: 255 diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 4583796ac5..ffe6bd14b0 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -779,9 +779,9 @@ STNK: CloakSound: appear1.aud UncloakSound: appear1.aud IsPlayerPalette: true - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical DetectCloaked: Range: 7c0 diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 4b75676b32..71080cbf7e 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -396,9 +396,9 @@ STNK: UncloakSound: cloak5.aud IsPlayerPalette: true UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage - RequiresCondition: !uncloak + RequiresCondition: !cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: - Condition: uncloak + Condition: cloak-force-disabled ValidDamageStates: Critical Armament: Weapon: Dragon