From ea151542def48a330bba97522cf813a5562f7d2d Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 1 Jul 2015 18:18:13 +0200 Subject: [PATCH 1/2] Added an Infiltrate function to lua --- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 1 + .../Properties/InfiltrateProperties.cs | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 56c70f87b6..74e023c30b 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -83,6 +83,7 @@ + diff --git a/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs new file mode 100644 index 0000000000..e7052e76a6 --- /dev/null +++ b/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs @@ -0,0 +1,28 @@ +#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.RA.Activities; +using OpenRA.Scripting; + +namespace OpenRA.RA.Common.Scripting +{ + [ScriptPropertyGroup("Ability")] + public class InfiltrateProperties : ScriptActorProperties + { + public InfiltrateProperties(ScriptContext context, Actor self) + : base(context, self) { } + + [Desc("Infiltrate the target actor.")] + public void Infiltrate(Actor target) + { + Self.QueueActivity(new Infiltrate(Self, target)); + } + } +} From 6a9221286404a43d8d1ecc303d5c9921b0ea7c10 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 1 Jul 2015 18:18:22 +0200 Subject: [PATCH 2/2] Make use of the new Infiltrate function in allies05a --- mods/ra/maps/allies-05a/allies05a.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/maps/allies-05a/allies05a.lua b/mods/ra/maps/allies-05a/allies05a.lua index f2b96e0d64..12f37daccf 100644 --- a/mods/ra/maps/allies-05a/allies05a.lua +++ b/mods/ra/maps/allies-05a/allies05a.lua @@ -199,7 +199,7 @@ InitTriggers = function() Spy = Actor.Create("spy", true, { Owner = greece, Location = TrukWaypoint5.Location }) Spy.Move(SpyWaypoint.Location) - Spy.Move(Prison.Location, 3) + Spy.Infiltrate(Prison) FollowTruk = false TrukCamera.Destroy()