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

Add target validation to GrantUpgrade warheads.

Browse Source
This commit is contained in:
Zimmermann Gyula
2015-06-25 11:56:02 +02:00
parent f161a620e6
commit 0e3ba0c72e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Warheads/GrantUpgradeWarhead.cs
View File

@@ -28,6 +28,10 @@ namespace OpenRA.Mods.Common.Warheads
public readonly WRange Range = WRange.FromCells(1); public readonly WRange Range = WRange.FromCells(1);
// TODO: This can be removed after the legacy and redundant 0% = not targetable
// assumption has been removed from the yaml definitions
public override bool CanTargetActor(ActorInfo victim, Actor firedBy) { return true; }
public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers) public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
{ {
var actors = target.Type == TargetType.Actor ? new[] { target.Actor } : var actors = target.Type == TargetType.Actor ? new[] { target.Actor } :
@@ -35,6 +39,9 @@ namespace OpenRA.Mods.Common.Warheads
foreach (var a in actors) foreach (var a in actors)
{ {
if (!IsValidAgainst(a, firedBy))
continue;
var um = a.TraitOrDefault<UpgradeManager>(); var um = a.TraitOrDefault<UpgradeManager>();
if (um == null) if (um == null)
continue; continue;