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

Fixed broken DeliverOre behavior: ordering a harv to deliver to a particular proc would be ignored; the nearest proc was used instead.

Browse Source
This commit is contained in:
Bob
2009-11-13 13:04:24 +13:00
parent a71e36688c
commit f4e55572d6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,11 @@ namespace OpenRa.Game.Traits.Activities
} }
else if( NextActivity != null ) else if( NextActivity != null )
return NextActivity; return NextActivity;
else if( refinery == null || refinery.IsDead || self.Location != refinery.Location + refineryDeliverOffset )
if( refinery != null && refinery.IsDead )
refinery = null;
if( refinery == null || self.Location != refinery.Location + refineryDeliverOffset )
{ {
var search = new PathSearch var search = new PathSearch
{ {
@@ -39,8 +43,11 @@ namespace OpenRa.Game.Traits.Activities
checkForBlocked = false, checkForBlocked = false,
}; };
var refineries = Game.world.Actors.Where( x => x.unitInfo == Rules.UnitInfo[ "proc" ] ).ToList(); var refineries = Game.world.Actors.Where( x => x.unitInfo == Rules.UnitInfo[ "proc" ] ).ToList();
foreach( var r in refineries ) if( refinery != null )
search.AddInitialCell( r.Location + refineryDeliverOffset ); search.AddInitialCell( refinery.Location + refineryDeliverOffset );
else
foreach( var r in refineries )
search.AddInitialCell( r.Location + refineryDeliverOffset );
var path = Game.PathFinder.FindPath( search ); var path = Game.PathFinder.FindPath( search );
path.Reverse(); path.Reverse();