From 418fca3d9eaccbbad2685c200ee3d41c85920172 Mon Sep 17 00:00:00 2001 From: Smittytron Date: Sat, 27 Mar 2021 09:51:51 -0500 Subject: [PATCH] Move OnAnyDamaged function to campaign-global.lua --- mods/ra/bits/scripts/campaign-global.lua | 6 ++++++ mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua | 6 ------ mods/ra/maps/shock-therapy/shock-therapy.lua | 6 ------ mods/ra/maps/soviet-08a/soviet08a.lua | 6 ------ mods/ra/maps/soviet-08b/soviet08b.lua | 6 ------ 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/mods/ra/bits/scripts/campaign-global.lua b/mods/ra/bits/scripts/campaign-global.lua index b06e5574ce..9d9b400072 100644 --- a/mods/ra/bits/scripts/campaign-global.lua +++ b/mods/ra/bits/scripts/campaign-global.lua @@ -37,3 +37,9 @@ ChooseRandomTarget = function(unit, enemyPlayer) end return target end + +OnAnyDamaged = function(actors, func) + Utils.Do(actors, function(actor) + Trigger.OnDamaged(actor, func) + end) +end diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua b/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua index 4736cade71..4dfdaa70e8 100644 --- a/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua +++ b/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua @@ -526,9 +526,3 @@ WorldLoaded = function() Trigger.OnDamaged(Church, ChurchAttack) OnAnyDamaged(SovBase, SovBaseAttack) end - -OnAnyDamaged = function(actors, func) - Utils.Do(actors, function(actor) - Trigger.OnDamaged(actor, func) - end) -end diff --git a/mods/ra/maps/shock-therapy/shock-therapy.lua b/mods/ra/maps/shock-therapy/shock-therapy.lua index 5c4778216c..a73d40c539 100644 --- a/mods/ra/maps/shock-therapy/shock-therapy.lua +++ b/mods/ra/maps/shock-therapy/shock-therapy.lua @@ -339,9 +339,3 @@ WorldLoaded = function() MissionStart() MissionTriggers() end - -OnAnyDamaged = function(actors, func) - Utils.Do(actors, function(actor) - Trigger.OnDamaged(actor, func) - end) -end diff --git a/mods/ra/maps/soviet-08a/soviet08a.lua b/mods/ra/maps/soviet-08a/soviet08a.lua index 5096d40b69..2c1f0b7010 100644 --- a/mods/ra/maps/soviet-08a/soviet08a.lua +++ b/mods/ra/maps/soviet-08a/soviet08a.lua @@ -167,9 +167,3 @@ WorldLoaded = function() Trigger.AfterDelay(DateTime.Minutes(14), function() BoatAttack(Boat6) end) Trigger.AfterDelay(DateTime.Minutes(15), function() BoatAttack(Boat7) end) end - -OnAnyDamaged = function(actors, func) - Utils.Do(actors, function(actor) - Trigger.OnDamaged(actor, func) - end) -end diff --git a/mods/ra/maps/soviet-08b/soviet08b.lua b/mods/ra/maps/soviet-08b/soviet08b.lua index 877a0741d9..0dd4f56895 100644 --- a/mods/ra/maps/soviet-08b/soviet08b.lua +++ b/mods/ra/maps/soviet-08b/soviet08b.lua @@ -166,9 +166,3 @@ WorldLoaded = function() Trigger.AfterDelay(DateTime.Minutes(12), function() BoatAttack(Gunboat5) end) Trigger.AfterDelay(DateTime.Minutes(14), function() BoatAttack(Gunboat6) end) end - -OnAnyDamaged = function(actors, func) - Utils.Do(actors, function(actor) - Trigger.OnDamaged(actor, func) - end) -end