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

18
OpenRA.Mods.Common/Traits/Capturable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor can be captured by a unit with Captures: trait.")]
public class CapturableInfo : ITraitInfo
public class CapturableInfo : ConditionalTraitInfo
{
[Desc("CaptureTypes (from the Captures trait) that are able to capture this.")]
public readonly HashSet<string> Types = new HashSet<string>() { "building" };
@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int CaptureThreshold = 50;
public readonly bool CancelActivity = false;
public object Create(ActorInitializer init) { return new Capturable(this); }
public override object Create(ActorInitializer init) { return new Capturable(this); }
public bool CanBeTargetedBy(Actor captor, Player owner)
{
@@ -46,11 +46,11 @@ namespace OpenRA.Mods.Common.Traits
}
}
public class Capturable : INotifyCapture
public class Capturable : ConditionalTrait<CapturableInfo>, INotifyCapture
{
public readonly CapturableInfo Info;
public bool BeingCaptured { get; private set; }
public Capturable(CapturableInfo info) { Info = info; }
public Capturable(CapturableInfo info)
: base(info) { }
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
@@ -64,5 +64,13 @@ namespace OpenRA.Mods.Common.Traits
t.ResolveOrder(self, stop);
}
}
public bool CanBeTargetedBy(Actor captor, Player owner)
{
if (IsTraitDisabled)
return false;
return Info.CanBeTargetedBy(captor, owner);
}
}
}