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

(External)Capturable are now conditional

Browse Source
This commit is contained in:
Forcecore
2017-10-21 16:34:24 +00:00
committed by Pavel Penev
parent a7620c97f0
commit c762453607
6 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/AI/HackyAI.cs
View File

@@ -717,13 +717,33 @@ namespace OpenRA.Mods.Common.AI
var capturableTargetOptions = targetOptions
.Select(a => new CaptureTarget<CapturableInfo>(a, "CaptureActor"))
.Where(target => target.Info != null && capturers.Any(capturer => target.Info.CanBeTargetedBy(capturer, target.Actor.Owner)))
.Where(target =>
{
if (target.Info == null)
return false;
var capturable = target.Actor.TraitOrDefault<Capturable>();
if (capturable == null)
return false;
return capturers.Any(capturer => capturable.CanBeTargetedBy(capturer, target.Actor.Owner));
})
.OrderByDescending(target => target.Actor.GetSellValue())
.Take(maximumCaptureTargetOptions);
var externalCapturableTargetOptions = targetOptions
.Select(a => new CaptureTarget<ExternalCapturableInfo>(a, "ExternalCaptureActor"))
.Where(target => target.Info != null && capturers.Any(capturer => target.Info.CanBeTargetedBy(capturer, target.Actor.Owner)))
.Where(target =>
{
if (target.Info == null)
return false;
var externalCapturable = target.Actor.TraitOrDefault<ExternalCapturable>();
if (externalCapturable == null)
return false;
return capturers.Any(capturer => externalCapturable.CanBeTargetedBy(capturer, target.Actor.Owner));
})
.OrderByDescending(target => target.Actor.GetSellValue())
.Take(maximumCaptureTargetOptions);