diff --git a/mods/ra/maps/bomber-john/rules.yaml b/mods/ra/maps/bomber-john/rules.yaml index dd1f3b6566..2d92b36338 100644 --- a/mods/ra/maps/bomber-john/rules.yaml +++ b/mods/ra/maps/bomber-john/rules.yaml @@ -119,7 +119,7 @@ FTUR: BeginChargeSound: chrochr1.aud EndChargeSound: chrordy1.aud Range: 3 - GrantUpgradePower@IRONCURTAIN: + GrantExternalConditionPower@IRONCURTAIN: Icon: invuln ChargeTime: 30 Description: Invulnerability @@ -129,8 +129,9 @@ FTUR: BeginChargeSound: ironchg1.aud EndChargeSound: ironrdy1.aud Range: 1 - Upgrades: invulnerability - GrantUpgradeSequence: idle + Condition: invulnerability + Sequence: idle + OnFireSound: ironcur9.aud Power: Amount: 0 @@ -186,7 +187,7 @@ T17: Duration: 999999 KillCargo: yes Range: 3 - GrantUpgradePower@IRONCURTAIN: + GrantExternalConditionPower@IRONCURTAIN: Icon: invuln ChargeTime: 30 Description: Invulnerability @@ -196,5 +197,6 @@ T17: BeginChargeSound: ironchg1.aud EndChargeSound: ironrdy1.aud Range: 1 - Upgrades: invulnerability - GrantUpgradeSequence: idle + Condition: invulnerability + Sequence: idle + OnFireSound: ironcur9.aud diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index 22def065b8..3ac6f9f0f0 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -69,11 +69,11 @@ FORTCRATE: GiveUnitCrateAction@e7: Units: e7 SelectionShares: 10 - GrantUpgradeCrateAction@ironcurtain: + GrantExternalConditionCrateAction@ironcurtain: SelectionShares: 10 Effect: invuln Notification: ironcur9.aud - Upgrades: invulnerability + Condition: invulnerability Duration: 1200 ExplodeCrateAction@bigboom: Weapon: SCUD diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index d7ad8b18c0..f6347c96af 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -15,7 +15,7 @@ ^GainsExperience: GainsExperience: - Upgrades: + Upgrades: 200: rank-veteran-1 400: rank-veteran-2 800: rank-veteran-3 @@ -121,8 +121,10 @@ DamageMultiplier@IRONCURTAIN: RequiresCondition: invulnerability Modifier: 0 - TimedUpgradeBar: - Upgrade: invulnerability + TimedConditionBar: + Condition: invulnerability + ExternalConditions@INVULNERABILITY: + Conditions: invulnerability ^Vehicle: Inherits@1: ^ExistsInWorld diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index d0e626927c..6054918c4c 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -90,11 +90,11 @@ CRATE: Units: e1,e1,e4,e4,e3,e3,e3 ValidFactions: soviet, russia, ukraine TimeDelay: 4500 - GrantUpgradeCrateAction@invuln: + GrantExternalConditionCrateAction@invuln: SelectionShares: 5 Effect: invuln Notification: ironcur9.aud - Upgrades: invulnerability + Condition: invulnerability Duration: 600 MONEYCRATE: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 58730edadc..d485a486c2 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -303,7 +303,7 @@ IRON: Range: 10c0 Bib: HasMinibib: Yes - GrantUpgradePower@IRONCURTAIN: + GrantExternalConditionPower@IRONCURTAIN: Icon: invuln ChargeTime: 120 Description: Invulnerability @@ -314,7 +314,8 @@ IRON: BeginChargeSpeechNotification: IronCurtainCharging EndChargeSpeechNotification: IronCurtainReady DisplayRadarPing: True - Upgrades: invulnerability + Condition: invulnerability + OnFireSound: ironcur9.aud SupportPowerChargeBar: Power: Amount: -200