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

Support multiple capture traits in order targeter and script plumbing.

Browse Source
This commit is contained in:
Paul Chote
2018-11-02 22:35:23 +00:00
committed by abcdefg30
parent 346e670563
commit 3d6b170ec3
4 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Captures.cs
View File

@@ -127,7 +127,6 @@ namespace OpenRA.Mods.Common.Traits
}
cursor = captures.Info.EnterCursor;
if (captures.Info.SabotageThreshold > 0 && !target.Owner.NonCombatant)
{
var health = target.Trait<IHealth>();
@@ -142,11 +141,10 @@ namespace OpenRA.Mods.Common.Traits
public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor)
{
// Actors with FrozenUnderFog should not disable the Capturable trait.
var c = target.Info.TraitInfoOrDefault<CapturableInfo>();
if (c == null || !c.CanBeTargetedBy(self, target.Owner))
var captureManagerInfo = target.Info.TraitInfoOrDefault<CaptureManagerInfo>();
if (captureManagerInfo == null || !captureManagerInfo.CanBeTargetedBy(target, self, captures))
{
cursor = captures.Info.EnterCursor;
cursor = captures.Info.EnterBlockedCursor;
return false;
}