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

Remove harvester dependency on RenderUnit.

Browse Source
This commit is contained in:
Paul Chote
2013-06-22 16:58:40 +12:00
parent 6d24eb14d7
commit 80c3cf479d
6 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Mods.RA/Activities/FindResources.cs
View File

@@ -135,16 +135,13 @@ namespace OpenRA.Mods.RA.Activities
public class HarvestResource : Activity
{
bool isHarvesting = false;
public override Activity Tick(Actor self)
{
if (isHarvesting) return this;
var territory = self.World.WorldActor.TraitOrDefault<ResourceClaimLayer>();
if (IsCanceled)
{
if (territory != null) territory.UnclaimByActor(self);
if (territory != null)
territory.UnclaimByActor(self);
return NextActivity;
}
@@ -153,7 +150,8 @@ namespace OpenRA.Mods.RA.Activities
if (harv.IsFull)
{
if (territory != null) territory.UnclaimByActor(self);
if (territory != null)
territory.UnclaimByActor(self);
return NextActivity;
}
@@ -161,19 +159,18 @@ namespace OpenRA.Mods.RA.Activities
var resource = resLayer.Harvest(self.Location);
if (resource == null)
{
if (territory != null) territory.UnclaimByActor(self);
if (territory != null)
territory.UnclaimByActor(self);
return NextActivity;
}
var renderUnit = self.Trait<RenderUnit>(); /* better have one of these! */
if (renderUnit.anim.CurrentSequence.Name != "harvest")
{
isHarvesting = true;
renderUnit.PlayCustomAnimation(self, "harvest", () => isHarvesting = false);
}
harv.AcceptResource(resource);
return this;
foreach (var t in self.TraitsImplementing<INotifyHarvest>())
t.Harvested(self, resource);
var harvInfo = self.Info.Traits.Get<HarvesterInfo>();
return Util.SequenceActivities(new Wait(harvInfo.LoadTicksPerBale), this);
}
}
}