Formatting: wrap and indent long argument lists

This commit is contained in:
Ivaylo Draganov
2020-05-15 15:49:06 +03:00
committed by abcdefg30
parent d5ff5c672b
commit 227567dfe1
8 changed files with 56 additions and 10 deletions

View File

@@ -940,11 +940,19 @@ namespace OpenRA.Mods.Common.Traits
{ {
get get
{ {
yield return new EnterAlliedActorTargeter<BuildingInfo>("ForceEnter", 6, Info.EnterCursor, Info.EnterBlockedCursor, yield return new EnterAlliedActorTargeter<BuildingInfo>(
"ForceEnter",
6,
Info.EnterCursor,
Info.EnterBlockedCursor,
(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, true)); target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, true));
yield return new EnterAlliedActorTargeter<BuildingInfo>("Enter", 5, Info.EnterCursor, Info.EnterBlockedCursor, yield return new EnterAlliedActorTargeter<BuildingInfo>(
"Enter",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
AircraftCanEnter, AircraftCanEnter,
target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, !Info.TakeOffOnResupply)); target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, !Info.TakeOffOnResupply));

View File

@@ -65,7 +65,12 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (!IsTraitDisabled) if (!IsTraitDisabled)
{ {
yield return new EnterAlliedActorTargeter<BuildingInfo>("Enter", 5, Info.EnterCursor, Info.EnterBlockedCursor, AircraftCanEnter, yield return new EnterAlliedActorTargeter<BuildingInfo>(
"Enter",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
AircraftCanEnter,
target => Reservable.IsAvailableFor(target, self)); target => Reservable.IsAvailableFor(target, self));
yield return new AircraftMoveOrderTargeter(self, this); yield return new AircraftMoveOrderTargeter(self, this);

View File

@@ -60,7 +60,13 @@ namespace OpenRA.Mods.Common.Traits
get get
{ {
if (!IsTraitDisabled) if (!IsTraitDisabled)
yield return new EnterAlliedActorTargeter<CargoInfo>("EnterTransport", 5, Info.EnterCursor, Info.EnterBlockedCursor, IsCorrectCargoType, CanEnter); yield return new EnterAlliedActorTargeter<CargoInfo>(
"EnterTransport",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
IsCorrectCargoType,
CanEnter);
} }
} }

View File

@@ -63,7 +63,13 @@ namespace OpenRA.Mods.Common.Traits
get get
{ {
if (!IsTraitDisabled) if (!IsTraitDisabled)
yield return new EnterAlliedActorTargeter<BuildingInfo>("Repair", 5, Info.EnterCursor, Info.EnterBlockedCursor, CanRepairAt, _ => CanRepair()); yield return new EnterAlliedActorTargeter<BuildingInfo>(
"Repair",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
CanRepairAt,
_ => CanRepair());
} }
} }

View File

@@ -281,7 +281,11 @@ namespace OpenRA.Mods.Common.Traits
{ {
get get
{ {
yield return new EnterAlliedActorTargeter<IAcceptResourcesInfo>("Deliver", 5, Info.EnterCursor, Info.EnterBlockedCursor, yield return new EnterAlliedActorTargeter<IAcceptResourcesInfo>(
"Deliver",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
(proc, _) => IsAcceptableProcType(proc), (proc, _) => IsAcceptableProcType(proc),
proc => proc.Trait<IAcceptResources>().AllowDocking); proc => proc.Trait<IAcceptResources>().AllowDocking);
yield return new HarvestOrderTargeter(); yield return new HarvestOrderTargeter();

View File

@@ -73,7 +73,13 @@ namespace OpenRA.Mods.Common.Traits
{ {
get get
{ {
yield return new EnterAlliedActorTargeter<CargoInfo>("EnterTransport", 5, Info.EnterCursor, Info.EnterBlockedCursor, IsCorrectCargoType, CanEnter); yield return new EnterAlliedActorTargeter<CargoInfo>(
"EnterTransport",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
IsCorrectCargoType,
CanEnter);
} }
} }

View File

@@ -68,7 +68,13 @@ namespace OpenRA.Mods.Common.Traits
get get
{ {
if (!isAircraft) if (!isAircraft)
yield return new EnterAlliedActorTargeter<BuildingInfo>("Repair", 5, Info.EnterCursor, Info.EnterBlockedCursor, CanRepairAt, _ => CanRepair() || CanRearm()); yield return new EnterAlliedActorTargeter<BuildingInfo>(
"Repair",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
CanRepairAt,
_ => CanRepair() || CanRearm());
} }
} }

View File

@@ -56,8 +56,13 @@ namespace OpenRA.Mods.Common.Traits
{ {
get get
{ {
yield return new EnterAlliedActorTargeter<BuildingInfo>("RepairNear", 5, Info.EnterCursor, Info.EnterBlockedCursor, yield return new EnterAlliedActorTargeter<BuildingInfo>(
CanRepairAt, _ => ShouldRepair()); "RepairNear",
5,
Info.EnterCursor,
Info.EnterBlockedCursor,
CanRepairAt,
_ => ShouldRepair());
} }
} }