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

Harvesters deliver to the correct cell, even if it's blocked.

Browse Source
This commit is contained in:
Bob
2009-11-05 13:45:29 +13:00
parent edc4a8e6e7
commit 33e6cb70ea
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRa.Game/Traits/Activities/DeliverOre.cs
View File

@@ -10,10 +10,34 @@ namespace OpenRa.Game.Traits.Activities
public Activity NextActivity { get; set; }
bool isDone;
Actor refinery;
public DeliverOre( Actor refinery )
{
this.refinery = refinery;
}
static readonly int2 refineryDeliverOffset = new int2( 1, 2 );
public void Tick(Actor self, Mobile mobile)
{
if (isDone)
if( self.Location != refinery.Location + refineryDeliverOffset )
{
var move = new Move( refinery.Location + refineryDeliverOffset, 0 );
mobile.InternalSetActivity( move );
mobile.QueueActivity( this );
move.Tick( self, mobile );
return;
}
else if( mobile.facing != 64 )
{
var turn = new Turn( 64 );
mobile.InternalSetActivity( turn );
mobile.QueueActivity( this );
turn.Tick( self, mobile );
return;
}
else if (isDone)
{
var harv = self.traits.Get<Harvester>();

7
OpenRa.Game/Traits/Activities/Harvest.cs
View File

@@ -53,11 +53,8 @@ namespace OpenRa.Game.Traits.Activities
/* find a proc */
var proc = ChooseReturnLocation(self);
if( proc != null )
{
mobile.QueueActivity( new Move( proc.Location + new int2( 1, 2 ), 0 ) );
mobile.QueueActivity( new Turn( 64 ) );
mobile.QueueActivity( new DeliverOre() );
}
mobile.QueueActivity( new DeliverOre( proc ) );
mobile.InternalSetActivity(NextActivity);
}

4
OpenRa.Game/UnitOrders.cs
View File

@@ -57,9 +57,7 @@ namespace OpenRa.Game
{
var mobile = order.Subject.traits.Get<Mobile>();
mobile.Cancel(order.Subject);
mobile.QueueActivity(new Traits.Activities.Move(order.TargetActor.Location + new int2(1, 2), 0));
mobile.QueueActivity(new Traits.Activities.Turn(64));
mobile.QueueActivity(new Traits.Activities.DeliverOre());
mobile.QueueActivity(new Traits.Activities.DeliverOre(order.TargetActor));
break;
}
case "Harvest":