Fix armors.

This commit is contained in:
Zimmermann Gyula
2015-08-31 17:26:53 +02:00
committed by reaperrr
parent 508c99655c
commit 4aba64cc0f

View File

@@ -37,15 +37,11 @@ namespace OpenRA.Mods.Common.Warheads
public int DamageVersus(Actor victim) public int DamageVersus(Actor victim)
{ {
var armor = victim.TraitsImplementing<Armor>().Where(a => !a.IsTraitDisabled && a.Info.Type != null); var armor = victim.TraitsImplementing<Armor>()
foreach (var a in armor) .Where(a => !a.IsTraitDisabled && a.Info.Type != null && Versus.ContainsKey(a.Info.Type))
{ .Select(a => Versus[a.Info.Type]);
int versus;
if (Versus.TryGetValue(a.Info.Type, out versus))
return versus;
}
return 100; return Util.ApplyPercentageModifiers(100, armor);
} }
public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers) public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)