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

Find alternative landing spots for blocked reinforcements

Browse Source
This commit is contained in:
abcdefg30
2017-08-07 13:53:49 +02:00
committed by reaperrr
parent 80bf36e1a8
commit f48ba0ff86
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenRA.Mods.Common/Scripting/Global/ReinforcementsGlobal.cs
View File

@@ -109,10 +109,12 @@ namespace OpenRA.Mods.Common.Scripting
"been supplied. Afterwards, the transport will follow the exitPath and leave the map, " + "been supplied. Afterwards, the transport will follow the exitPath and leave the map, " +
"unless a custom exitFunc has been supplied. actionFunc will be called as " + "unless a custom exitFunc has been supplied. actionFunc will be called as " +
"actionFunc(Actor transport, Actor[] cargo). exitFunc will be called as exitFunc(Actor transport). " + "actionFunc(Actor transport, Actor[] cargo). exitFunc will be called as exitFunc(Actor transport). " +
"dropRange determines how many cells away the transport will try to land " +
"if the actual destination is blocked (if the transport is an aircraft). " +
"Returns a table in which the first value is the transport, " + "Returns a table in which the first value is the transport, " +
"and the second a table containing the deployed units.")] "and the second a table containing the deployed units.")]
public LuaTable ReinforceWithTransport(Player owner, string actorType, string[] cargoTypes, CPos[] entryPath, CPos[] exitPath = null, public LuaTable ReinforceWithTransport(Player owner, string actorType, string[] cargoTypes, CPos[] entryPath, CPos[] exitPath = null,
LuaFunction actionFunc = null, LuaFunction exitFunc = null) LuaFunction actionFunc = null, LuaFunction exitFunc = null, int dropRange = 3)
{ {
var transport = CreateActor(owner, actorType, true, entryPath[0], entryPath.Length > 1 ? entryPath[1] : (CPos?)null); var transport = CreateActor(owner, actorType, true, entryPath[0], entryPath.Length > 1 ? entryPath[1] : (CPos?)null);
var cargo = transport.TraitOrDefault<Cargo>(); var cargo = transport.TraitOrDefault<Cargo>();
@@ -143,17 +145,35 @@ namespace OpenRA.Mods.Common.Scripting
} }
else else
{ {
var aircraftInfo = transport.Info.TraitInfoOrDefault<AircraftInfo>(); var aircraft = transport.TraitOrDefault<Aircraft>();
if (aircraftInfo != null) if (aircraft != null)
{ {
if (aircraftInfo.VTOL) var destination = entryPath.Last();
// Try to find an alternative landing spot if we can't land at the current destination
if (!aircraft.CanLand(destination) && dropRange > 0)
{ {
transport.QueueActivity(new Turn(transport, aircraftInfo.InitialFacing)); foreach (var c in transport.World.Map.FindTilesInCircle(destination, dropRange))
{
if (!aircraft.CanLand(c))
continue;
destination = c;
break;
}
}
if (aircraft.Info.VTOL)
{
if (destination != entryPath.Last())
Move(transport, destination);
transport.QueueActivity(new Turn(transport, aircraft.Info.InitialFacing));
transport.QueueActivity(new HeliLand(transport, true)); transport.QueueActivity(new HeliLand(transport, true));
} }
else else
{ {
transport.QueueActivity(new Land(transport, Target.FromCell(transport.World, entryPath.Last()))); transport.QueueActivity(new Land(transport, Target.FromCell(transport.World, destination)));
} }
transport.QueueActivity(new Wait(15)); transport.QueueActivity(new Wait(15));
@@ -165,7 +185,7 @@ namespace OpenRA.Mods.Common.Scripting
transport.QueueActivity(new WaitFor(() => cargo.IsEmpty(transport))); transport.QueueActivity(new WaitFor(() => cargo.IsEmpty(transport)));
} }
transport.QueueActivity(new Wait(aircraftInfo != null ? 50 : 25)); transport.QueueActivity(new Wait(aircraft != null ? 50 : 25));
} }
if (exitFunc != null) if (exitFunc != null)