From 26562862f751f5bebe94e4c0f6ba2b41792159ad Mon Sep 17 00:00:00 2001 From: Jan-Willem Buurlage Date: Sun, 8 Feb 2015 22:30:55 +0100 Subject: [PATCH 1/3] Add myself to authors --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3cf4e1a8e7..4f00700894 100644 --- a/AUTHORS +++ b/AUTHORS @@ -55,6 +55,7 @@ Also thanks to: * Iran * Jacob Dufault (jacobdufault) * James Dunne (jsd) + * Jan-Willem Buurlage (jwbuurlage) * Jason (atlimit8) * Jeff Harris (jeff_1amstudios) * Jes From ce6c883fb14e7406f543cc9a80aa21dd67680ffa Mon Sep 17 00:00:00 2001 From: Jan-Willem Buurlage Date: Sun, 8 Feb 2015 22:31:56 +0100 Subject: [PATCH 2/3] Fixed #7219. Reduce boarding priority to resolve conflict with force-attacking own units. --- OpenRA.Mods.Common/Traits/Passenger.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Passenger.cs b/OpenRA.Mods.Common/Traits/Passenger.cs index 2ca4791f44..a829b7df92 100644 --- a/OpenRA.Mods.Common/Traits/Passenger.cs +++ b/OpenRA.Mods.Common/Traits/Passenger.cs @@ -117,10 +117,10 @@ namespace OpenRA.Mods.Common.Traits { get { - yield return new EnterTransportTargeter("EnterTransport", 6, + yield return new EnterTransportTargeter("EnterTransport", 5, target => IsCorrectCargoType(target), target => CanEnter(target), Info.AlternateTransportsMode); - yield return new EnterTransportsTargeter("EnterTransports", 6, + yield return new EnterTransportsTargeter("EnterTransports", 5, target => IsCorrectCargoType(target), target => CanEnter(target), Info.AlternateTransportsMode); } From 7eb210637511dd11c78669adf71372a5e1c2cb07 Mon Sep 17 00:00:00 2001 From: Jan-Willem Buurlage Date: Sun, 8 Feb 2015 22:38:05 +0100 Subject: [PATCH 3/3] Change cursor according to the command with highest priority. --- OpenRA.Game/Orders/UnitOrderGenerator.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs index ed9714530b..fe54431119 100644 --- a/OpenRA.Game/Orders/UnitOrderGenerator.cs +++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs @@ -79,12 +79,13 @@ namespace OpenRA.Orders target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy); } - var orders = world.Selection.Actors + var ordersWithCursor = world.Selection.Actors .Select(a => OrderForUnit(a, target, mi)) - .Where(o => o != null); + .Where(o => o != null && o.Cursor != null); - var cursorName = orders.Select(o => o.Cursor).FirstOrDefault(); - return cursorName ?? (useSelect ? "select" : "default"); + var cursorOrder = ordersWithCursor.MaxByOrDefault(o => o.Order.OrderPriority); + + return cursorOrder != null ? cursorOrder.Cursor : (useSelect ? "select" : "default"); } static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)