TESTCASE: Add Firestorm-support logic to Iron Curtain.

OpenRA · Mar 24, 2019 · 8c100b9 · 8c100b9
1 parent d7005f9
commit 8c100b9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/mods/ra/audio/notifications.yaml b/mods/ra/audio/notifications.yaml
@@ -44,6 +44,7 @@ Speech:
 		InsufficientPower: nopowr1
 		IronCurtainCharging: ironchg1
 		IronCurtainReady: ironrdy1
+		IronCurtainActivated: ironcur9
 		KosyginFreed: kosyfre1
 		KosyginRescued: kosyres1
 		Leave: bct1

diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
@@ -171,10 +171,11 @@
 	DamageMultiplier@IRONCURTAIN:
 		RequiresCondition: invulnerability
 		Modifier: 0
-	TimedConditionBar:
-		Condition: invulnerability
-	ExternalCondition@INVULNERABILITY:
+	GrantConditionOnPrerequisite:
 		Condition: invulnerability
+		Prerequisites: global-invulnerability
+	DrainPrerequisitePowerOnDamage:
+		RequiresCondition: invulnerability
 
 ^AutoTargetGround:
 	AutoTarget:

diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
@@ -422,20 +422,17 @@ IRON:
 		RequiresCondition: !disabled
 	WithBuildingBib:
 		HasMinibib: Yes
-	GrantExternalConditionPower@IRONCURTAIN:
+	GrantPrerequisiteChargeDrainPower@IRONCURTAIN:
 		PauseOnCondition: disabled
+		Prerequisite: global-invulnerability
 		Icon: invuln
 		ChargeInterval: 3000
 		Description: Invulnerability
-		LongDesc: Makes a group of units invulnerable\nfor 20 seconds.
-		Duration: 500
-		SelectTargetSpeechNotification: SelectTarget
+		LongDesc: Makes a group of units invulnerable
 		InsufficientPowerSpeechNotification: InsufficientPower
 		BeginChargeSpeechNotification: IronCurtainCharging
 		EndChargeSpeechNotification: IronCurtainReady
-		DisplayRadarPing: True
-		Condition: invulnerability
-		OnFireSound: ironcur9.aud
+		LaunchSpeechNotification: IronCurtainActivated
 	SupportPowerChargeBar:
 	Power:
 		Amount: -200