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

Merge pull request #11192 from reaperrr/fix-effectwh

Browse Source 
Fix direct hit check in CreateEffectWarhead
This commit is contained in:
Oliver Brakmann
2016-05-18 21:52:30 +02:00
parent 6e7bce9571 10dc6ca85c
commit b4664d1ec5
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Lint/CheckTargetHealthRadius.cs
View File

@@ -47,7 +47,20 @@ namespace OpenRA.Mods.Common.Lint
continue;
if (healthTraits.Where(x => x.Shape.OuterRadius.Length > warhead.TargetExtraSearchRadius.Length).Any())
emitError("Actor type `{0}` has a health radius exceeding the victim scan radius of a warhead on `{1}`!"
emitError("Actor type `{0}` has a health radius exceeding the victim scan radius of a SpreadDamageWarhead on `{1}`!"
.F(actorInfo.Key, weaponInfo.Key));
}
var effectWarheads = weaponInfo.Value.Warheads.OfType<CreateEffectWarhead>();
foreach (var warhead in effectWarheads)
{
// This warhead cannot affect this actor.
if (!warhead.ValidTargets.Overlaps(targetable))
continue;
if (healthTraits.Where(x => x.Shape.OuterRadius.Length > warhead.TargetSearchRadius.Length).Any())
emitError("Actor type `{0}` has a health radius exceeding the victim scan radius of a CreateEffectWarhead on `{1}`!"
.F(actorInfo.Key, weaponInfo.Key));
}