harvester actually sortof works now

This commit is contained in:
Chris Forbes
2009-11-03 19:24:28 +13:00
parent cda22ba7be
commit 1b131465fd
7 changed files with 69 additions and 18 deletions

View File

@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OpenRa.Game.Traits.Activities
{
class DeliverOre : Activity
{
public Activity NextActivity { get; set; }
bool isDone;
public void Tick(Actor self, Mobile mobile)
{
if (isDone)
{
mobile.InternalSetActivity(NextActivity);
/* todo: return to the ore patch */
return;
}
var renderUnit = self.traits.WithInterface<RenderUnit>().First();
if (renderUnit.anim.CurrentSequence.Name != "empty")
renderUnit.PlayCustomAnimation(self, "empty",
() => isDone = true);
}
public void Cancel(Actor self, Mobile mobile)
{
mobile.InternalSetActivity(null);
}
}
}

View File

@@ -8,6 +8,7 @@ namespace OpenRa.Game.Traits.Activities
class Harvest : Activity
{
public Activity NextActivity { get; set; }
bool isHarvesting = false;
public void Tick(Actor self, Mobile mobile)
{
@@ -18,10 +19,16 @@ namespace OpenRa.Game.Traits.Activities
Game.map.ContainsResource(self.Location) &&
Game.map.Harvest(self.Location, out isGem))
{
var harvestAnim = "harvest" + Util.QuantizeFacing(mobile.facing, 8);
var renderUnit = self.traits.WithInterface<RenderUnit>().First(); /* better have one of these! */
if (harvestAnim != renderUnit.anim.CurrentSequence.Name)
renderUnit.PlayCustomAnimation(self, harvestAnim, () => isHarvesting = false);
harv.AcceptResource(isGem);
return;
}
if (isHarvesting) return;
if (harv.IsFull)
PlanReturnToBase(self, mobile);
else
@@ -47,7 +54,7 @@ namespace OpenRa.Game.Traits.Activities
mobile.QueueActivity(new Move(proc.Location + new int2(1, 2)));
mobile.QueueActivity(new Turn(64));
/* todo: DeliverOre activity */
mobile.QueueActivity(new DeliverOre());
mobile.InternalSetActivity(NextActivity);
}