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

Prevent production cycling when producing actor does not occupy space

Browse Source
This commit is contained in:
abc013
2020-02-22 23:06:46 +01:00
committed by abcdefg30
parent 6ba02800ab
commit c0ece00c4b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ 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.OccupiesSpace != null && !a.Info.HasTraitInfo<BaseBuildingInfo>()
&& a.TraitsImplementing<Production>().Any(t => !t.IsTraitDisabled)) && a.TraitsImplementing<Production>().Any(t => !t.IsTraitDisabled))
.OrderBy(f => f.TraitsImplementing<Production>().First(t => !t.IsTraitDisabled).Info.Produces.First()) .OrderBy(f => f.TraitsImplementing<Production>().First(t => !t.IsTraitDisabled).Info.Produces.First())
.ToList(); .ToList();

2
OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
View File

@@ -389,7 +389,7 @@ namespace OpenRA.Mods.Common.Widgets
var facility = CurrentQueue.MostLikelyProducer().Actor; var facility = CurrentQueue.MostLikelyProducer().Actor;
if (facility == null) if (facility == null || facility.OccupiesSpace == null)
return true; return true;
if (selection.Actors.Count() == 1 && selection.Contains(facility)) if (selection.Actors.Count() == 1 && selection.Contains(facility))