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

Fix harvester dock sequence names

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs → OpenRA.Mods.Cnc/Activities/TDHarvesterDockSequence.cs
View File

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

2
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

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

2
OpenRA.Mods.Cnc/Traits/Buildings/TiberianDawnRefinery.cs
View File

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

4
OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs → OpenRA.Mods.RA/Activities/HarvesterDockSequence.cs
View File

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

2
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

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

2
OpenRA.Mods.RA/Traits/Buildings/Refinery.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.RA.Traits
public virtual Activity DockSequence(Actor harv, Actor self) 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() public IEnumerable<TraitPair<Harvester>> GetLinkedHarvesters()