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

Merge pull request #8558 from GraionDilach/grantupgrade-warhead-checkvalidity

Browse Source 
Add target validation to GrantUpgrade warheads.
This commit is contained in:
Pavel Penev
2015-07-02 23:34:28 +03:00
parent a73edfd4a5 d222cd1c7a
commit 082b1ab1c9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,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 } :
@@ -36,6 +40,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;

7
mods/ts/weapons/superweapons.yaml
View File

@@ -84,13 +84,8 @@ EMPulseCannon:
Shadow: true Shadow: true
Angle: 62 Angle: 62
Image: pulsball Image: pulsball
Warhead@2Eff: CreateEffect Warhead@1Eff: CreateEffect
Explosion: pulse_explosion Explosion: pulse_explosion
# Dummy warhead to allow targeting
Warhead@target: SpreadDamage
Spread: 0
Damage: 0
ValidTargets: Vehicle
Warhead@emp: GrantUpgrade Warhead@emp: GrantUpgrade
Range: 3c0 Range: 3c0
Duration: 250 Duration: 250