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

split PrimaryBuilding from Production

Browse Source
This commit is contained in:
Chris Forbes
2010-08-09 17:20:34 +12:00
parent cb5307bb17
commit 8f6fe8344b
7 changed files with 97 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/Player/PlaceBuilding.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Traits
var producers = self.World.Queries.OwnedBy[ self.Owner ].WithTrait<Production>()
.Where( x => x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( unit.Category ) )
.ToList();
var producer = producers.Where( x => x.Trait.IsPrimary ).Concat( producers )
var producer = producers.Where( x => x.Actor.IsPrimaryBuilding() ).Concat( producers )
.FirstOrDefault();
if( producer.Actor != null )

2
OpenRA.Game/Traits/Player/ProductionQueue.cs
View File

@@ -170,7 +170,7 @@ namespace OpenRA.Traits
var producers = self.World.Queries.OwnedBy[self.Owner]
.WithTrait<Production>()
.Where(x => producerTypes.Contains(x.Actor.Info))
.OrderByDescending(x => x.Trait.IsPrimary ? 1 : 0) // prioritize the primary.
.OrderByDescending(x => x.Actor.IsPrimaryBuilding() ? 1 : 0 ) // prioritize the primary.
.ToArray();
if (producers.Length == 0)