Add SpriteHarvesterDockSequence and VoxelHarvesterDockSequence

Pass drag-related info from Refinery to HarvesterDockSequence
This commit is contained in:
penev92
2015-01-19 16:25:50 +02:00
parent c18da7abb0
commit 502ed6a0e7
9 changed files with 126 additions and 219 deletions

View File

@@ -8,70 +8,34 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.TS.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.TS.Activities
{
public class VoxelHarvesterDockSequence : Activity
public class VoxelHarvesterDockSequence : HarvesterDockSequence
{
enum State { Turn, Dock, Loop, Undock }
readonly Actor proc;
readonly Harvester harv;
readonly WithVoxelUnloadBody body;
State state;
public VoxelHarvesterDockSequence(Actor self, Actor proc)
public VoxelHarvesterDockSequence(Actor self, Actor refinery, int dockAngle, bool isDragRequired, WVec dragOffset, int dragLength)
: base(self, refinery, dockAngle, isDragRequired, dragOffset, dragLength)
{
this.proc = proc;
state = State.Turn;
harv = self.Trait<Harvester>();
body = self.Trait<WithVoxelUnloadBody>();
}
public override Activity Tick(Actor self)
public override Activity OnStateDock(Actor self)
{
switch (state)
{
case State.Turn:
state = State.Dock;
return Util.SequenceActivities(new Turn(self, 160), this);
case State.Dock:
if (proc.IsInWorld && !proc.IsDead)
foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
nd.Docked(proc, self);
state = State.Loop;
body.Docked = true;
return this;
case State.Loop:
if (!proc.IsInWorld || proc.IsDead || harv.TickUnload(self, proc))
state = State.Undock;
return this;
case State.Undock:
if (proc.IsInWorld && !proc.IsDead)
foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
nd.Undocked(proc, self);
body.Docked = false;
return NextActivity;
}
throw new InvalidOperationException("Invalid harvester dock state");
body.Docked = true;
dockingState = State.Loop;
return this;
}
public override void Cancel(Actor self)
public override Activity OnStateUndock(Actor self)
{
state = State.Undock;
}
public override IEnumerable<Target> GetTargets(Actor self)
{
yield return Target.FromActor(proc);
body.Docked = false;
dockingState = State.Complete;
return this;
}
}
}
}