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

Ignore disabled production traits.

Browse Source
This commit is contained in:
abcdefg30
2018-11-03 14:58:43 +00:00
committed by abcdefg30
parent 4a4415c74b
commit a03abe78af
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/ProductionQueueFromSelection.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.Common.Traits
if (queue == null) if (queue == null)
{ {
var types = world.Selection.Actors.Where(a => a.IsInWorld && a.World.LocalPlayer == a.Owner) var types = world.Selection.Actors.Where(a => a.IsInWorld && a.World.LocalPlayer == a.Owner)
.SelectMany(a => a.TraitsImplementing<Production>()) .SelectMany(a => a.TraitsImplementing<Production>().Where(p => !p.IsTraitDisabled))
.SelectMany(t => t.Info.Produces); .SelectMany(t => t.Info.Produces);
queue = world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>() queue = world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>()

5
OpenRA.Mods.Common/Widgets/Logic/Ingame/Hotkeys/CycleProductionActorsHotkeyLogic.cs
View File

@@ -45,8 +45,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic.Ingame
var player = world.RenderPlayer ?? world.LocalPlayer; var player = world.RenderPlayer ?? world.LocalPlayer;
var facilities = world.ActorsHavingTrait<Production>() var facilities = world.ActorsHavingTrait<Production>()
.Where(a => a.Owner == player && !a.Info.HasTraitInfo<BaseBuildingInfo>()) .Where(a => a.Owner == player && !a.Info.HasTraitInfo<BaseBuildingInfo>()
.OrderBy(f => f.Info.TraitInfo<ProductionInfo>().Produces.First()) && a.TraitsImplementing<Production>().Any(t => !t.IsTraitDisabled))
.OrderBy(f => f.TraitsImplementing<Production>().First(t => !t.IsTraitDisabled).Info.Produces.First())
.ToList(); .ToList();
if (!facilities.Any()) if (!facilities.Any())