Fix harvester dock sequence names

This commit is contained in:
penev92
2015-01-19 12:34:39 +02:00
parent 202e280551
commit c18da7abb0
6 changed files with 8 additions and 9 deletions

View File

@@ -13,13 +13,12 @@ using System.Collections.Generic;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Activities
{
public class HarvesterDockSequence : Activity
public class TDHarvesterDockSequence : Activity
{
enum State { Wait, Turn, DragIn, Dock, Loop, Undock, DragOut }
static readonly WVec DockOffset = new WVec(-640, 341, 0);
@@ -30,7 +29,7 @@ namespace OpenRA.Mods.Cnc.Activities
State state;
WPos startDock, endDock;
public HarvesterDockSequence(Actor self, Actor proc)
public TDHarvesterDockSequence(Actor self, Actor proc)
{
this.proc = proc;
state = State.Turn;

View File

@@ -67,7 +67,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\HarvesterDockSequence.cs" />
<Compile Include="Activities\TDHarvesterDockSequence.cs" />
<Compile Include="CncLoadScreen.cs" />
<Compile Include="Effects\IonCannon.cs" />
<Compile Include="Traits\AttackPopupTurreted.cs" />

View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Cnc.Traits
public override Activity DockSequence(Actor harv, Actor self)
{
return new HarvesterDockSequence(harv, self);
return new TDHarvesterDockSequence(harv, self);
}
}
}

View File

@@ -18,7 +18,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
public class RAHarvesterDockSequence : Activity
public class HarvesterDockSequence : Activity
{
enum State { Wait, Turn, Dock, Loop, Undock, Complete }
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA
readonly RenderUnit ru;
State state;
public RAHarvesterDockSequence(Actor self, Actor proc, int angle)
public HarvesterDockSequence(Actor self, Actor proc, int angle)
{
this.proc = proc;
this.angle = angle;

View File

@@ -80,7 +80,7 @@
<Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMines.cs" />
<Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\RAHarvesterDockSequence.cs" />
<Compile Include="Activities\HarvesterDockSequence.cs" />
<Compile Include="Activities\Teleport.cs" />
<Compile Include="AI\SupportPowerDecision.cs" />
<Compile Include="Effects\GpsSatellite.cs" />

View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.RA.Traits
public virtual Activity DockSequence(Actor harv, Actor self)
{
return new RAHarvesterDockSequence(harv, self, info.DockAngle);
return new HarvesterDockSequence(harv, self, info.DockAngle);
}
public IEnumerable<TraitPair<Harvester>> GetLinkedHarvesters()