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

Remove obsolete code.

Browse Source
This commit is contained in:
Paul Chote
2018-09-30 11:14:09 +01:00
committed by abcdefg30
parent b1b35c1e1b
commit 22bd7fd90b
9 changed files with 7 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,35 +23,22 @@ namespace OpenRA.Mods.Common.Scripting
public class CaptureProperties : ScriptActorProperties
{
readonly Captures[] captures;
readonly ExternalCapturesInfo externalInfo;
public CaptureProperties(ScriptContext context, Actor self)
: base(context, self)
{
captures = Self.TraitsImplementing<Captures>().ToArray();
externalInfo = Self.Info.TraitInfoOrDefault<ExternalCapturesInfo>();
}
[Desc("Captures the target actor.")]
public void Capture(Actor target)
{
var capturable = target.Info.TraitInfoOrDefault<CapturableInfo>();
if (capturable != null)
{
if (captures.Any(x => !x.IsTraitDisabled && x.Info.CaptureTypes.Overlaps(capturable.Types)))
{
Self.QueueActivity(new CaptureActor(Self, target));
return;
}
}
var externalCapturable = target.Info.TraitInfoOrDefault<ExternalCapturableInfo>();
if (externalInfo != null && externalCapturable != null && externalInfo.CaptureTypes.Overlaps(externalCapturable.Types))
Self.QueueActivity(new ExternalCaptureActor(Self, Target.FromActor(target)));
else
if (capturable == null)
throw new LuaException("Actor '{0}' cannot capture actor '{1}'!".F(Self, target));
if (captures.Any(x => !x.IsTraitDisabled && x.Info.CaptureTypes.Overlaps(capturable.Types)))
Self.QueueActivity(new CaptureActor(Self, target));
}
}
}