Merge pull request #9842 from GraionDilach/damagewarhead-stance-fix

Fix (HealthPercentage)DamageWarheads ignoring stances.
This commit is contained in:
RoosterDragon
2015-11-04 22:32:37 +00:00
3 changed files with 6 additions and 3 deletions

View File

@@ -65,6 +65,9 @@ namespace OpenRA.Mods.Common.Warheads
public virtual void DoImpact(Actor victim, Actor firedBy, IEnumerable<int> damageModifiers)
{
if (!IsValidAgainst(victim, firedBy))
return;
var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim)));
victim.InflictDamage(firedBy, damage, this);
}

View File

@@ -42,6 +42,9 @@ namespace OpenRA.Mods.Common.Warheads
public override void DoImpact(Actor victim, Actor firedBy, IEnumerable<int> damageModifiers)
{
if (!IsValidAgainst(victim, firedBy))
return;
var healthInfo = victim.Info.TraitInfoOrDefault<HealthInfo>();
if (healthInfo == null)
return;

View File

@@ -62,9 +62,6 @@ namespace OpenRA.Mods.Common.Warheads
foreach (var victim in hitActors)
{
if (!IsValidAgainst(victim, firedBy))
continue;
var healthInfo = victim.Info.TraitInfoOrDefault<HealthInfo>();
if (healthInfo == null)
continue;