Merge pull request #8418 from abcdefg30/newlua_other_cool_stuff

Added even more lua functions

OpenRA.Mods.Common/Scripting/Global/BeaconGlobal.cs

@@ -0,0 +1,47 @@
+#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 System.Linq;
+using OpenRA.Mods.Common.Effects;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Scripting;
+
+namespace OpenRA.Mods.Common.Scripting
+{
+	[ScriptGlobal("Beacon")]
+	public class BeaconGlobal : ScriptGlobal
+	{
+		readonly RadarPings radarPings;
+
+		public BeaconGlobal(ScriptContext context) : base(context)
+		{
+			radarPings = context.World.WorldActor.TraitOrDefault<RadarPings>();
+		}
+
+		[Desc("Creates a new beacon that stays for the specified time at the specified WPos." +
+			"Does not remove player set beacons, nor gets removed by placing them.")]
+		public Beacon New(Player owner,  WPos position, int duration = 30 * 25, bool showRadarPings = true, string palettePrefix = "player")
+		{
+			var playerBeacon = new Beacon(owner, position, duration, palettePrefix);
+			owner.PlayerActor.World.AddFrameEndTask(w => w.Add(playerBeacon));
+
+			if (showRadarPings && radarPings != null)
+			{
+				radarPings.Add(
+					() => owner.IsAlliedWith(owner.World.RenderPlayer),
+					position,
+					owner.Color.RGB,
+					duration);
+			}
+
+			return playerBeacon;
+		}
+	}
+}

OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs

@@ -54,5 +54,12 @@ namespace OpenRA.Mods.Common.Scripting
 		{
 			Self.Trait<Mobile>().Nudge(Self, Self, true);
 		}
+
+		[ScriptActorPropertyActivity]
+		[Desc("Move to and enter the transport.")]
+		public void EnterTransport(Actor transport)
+		{
+			Self.QueueActivity(new EnterTransport(Self, transport, 1, true));
+		}
 	}
 }