epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix armors.

Browse Source
This commit is contained in:
Zimmermann Gyula
2015-08-31 17:26:53 +02:00
committed by reaperrr
parent 508c99655c
commit 4aba64cc0f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Warheads/DamageWarhead.cs
View File

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