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

Merge pull request #12919 from obrakmann/transform-refactor

Browse Source 
Refactor Transform to make use of child activities
This commit is contained in:
reaperrr
2017-05-04 18:55:41 +02:00
committed by GitHub
parent 7a7b668f2b f9913db5e8
commit c4e79a11a8
14 changed files with 86 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/DeliverUnit.cs
View File

@@ -207,7 +207,7 @@ namespace OpenRA.Mods.Common.Activities
});
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self))
return false;

2
OpenRA.Mods.Common/Activities/Enter.cs
View File

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Activities
inner.Cancel(self);
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
AbortOrExit(self);
if (nextState < EnterState.Exiting)

2
OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Activities
throw new InvalidOperationException("Invalid harvester dock state");
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
dockingState = DockingState.Undock;
return base.Cancel(self);

4
OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs
View File

@@ -46,12 +46,12 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceled && inner != null && !inner.Cancel(self))
return false;
return base.Cancel(self);
return base.Cancel(self, keepQueue);
}
public override IEnumerable<Target> GetTargets(Actor self)

4
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -334,9 +334,9 @@ namespace OpenRA.Mods.Common.Activities
}
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
Move.Cancel(self);
Move.Cancel(self, keepQueue);
return base.Cancel(self);
}

2
OpenRA.Mods.Common/Activities/Move/MoveAdjacentTo.cs
View File

@@ -161,7 +161,7 @@ namespace OpenRA.Mods.Common.Activities
return Target.None;
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceled && inner != null && !inner.Cancel(self))
return false;

4
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

@@ -157,12 +157,12 @@ namespace OpenRA.Mods.Common.Activities
});
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self))
return false;
return base.Cancel(self);
return base.Cancel(self, keepQueue);
}
}
}

55
OpenRA.Mods.Common/Activities/Transform.cs
View File

@@ -12,7 +12,9 @@
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities
{
@@ -32,11 +34,61 @@ namespace OpenRA.Mods.Common.Activities
ToActor = toActor;
}
protected override void OnFirstRun(Actor self)
{
if (self.Info.HasTraitInfo<IFacingInfo>())
QueueChild(new Turn(self, Facing));
if (self.Info.HasTraitInfo<AircraftInfo>())
QueueChild(new HeliLand(self, true));
}
public override Activity Tick(Actor self)
{
if (IsCanceled)
return NextActivity;
if (ChildActivity != null)
{
ActivityUtils.RunActivity(self, ChildActivity);
return this;
}
// Prevent deployment in bogus locations
var transforms = self.TraitOrDefault<Transforms>();
var building = self.TraitOrDefault<Building>();
if ((transforms != null && !transforms.CanDeploy()) || (building != null && !building.Lock()))
{
Cancel(self, true);
return NextActivity;
}
foreach (var nt in self.TraitsImplementing<INotifyTransform>())
nt.BeforeTransform(self);
var makeAnimation = self.TraitOrDefault<WithMakeAnimation>();
if (makeAnimation != null)
{
// Once the make animation starts the activity must not be stopped anymore.
IsInterruptible = false;
// Wait forever
QueueChild(new WaitFor(() => false));
makeAnimation.Reverse(self, () => DoTransform(self));
return this;
}
return NextActivity;
}
protected override void OnLastRun(Actor self)
{
if (!IsCanceled)
DoTransform(self);
}
void DoTransform(Actor self)
{
self.World.AddFrameEndTask(w =>
{
if (self.IsDead)
@@ -84,11 +136,10 @@ namespace OpenRA.Mods.Common.Activities
if (selected)
w.Selection.Add(w, a);
if (controlgroup.HasValue)
w.Selection.AddToControlGroup(a, controlgroup.Value);
});
return this;
}
}
}

8
OpenRA.Mods.Common/Activities/Wait.cs
View File

@@ -30,9 +30,9 @@ namespace OpenRA.Mods.Common.Activities
return (remainingTicks-- == 0) ? NextActivity : this;
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!base.Cancel(self))
if (!base.Cancel(self, keepQueue))
return false;
remainingTicks = 0;
@@ -56,9 +56,9 @@ namespace OpenRA.Mods.Common.Activities
return (f == null || f()) ? NextActivity : this;
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!base.Cancel(self))
if (!base.Cancel(self, keepQueue))
return false;
f = null;

4
OpenRA.Mods.Common/Activities/WaitForTransport.cs
View File

@@ -41,12 +41,12 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceled && inner != null && !inner.Cancel(self))
return false;
return base.Cancel(self);
return base.Cancel(self, keepQueue);
}
}
}