From 3fc6f62aea402b61623c2b765a312c6ed1d05925 Mon Sep 17 00:00:00 2001 From: Curtis Shmyr Date: Sun, 29 Jul 2012 16:02:34 -0600 Subject: [PATCH] Conflicts: OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs --- OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs | 4 +++- mods/ra/rules/structures.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs b/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs index b817ec938e..62ea72c3ce 100755 --- a/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs @@ -40,7 +40,9 @@ namespace OpenRA.Mods.RA self.Trait().PlayCustomAnim(self, "active"); Sound.Play("ironcur9.aud", order.TargetLocation.ToPPos()); - foreach (var target in UnitsInRange(order.TargetLocation)) + + foreach (var target in UnitsInRange(order.TargetLocation) + .Where(a => a.Owner.Stances[self.Owner] == Stance.Ally)) target.Trait().Activate(target, (Info as IronCurtainPowerInfo).Duration * 25); } diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 7c683deb15..10a1843115 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -207,8 +207,8 @@ IRON: Image: infxicon ChargeTime: 120 Description: Invulnerability - LongDesc: Makes a group of units invulnerable\nfor 10 seconds. - Duration: 10 + LongDesc: Makes a group of units invulnerable\nfor 15 seconds. + Duration: 15 SelectTargetSound: slcttgt1.aud BeginChargeSound: ironchg1.aud EndChargeSound: ironrdy1.aud