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

Fix primary building flag not working properly in D2k

Browse Source
This commit is contained in:
Oliver Brakmann
2018-01-09 23:07:03 +01:00
committed by reaperrr
parent 157a783df5
commit 32b0170785
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs
View File

@@ -35,6 +35,10 @@ namespace OpenRA.Mods.Common.Traits
[Desc("The speech notification to play when selecting a primary building.")]
public readonly string SelectionNotification = "PrimaryBuildingSelected";
[Desc("List of production queues for which the primary flag should be set.",
"If empty, the list given in the `Produces` property of the `Production` trait will be used.")]
public readonly string[] ProductionQueues = { };
public object Create(ActorInitializer init) { return new PrimaryBuilding(init.Self, this); }
}
@@ -86,7 +90,8 @@ namespace OpenRA.Mods.Common.Traits
{
// Cancel existing primaries
// TODO: THIS IS SHIT
foreach (var p in self.Info.TraitInfo<ProductionInfo>().Produces)
var queues = info.ProductionQueues.Length == 0 ? self.Info.TraitInfo<ProductionInfo>().Produces : info.ProductionQueues;
foreach (var q in queues)
{
foreach (var b in self.World
.ActorsWithTrait<PrimaryBuilding>()
@@ -94,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits
a.Actor != self &&
a.Actor.Owner == self.Owner &&
a.Trait.IsPrimary &&
a.Actor.Info.TraitInfo<ProductionInfo>().Produces.Contains(p)))
a.Actor.Info.TraitInfo<ProductionInfo>().Produces.Contains(q)))
b.Trait.SetPrimaryProducer(b.Actor, false);
}