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

The 'Jump to base' hotkey is useless if the Construction Yard is destroyed #3318

Browse Source 
Now works like original Red Alert.  When there are no more Construction Yards the 'Jump to base' hotkey goes to the oldest undestroyed building.
This commit is contained in:
bryanwilbur
2015-06-29 12:54:01 -06:00
committed by Paul Chote
parent ded5a2b16a
commit 031109d766
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
View File

@@ -15,6 +15,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Orders; using OpenRA.Orders;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets namespace OpenRA.Mods.Common.Widgets
@@ -191,8 +192,20 @@ namespace OpenRA.Mods.Common.Widgets
.Select(b => b.Actor) .Select(b => b.Actor)
.ToList(); .ToList();
// If no BaseBuilding exist pick the first selectable Building.
if (!bases.Any()) if (!bases.Any())
return true; {
var building = world.ActorsWithTrait<Building>()
.Select(b => b.Actor)
.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.HasTrait<Selectable>());
// No buildings left
if (building == null)
return true;
world.Selection.Combine(world, new Actor[] { building }, false, true);
return ToSelection();
}
var next = bases var next = bases
.SkipWhile(b => !world.Selection.Actors.Contains(b)) .SkipWhile(b => !world.Selection.Actors.Contains(b))