From eb390802487b4b1501a7d3a11a8577f36d4cf03d Mon Sep 17 00:00:00 2001 From: tovl Date: Sat, 31 Aug 2019 13:27:22 +0200 Subject: [PATCH] Allow minefields to start and end on occupied cells. --- OpenRA.Mods.Cnc/Traits/Minelayer.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/Minelayer.cs b/OpenRA.Mods.Cnc/Traits/Minelayer.cs index f2aafaca6d..9bcc3f673d 100644 --- a/OpenRA.Mods.Cnc/Traits/Minelayer.cs +++ b/OpenRA.Mods.Cnc/Traits/Minelayer.cs @@ -185,13 +185,7 @@ namespace OpenRA.Mods.Cnc.Traits yield break; } - var underCursor = world.ScreenMap.ActorsAtMouse(mi) - .Select(a => a.Actor) - .Where(a => !world.FogObscures(a)) - .MaxByOrDefault(a => a.Info.HasTraitInfo() - ? a.Info.TraitInfo().Priority : int.MinValue); - - if (mi.Button == Game.Settings.Game.MouseButtonPreference.Action && underCursor == null) + if (mi.Button == Game.Settings.Game.MouseButtonPreference.Action) { minelayers.First().World.CancelInputMode(); foreach (var minelayer in minelayers) @@ -252,7 +246,7 @@ namespace OpenRA.Mods.Cnc.Traits cursor = "ability"; IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue); - return !othersAtTarget.Any() && modifiers.HasModifier(TargetModifiers.ForceAttack); + return modifiers.HasModifier(TargetModifiers.ForceAttack); } public bool IsQueued { get; protected set; }