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

Make all warheads use WarheadArgs

Browse Source 
Instead of passing damageModifiers directly.
This commit is contained in:
reaperrr
2020-05-01 00:54:58 +02:00
committed by Pavel Penev
parent 38cdc93010
commit 2b4035979b
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Warheads
return base.IsValidAgainst(victim, firedBy);
}
public int DamageVersus(Actor victim, HitShapeInfo shapeInfo)
public virtual int DamageVersus(Actor victim, HitShape shape, WarheadArgs args)
{
// If no Versus values are defined, DamageVersus would return 100 anyway, so we might as well do that early.
if (Versus.Count == 0)
@@ -46,15 +46,15 @@ namespace OpenRA.Mods.Common.Warheads
var armor = victim.TraitsImplementing<Armor>()
.Where(a => !a.IsTraitDisabled && a.Info.Type != null && Versus.ContainsKey(a.Info.Type) &&
(shapeInfo.ArmorTypes == default(BitSet<ArmorType>) || shapeInfo.ArmorTypes.Contains(a.Info.Type)))
(shape.Info.ArmorTypes == default(BitSet<ArmorType>) || shape.Info.ArmorTypes.Contains(a.Info.Type)))
.Select(a => Versus[a.Info.Type]);
return Util.ApplyPercentageModifiers(100, armor);
}
protected virtual void InflictDamage(Actor victim, Actor firedBy, HitShapeInfo hitshapeInfo, IEnumerable<int> damageModifiers)
protected virtual void InflictDamage(Actor victim, Actor firedBy, HitShape shape, WarheadArgs args)
{
var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim, hitshapeInfo)));
var damage = Util.ApplyPercentageModifiers(Damage, args.DamageModifiers.Append(DamageVersus(victim, shape, args)));
victim.InflictDamage(firedBy, new Damage(damage, DamageTypes));
}
@@ -77,12 +77,12 @@ namespace OpenRA.Mods.Common.Warheads
if (closestActiveShape == null)
return;
InflictDamage(victim, firedBy, closestActiveShape.Info, args.DamageModifiers);
InflictDamage(victim, firedBy, closestActiveShape, args);
}
else if (target.Type != TargetType.Invalid)
DoImpact(target.CenterPosition, firedBy, args.DamageModifiers);
DoImpact(target.CenterPosition, firedBy, args);
}
public abstract void DoImpact(WPos pos, Actor firedBy, IEnumerable<int> damageModifiers);
public abstract void DoImpact(WPos pos, Actor firedBy, WarheadArgs args);
}
}