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

Support multiple capture types on Capturable.

Browse Source
This commit is contained in:
Paul Chote
2017-10-21 13:29:07 +00:00
committed by reaperrr
parent 77feb3f76d
commit 1caf982c1f
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Scripting/Properties/CaptureProperties.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Scripting
if (capturable != null)
{
if (captures.Any(x => !x.IsTraitDisabled && x.Info.CaptureTypes.Contains(capturable.Type)))
if (captures.Any(x => !x.IsTraitDisabled && x.Info.CaptureTypes.Overlaps(capturable.Types)))
{
Self.QueueActivity(new CaptureActor(Self, target));
return;
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Scripting
var externalCapturable = target.Info.TraitInfoOrDefault<ExternalCapturableInfo>();
if (externalInfo != null && externalCapturable != null && externalInfo.CaptureTypes.Contains(externalCapturable.Type))
if (externalInfo != null && externalCapturable != null && externalInfo.CaptureTypes.Overlaps(externalCapturable.Types))
Self.QueueActivity(new ExternalCaptureActor(Self, Target.FromActor(target)));
else
throw new LuaException("Actor '{0}' cannot capture actor '{1}'!".F(Self, target));