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

Fix that aircraft with TakeOffOnResupply can't force-land

Browse Source
This commit is contained in:
reaperrr
2019-08-08 20:30:09 +02:00
committed by abcdefg30
parent 969be686a3
commit 7cfc65010f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -928,7 +928,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
yield return new EnterAlliedActorTargeter<BuildingInfo>("ForceEnter", 6, yield return new EnterAlliedActorTargeter<BuildingInfo>("ForceEnter", 6,
(target, modifiers) => Info.CanForceLand && modifiers.HasModifier(TargetModifiers.ForceMove) && AircraftCanEnter(target), (target, modifiers) => Info.CanForceLand && modifiers.HasModifier(TargetModifiers.ForceMove) && AircraftCanEnter(target),
target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, !Info.TakeOffOnResupply)); target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, true));
yield return new EnterAlliedActorTargeter<BuildingInfo>("Enter", 5, yield return new EnterAlliedActorTargeter<BuildingInfo>("Enter", 5,
AircraftCanEnter, target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target)); AircraftCanEnter, target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target));
@@ -1019,7 +1019,7 @@ namespace OpenRA.Mods.Common.Traits
var targetActor = order.Target.Actor; var targetActor = order.Target.Actor;
var isForceEnter = orderString == "ForceEnter"; var isForceEnter = orderString == "ForceEnter";
var canResupplyAt = AircraftCanResupplyAt(targetActor, isForceEnter && !Info.TakeOffOnResupply); var canResupplyAt = AircraftCanResupplyAt(targetActor, isForceEnter || !Info.TakeOffOnResupply);
// This is what the order targeter checks to display the correct cursor, so we need to make sure // This is what the order targeter checks to display the correct cursor, so we need to make sure
// the behavior matches the cursor if the player clicks despite a "blocked" cursor. // the behavior matches the cursor if the player clicks despite a "blocked" cursor.