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

Fixes issues with support powers and adds property to all IOrderGenerator classes to determine priority over selection in the left-click order scheme.

Browse Source
This commit is contained in:
Bynnar18
2015-02-28 15:49:15 -06:00
parent 7b46b76329
commit 0abe8f9b2b
17 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -96,10 +96,10 @@ namespace OpenRA.Orders
var o = OrderForUnit(underCursor, target, mi);
if (o == null || o.Trait is IMove)
return true;
if (o != null && o.Order.OverrideSelection)
return false;
return false;
return true;
}
static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)

1
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -79,6 +79,7 @@ namespace OpenRA.Traits
int OrderPriority { get; }
bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor);
bool IsQueued { get; }
bool OverrideSelection { get; }
}
public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }

12
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -68,9 +68,15 @@ namespace OpenRA.Widgets
dragStart = xy;
// Place buildings
if (!useClassicMouseStyle || !World.Selection.Actors.Any())
// Place buildings, use support powers, and other non-unit things
if (!(World.OrderGenerator is UnitOrderGenerator))
{
ApplyOrders(World, xy, mi);
dragStart = dragEnd = null;
YieldMouseFocus(mi);
lastMousePosition = xy;
return true;
}
}
if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Move && dragStart.HasValue)
@@ -114,8 +120,6 @@ namespace OpenRA.Widgets
World.Selection.Combine(World, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
}
}
else if (useClassicMouseStyle)
ApplyOrders(World, xy, mi);
dragStart = dragEnd = null;
YieldMouseFocus(mi);

4
OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
View File

@@ -45,6 +45,10 @@ namespace OpenRA.Mods.Cnc.Traits
public override IOrderGenerator OrderGenerator(string order, SupportPowerManager manager)
{
// Clear selection if using Left-Click Orders
if (Game.Settings.Game.UseClassicMouseStyle)
manager.Self.World.Selection.Clear();
Sound.PlayToPlayer(manager.Self.Owner, Info.SelectTargetSound);
var info = Info as IonCannonPowerInfo;
return new SelectGenericPowerTarget(order, manager, info.Cursor, MouseButton.Left);

1
OpenRA.Mods.Common/Orders/DeployOrderTargeter.cs
View File

@@ -32,6 +32,7 @@ namespace OpenRA.Mods.Common.Orders
public string OrderID { get; private set; }
public int OrderPriority { get; private set; }
public bool OverrideSelection { get { return true; } }
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
{

4
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -34,6 +34,10 @@ namespace OpenRA.Mods.Common.Orders
producer = queue.Actor;
building = name;
// Clear selection if using Left-Click Orders
if (Game.Settings.Game.UseClassicMouseStyle)
producer.World.Selection.Clear();
var map = producer.World.Map;
var tileset = producer.World.TileSet.Id.ToLowerInvariant();
buildingInfo = map.Rules.Actors[building].Traits.Get<BuildingInfo>();

1
OpenRA.Mods.Common/Orders/UnitOrderTargeter.cs
View File

@@ -31,6 +31,7 @@ namespace OpenRA.Mods.Common.Orders
public string OrderID { get; private set; }
public int OrderPriority { get; private set; }
public bool? ForceAttack = null;
public bool OverrideSelection { get { return true; } }
public abstract bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor);
public abstract bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor);

1
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -302,6 +302,7 @@ namespace OpenRA.Mods.Common.Traits
{
public string OrderID { get { return "Move"; } }
public int OrderPriority { get { return 4; } }
public bool OverrideSelection { get { return false; } }
readonly AircraftInfo info;

1
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -194,6 +194,7 @@ namespace OpenRA.Mods.Common.Traits
public string OrderID { get; private set; }
public int OrderPriority { get; private set; }
public bool OverrideSelection { get { return true; } }
bool CanTargetActor(Actor self, Target target, TargetModifiers modifiers, ref string cursor)
{

1
OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -56,6 +56,7 @@ namespace OpenRA.Mods.Common.Traits
{
public string OrderID { get { return "SetRallyPoint"; } }
public int OrderPriority { get { return 0; } }
public bool OverrideSelection { get { return true; } }
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
{

1
OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -445,6 +445,7 @@ namespace OpenRA.Mods.Common.Traits
public string OrderID { get { return "Harvest"; } }
public int OrderPriority { get { return 10; } }
public bool IsQueued { get; protected set; }
public bool OverrideSelection { get { return true; } }
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
{

1
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -619,6 +619,7 @@ namespace OpenRA.Mods.Common.Traits
{
readonly MobileInfo unitType;
readonly bool rejectMove;
public bool OverrideSelection { get { return false; } }
public MoveOrderTargeter(Actor self, MobileInfo unitType)
{

4
OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs
View File

@@ -102,6 +102,10 @@ namespace OpenRA.Mods.Common.Traits
public SelectTarget(World world, string order, SupportPowerManager manager, GrantUpgradePower power)
{
// Clear selection if using Left-Click Orders
if (Game.Settings.Game.UseClassicMouseStyle)
manager.Self.World.Selection.Clear();
this.manager = manager;
this.order = order;
this.power = power;

4
OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
View File

@@ -239,6 +239,10 @@ namespace OpenRA.Mods.Common.Traits
public SelectGenericPowerTarget(string order, SupportPowerManager manager, string cursor, MouseButton button)
{
// Clear selection if using Left-Click Orders
if (Game.Settings.Game.UseClassicMouseStyle)
manager.Self.World.Selection.Clear();
this.manager = manager;
this.order = order;
this.cursor = cursor;

1
OpenRA.Mods.RA/Traits/Minelayer.cs
View File

@@ -197,6 +197,7 @@ namespace OpenRA.Mods.RA.Traits
{
public string OrderID { get { return "BeginMinefield"; } }
public int OrderPriority { get { return 5; } }
public bool OverrideSelection { get { return true; } }
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
{

1
OpenRA.Mods.RA/Traits/PortableChrono.cs
View File

@@ -119,6 +119,7 @@ namespace OpenRA.Mods.RA.Traits
public string OrderID { get { return "PortableChronoTeleport"; } }
public int OrderPriority { get { return 5; } }
public bool IsQueued { get; protected set; }
public bool OverrideSelection { get { return true; } }
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
{

4
OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -101,6 +101,10 @@ namespace OpenRA.Mods.RA.Traits
public SelectTarget(World world, string order, SupportPowerManager manager, ChronoshiftPower power)
{
// Clear selection if using Left-Click Orders
if (Game.Settings.Game.UseClassicMouseStyle)
manager.Self.World.Selection.Clear();
this.manager = manager;
this.order = order;
this.power = power;