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

harv wont use enemy proc automatically anymore; ore goes to proc owner

Browse Source
This commit is contained in:
Chris Forbes
2009-11-17 22:06:03 +13:00
parent d05c9ca0de
commit 51b9e5c15f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ namespace OpenRa.Game.Traits.Activities
{ {
if( isDone ) if( isDone )
{ {
self.traits.Get<Harvester>().Deliver( self ); self.traits.Get<Harvester>().Deliver( self, refinery );
return NextActivity ?? new Harvest(); return NextActivity ?? new Harvest();
} }
else if( NextActivity != null ) else if( NextActivity != null )
@@ -42,7 +42,8 @@ namespace OpenRa.Game.Traits.Activities
umt = mobile.GetMovementType(), umt = mobile.GetMovementType(),
checkForBlocked = false, checkForBlocked = false,
}; };
var refineries = Game.world.Actors.Where( x => x.unitInfo != null && x.unitInfo.Name == "proc" ).ToList(); var refineries = Game.world.Actors.Where( x => x.unitInfo != null
&& x.unitInfo.Name == "proc" && x.Owner == self.Owner ).ToList();
if( refinery != null ) if( refinery != null )
search.AddInitialCell( refinery.Location + refineryDeliverOffset ); search.AddInitialCell( refinery.Location + refineryDeliverOffset );
else else

6
OpenRa.Game/Traits/Harvester.cs
View File

@@ -19,10 +19,10 @@ namespace OpenRa.Game.Traits
else oreCarried++; else oreCarried++;
} }
public void Deliver(Actor self) public void Deliver(Actor self, Actor proc)
{ {
self.Owner.GiveCash(oreCarried * Rules.General.GoldValue); proc.Owner.GiveCash(oreCarried * Rules.General.GoldValue);
self.Owner.GiveCash(gemsCarried * Rules.General.GemValue); proc.Owner.GiveCash(gemsCarried * Rules.General.GemValue);
oreCarried = 0; oreCarried = 0;
gemsCarried = 0; gemsCarried = 0;
} }