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

Merge Plane and Helicopter into Aircraft

Browse Source
This commit is contained in:
Pavel Penev
2015-08-06 18:33:52 +03:00
parent 0ee1ad3fa4
commit 8a44366667
28 changed files with 401 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,11 +137,19 @@ namespace OpenRA.Mods.Common.Scripting
}
else
{
var heli = transport.Info.TraitInfoOrDefault<HelicopterInfo>();
if (heli != null)
var aircraftInfo = transport.TraitOrDefault<Aircraft>();
if (aircraftInfo != null)
{
transport.QueueActivity(new Turn(transport, heli.InitialFacing));
transport.QueueActivity(new HeliLand(transport, true));
if (!aircraftInfo.IsPlane)
{
transport.QueueActivity(new Turn(transport, aircraftInfo.Info.InitialFacing));
transport.QueueActivity(new HeliLand(transport, true));
}
else
{
transport.QueueActivity(new Land(transport, Target.FromCell(transport.World, entryPath.Last())));
}
transport.QueueActivity(new Wait(15));
}
@@ -151,7 +159,7 @@ namespace OpenRA.Mods.Common.Scripting
transport.QueueActivity(new WaitFor(() => cargo.IsEmpty(transport)));
}
transport.QueueActivity(new Wait(heli != null ? 50 : 25));
transport.QueueActivity(new Wait(aircraftInfo != null ? 50 : 25));
}
if (exitFunc != null)

21
OpenRA.Mods.Common/Scripting/Properties/PlaneProperties.cs → OpenRA.Mods.Common/Scripting/Properties/AircraftProperties.cs
View File

@@ -16,23 +16,34 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Movement")]
public class PlaneProperties : ScriptActorProperties, Requires<PlaneInfo>
public class AircraftProperties : ScriptActorProperties, Requires<AircraftInfo>
{
public PlaneProperties(ScriptContext context, Actor self)
: base(context, self) { }
readonly bool isPlane;
public AircraftProperties(ScriptContext context, Actor self)
: base(context, self)
{
isPlane = self.Trait<Aircraft>().IsPlane;
}
[ScriptActorPropertyActivity]
[Desc("Fly within the cell grid.")]
public void Move(CPos cell)
{
Self.QueueActivity(new Fly(Self, Target.FromCell(Self.World, cell)));
if (isPlane)
Self.QueueActivity(new Fly(Self, Target.FromCell(Self.World, cell)));
else
Self.QueueActivity(new HeliFly(Self, Target.FromCell(Self.World, cell)));
}
[ScriptActorPropertyActivity]
[Desc("Return to the base, which is either the airfield given, or an auto-selected one otherwise.")]
public void ReturnToBase(Actor airfield = null)
{
Self.QueueActivity(new ReturnToBase(Self, airfield));
if (isPlane)
Self.QueueActivity(new ReturnToBase(Self, airfield));
else
Self.QueueActivity(new HeliReturn(Self));
}
}
}

31
OpenRA.Mods.Common/Scripting/Properties/HelicopterProperties.cs
View File

@@ -1,31 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Movement")]
public class HelicopterProperties : ScriptActorProperties, Requires<HelicopterInfo>
{
public HelicopterProperties(ScriptContext context, Actor self)
: base(context, self) { }
[ScriptActorPropertyActivity]
[Desc("Fly within the cell grid.")]
public void Move(CPos cell)
{
Self.QueueActivity(new HeliFly(Self, Target.FromCell(Self.World, cell)));
}
}
}