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

Remove the baked harvester animation from proc. Fixes #1009.

Browse Source
This commit is contained in:
Paul Chote
2011-07-14 01:24:03 +12:00
parent 24d220213e
commit 089cdf14ad
6 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
View File

@@ -34,8 +34,7 @@ namespace OpenRA.Mods.Cnc
readonly Actor proc;
readonly Harvester harv;
readonly HarvesterDocking dock;
readonly RenderBuilding rb;
readonly RenderUnit ru;
State state;
int2 startDock;
@@ -45,8 +44,7 @@ namespace OpenRA.Mods.Cnc
this.proc = proc;
state = State.Turn;
harv = self.Trait<Harvester>();
dock = self.Trait<HarvesterDocking>();
rb = proc.Trait<RenderBuilding>();
ru = self.Trait<RenderUnit>();
startDock = self.Trait<IHasLocation>().PxPosition;
endDock = proc.Trait<IHasLocation>().PxPosition + new int2(-15,8);
}
@@ -64,30 +62,16 @@ namespace OpenRA.Mods.Cnc
state = State.Dock;
return Util.SequenceActivities(new Drag(startDock, endDock, 12), this);
case State.Dock:
dock.Visible = false;
if (rb.anim.CurrentSequence.Name == "idle" || rb.anim.CurrentSequence.Name == "damaged-idle")
{
rb.PlayCustomAnimThen(proc, "dock-start", () => {rb.PlayCustomAnimRepeating(proc, "dock-loop"); state = State.Loop;});
state = State.Wait;
}
else
state = State.Loop;
ru.PlayCustomAnimation(self, "dock", () => {ru.PlayCustomAnimRepeating(self, "dock-loop"); state = State.Loop;});
state = State.Wait;
return this;
case State.Loop:
if (harv.TickUnload(self, proc))
state = State.Undock;
return this;
case State.Undock:
if (rb.anim.CurrentSequence.Name == "dock-loop" || rb.anim.CurrentSequence.Name == "damaged-dock-loop")
{
rb.PlayCustomAnimThen(proc, "dock-end", () => {dock.Visible = true; state = State.Dragout;});
state = State.Wait;
}
else
{
state = State.Dragout;
dock.Visible = true;
}
ru.PlayCustomAnimBackwards(self, "dock", () => state = State.Dragout);
state = State.Wait;
return this;
case State.Dragout:
return Util.SequenceActivities(new Drag(endDock, startDock, 12), NextActivity);

13
OpenRA.Mods.Cnc/TiberiumRefinery.cs
View File

@@ -30,17 +30,4 @@ namespace OpenRA.Mods.Cnc
return new HarvesterDockSequence(harv, self);
}
}
public class HarvesterDockingInfo : TraitInfo<HarvesterDocking> { }
public class HarvesterDocking : IRenderModifier
{
[Sync]
public bool Visible = true;
static readonly Renderable[] Nothing = { };
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
return Visible ? r : Nothing;
}
}
}