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

Remove AlternateTransportsMode.

Browse Source 
This conflicts with undeploy orders and has been largely
superseded by queued enter orders.
This commit is contained in:
Paul Chote
2019-05-28 21:22:09 +00:00
committed by reaperrr
parent ecd8dee575
commit 5d886b79f1
8 changed files with 20 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.Mods.Common/Traits/Passenger.cs
View File

@@ -18,8 +18,6 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
public enum AlternateTransportsMode { None, Force, Default, Always }
[Desc("This actor can enter Cargo actors.")]
public class PassengerInfo : ITraitInfo
{
@@ -27,14 +25,6 @@ namespace OpenRA.Mods.Common.Traits
public readonly PipType PipType = PipType.Green;
public readonly int Weight = 1;
[Desc("Use to set when to use alternate transports (Never, Force, Default, Always).",
"Force - use force move modifier (Alt) to enable.",
"Default - use force move modifier (Alt) to disable.")]
public readonly AlternateTransportsMode AlternateTransportsMode = AlternateTransportsMode.Force;
[Desc("Range from self for looking for an alternate transport (default: 5.5 cells).")]
public readonly WDist AlternateTransportScanRange = WDist.FromCells(11) / 2;
[GrantedConditionReference]
[Desc("The condition to grant to when this actor is loaded inside any transport.")]
public readonly string CargoCondition = null;
@@ -64,18 +54,17 @@ namespace OpenRA.Mods.Common.Traits
public Passenger(PassengerInfo info)
{
Info = info;
Func<Actor, bool> canTarget = IsCorrectCargoType;
Func<Actor, bool> useEnterCursor = CanEnter;
Orders = new EnterAlliedActorTargeter<CargoInfo>[]
{
new EnterTransportTargeter("EnterTransport", 5, canTarget, useEnterCursor, Info.AlternateTransportsMode),
new EnterTransportsTargeter("EnterTransports", 5, canTarget, useEnterCursor, Info.AlternateTransportsMode)
};
}
public Cargo ReservedCargo { get; private set; }
public IEnumerable<IOrderTargeter> Orders { get; private set; }
IEnumerable<IOrderTargeter> IIssueOrder.Orders
{
get
{
yield return new EnterAlliedActorTargeter<CargoInfo>("EnterTransport", 5, IsCorrectCargoType, CanEnter);
}
}
void INotifyCreated.Created(Actor self)
{
@@ -84,7 +73,7 @@ namespace OpenRA.Mods.Common.Traits
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{
if (order.OrderID == "EnterTransport" || order.OrderID == "EnterTransports")
if (order.OrderID == "EnterTransport")
return new Order(order.OrderID, self, target, queued);
return null;
@@ -108,7 +97,7 @@ namespace OpenRA.Mods.Common.Traits
public string VoicePhraseForOrder(Actor self, Order order)
{
if (order.OrderString != "EnterTransport" && order.OrderString != "EnterTransports")
if (order.OrderString != "EnterTransport")
return null;
if (order.Target.Type != TargetType.Actor || !CanEnter(order.Target.Actor))
@@ -141,7 +130,7 @@ namespace OpenRA.Mods.Common.Traits
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString != "EnterTransport" && order.OrderString != "EnterTransports")
if (order.OrderString != "EnterTransport")
return;
// Enter orders are only valid for own/allied actors,
@@ -160,10 +149,7 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity();
self.SetTargetLine(order.Target, Color.Green);
if (order.OrderString == "EnterTransports")
self.QueueActivity(new EnterTransports(self, order.Target));
else
self.QueueActivity(new EnterTransport(self, order.Target));
self.QueueActivity(new EnterTransport(self, order.Target));
}
public bool Reserve(Actor self, Cargo cargo)