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

move counter-capture logic down into Capturable; remove spurious interlock on CaptureInProgress

Browse Source
This commit is contained in:
Chris Forbes
2012-09-13 07:14:56 +12:00
parent c012ea90dd
commit 0b665bc35b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Activities/CaptureActor.cs
View File

@@ -32,10 +32,6 @@ namespace OpenRA.Mods.RA.Activities
if ((nearest - mobile.toCell).LengthSquared > 2) if ((nearest - mobile.toCell).LengthSquared > 2)
return Util.SequenceActivities(new MoveAdjacentTo(Target.FromActor(target)), this); return Util.SequenceActivities(new MoveAdjacentTo(Target.FromActor(target)), this);
var capturable = target.TraitOrDefault<Capturable>();
if (capturable != null && capturable.CaptureInProgress && capturable.Captor.Owner.Stances[self.Owner] == Stance.Ally)
return NextActivity;
if (!target.Trait<Capturable>().BeginCapture(target, self)) if (!target.Trait<Capturable>().BeginCapture(target, self))
return NextActivity; return NextActivity;

5
OpenRA.Mods.RA/Capturable.cs
View File

@@ -40,7 +40,10 @@ namespace OpenRA.Mods.RA
public bool BeginCapture(Actor self, Actor captor) public bool BeginCapture(Actor self, Actor captor)
{ {
if (!self.Trait<Building>().Lock()) if (!CaptureInProgress && !self.Trait<Building>().Lock())
return false;
if (CaptureInProgress && Captor.Owner.Stances[captor.Owner] == Stance.Ally)
return false; return false;
CaptureProgressTime = 0; CaptureProgressTime = 0;