From 91050ba4580e16719bdfe38f035549085af6af55 Mon Sep 17 00:00:00 2001 From: Dan9550 <56kflyingtoaster@gmail.com> Date: Fri, 3 Jan 2014 23:36:42 +1100 Subject: [PATCH] OnCapture lua trigger & nod03a Cleaned up nod03a, spaces -> tabs nod03a and OnCapture lua trigger --- OpenRA.Mods.RA/Scripting/LuaScriptEvents.cs | 8 +- mods/cnc/maps/nod03a/map.bin | Bin 0 -> 20485 bytes mods/cnc/maps/nod03a/map.yaml | 667 ++++++++++++++++++++ mods/cnc/maps/nod03a/mission.lua | 50 ++ mods/common/lua/actor.lua | 6 +- 5 files changed, 729 insertions(+), 2 deletions(-) create mode 100644 mods/cnc/maps/nod03a/map.bin create mode 100644 mods/cnc/maps/nod03a/map.yaml create mode 100644 mods/cnc/maps/nod03a/mission.lua diff --git a/OpenRA.Mods.RA/Scripting/LuaScriptEvents.cs b/OpenRA.Mods.RA/Scripting/LuaScriptEvents.cs index b5da934217..f321920777 100644 --- a/OpenRA.Mods.RA/Scripting/LuaScriptEvents.cs +++ b/OpenRA.Mods.RA/Scripting/LuaScriptEvents.cs @@ -15,11 +15,12 @@ namespace OpenRA.Mods.RA.Scripting { public class LuaScriptEventsInfo : TraitInfo { } - public class LuaScriptEvents : INotifyKilled, INotifyAddedToWorld, INotifyRemovedFromWorld + public class LuaScriptEvents : INotifyKilled, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyCapture { public event Action OnKilled = (self, e) => { }; public event Action OnAddedToWorld = self => { }; public event Action OnRemovedFromWorld = self => { }; + public event Action OnCaptured = (self, captor, oldOwner, newOwner) => { }; public void Killed(Actor self, AttackInfo e) { @@ -35,5 +36,10 @@ namespace OpenRA.Mods.RA.Scripting { OnRemovedFromWorld(self); } + + public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner) + { + OnCaptured(self, captor, oldOwner, newOwner); + } } } diff --git a/mods/cnc/maps/nod03a/map.bin b/mods/cnc/maps/nod03a/map.bin new file mode 100644 index 0000000000000000000000000000000000000000..e993e435151d771ad27c9daa06cd17030192630a GIT binary patch literal 20485 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 tJgi@?inTrXp5)cYx?*