diff --git a/mods/ra/bits/scripts/campaign-global.lua b/mods/ra/bits/scripts/campaign-global.lua index 9d9b400072..df25c16a1b 100644 --- a/mods/ra/bits/scripts/campaign-global.lua +++ b/mods/ra/bits/scripts/campaign-global.lua @@ -6,6 +6,7 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] +IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end AttackAircraftTargets = { } InitializeAttackAircraft = function(aircraft, enemyPlayer) diff --git a/mods/ra/maps/allies-03a/allies03a.lua b/mods/ra/maps/allies-03a/allies03a.lua index 850a10b463..14fd2f7ca8 100644 --- a/mods/ra/maps/allies-03a/allies03a.lua +++ b/mods/ra/maps/allies-03a/allies03a.lua @@ -23,14 +23,6 @@ else TanyaType = "e7.noautotarget" end -IdleHunt = function(actor) - Trigger.OnIdle(actor, function(a) - if a.IsInWorld then - a.Hunt() - end - end) -end - ProduceUnits = function(factory, count) if ussr.IsProducing("e1") then Trigger.AfterDelay(DateTime.Seconds(5), function() ProduceUnits(factory, count) end) diff --git a/mods/ra/maps/allies-03b/allies03b.lua b/mods/ra/maps/allies-03b/allies03b.lua index 226e78c0aa..66ea1fab02 100644 --- a/mods/ra/maps/allies-03b/allies03b.lua +++ b/mods/ra/maps/allies-03b/allies03b.lua @@ -34,14 +34,6 @@ else TanyaType = "e7.noautotarget" end -IdleHunt = function(actor) - Trigger.OnIdle(actor, function(a) - if a.IsInWorld then - a.Hunt() - end - end) -end - Tick = function() if TeleportJeepCamera and Jeep.IsInWorld then JeepCamera.Teleport(Jeep.Location) diff --git a/mods/ra/maps/allies-04/allies04-AI.lua b/mods/ra/maps/allies-04/allies04-AI.lua index a71684209b..735403ab41 100644 --- a/mods/ra/maps/allies-04/allies04-AI.lua +++ b/mods/ra/maps/allies-04/allies04-AI.lua @@ -93,8 +93,6 @@ BuildBuilding = function(building) end) end -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SetupAttackGroup = function() local units = { } diff --git a/mods/ra/maps/allies-05a/allies05a-AI.lua b/mods/ra/maps/allies-05a/allies05a-AI.lua index dcf038c201..91edd3ca21 100644 --- a/mods/ra/maps/allies-05a/allies05a-AI.lua +++ b/mods/ra/maps/allies-05a/allies05a-AI.lua @@ -26,8 +26,6 @@ HoldProduction = true BuildVehicles = true TrainInfantry = true -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SetupAttackGroup = function() local units = { } diff --git a/mods/ra/maps/allies-05b/allies05b-AI.lua b/mods/ra/maps/allies-05b/allies05b-AI.lua index bf2c640ed2..07c388bf93 100644 --- a/mods/ra/maps/allies-05b/allies05b-AI.lua +++ b/mods/ra/maps/allies-05b/allies05b-AI.lua @@ -15,8 +15,6 @@ SovietAircraftType = { "yak" } Planes = { } SovietProduction = { Conyard, USSRBarracks, USSRWarFactory } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - ProductionInterval = { easy = DateTime.Seconds(25), diff --git a/mods/ra/maps/allies-05c/allies05c-AI.lua b/mods/ra/maps/allies-05c/allies05c-AI.lua index ac672dbc7c..2807506fc5 100644 --- a/mods/ra/maps/allies-05c/allies05c-AI.lua +++ b/mods/ra/maps/allies-05c/allies05c-AI.lua @@ -15,8 +15,6 @@ SovietAircraftType = { "yak" } Planes = { } SovietProduction = { Conyard, USSRBarracks, USSRWarFactory } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - ProductionInterval = { easy = DateTime.Seconds(25), diff --git a/mods/ra/maps/allies-06a/allies06a-AI.lua b/mods/ra/maps/allies-06a/allies06a-AI.lua index 4eb593ae2c..b79c5eb8a1 100644 --- a/mods/ra/maps/allies-06a/allies06a-AI.lua +++ b/mods/ra/maps/allies-06a/allies06a-AI.lua @@ -158,8 +158,6 @@ ProduceAircraft = function() end) end -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SendAttack = function(units, path) Utils.Do(units, function(unit) unit.Patrol(path, false) diff --git a/mods/ra/maps/allies-06b/allies06b-AI.lua b/mods/ra/maps/allies-06b/allies06b-AI.lua index 772fe2fc3c..b779a0fbd5 100644 --- a/mods/ra/maps/allies-06b/allies06b-AI.lua +++ b/mods/ra/maps/allies-06b/allies06b-AI.lua @@ -170,8 +170,6 @@ ProduceAircraft = function() end) end -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SendAttack = function(units, path) Utils.Do(units, function(unit) unit.Patrol(path, false) diff --git a/mods/ra/maps/allies-07/allies07-AI.lua b/mods/ra/maps/allies-07/allies07-AI.lua index c2d854f1a2..342f59a00c 100644 --- a/mods/ra/maps/allies-07/allies07-AI.lua +++ b/mods/ra/maps/allies-07/allies07-AI.lua @@ -28,8 +28,6 @@ ProductionInterval = hard = DateTime.Seconds(5) } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - ParadropDelay = { DateTime.Seconds(30), DateTime.Minutes(1) } ParadropWaves = 6 ParadropLZs = { ParaLZ1.CenterPosition, ParaLZ2.CenterPosition, ParaLZ3.CenterPosition, ParaLZ4.CenterPosition } diff --git a/mods/ra/maps/allies-08a/allies08a-AI.lua b/mods/ra/maps/allies-08a/allies08a-AI.lua index 6ea4ccd15a..efcac8e1ca 100644 --- a/mods/ra/maps/allies-08a/allies08a-AI.lua +++ b/mods/ra/maps/allies-08a/allies08a-AI.lua @@ -13,8 +13,6 @@ SovietVehicles = { "3tnk", "3tnk", "v2rl" } SovietAircraftType = { "mig" } Migs = { } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - GroundWavesUpgradeDelay = DateTime.Minutes(12) GroundAttackUnitType = "Normal" GroundAttackUnits = diff --git a/mods/ra/maps/allies-08b/allies08b-AI.lua b/mods/ra/maps/allies-08b/allies08b-AI.lua index 2573e17483..7fe39db684 100644 --- a/mods/ra/maps/allies-08b/allies08b-AI.lua +++ b/mods/ra/maps/allies-08b/allies08b-AI.lua @@ -13,8 +13,6 @@ SovietVehicles = { "3tnk", "3tnk", "v2rl" } SovietAircraftType = { "mig" } Migs = { } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - GroundWavesUpgradeDelay = DateTime.Minutes(12) GroundAttackUnitType = "Normal" GroundAttackUnits = diff --git a/mods/ra/maps/allies-09a/allies09a-AI.lua b/mods/ra/maps/allies-09a/allies09a-AI.lua index 5a9bf796fd..a61f0646d3 100644 --- a/mods/ra/maps/allies-09a/allies09a-AI.lua +++ b/mods/ra/maps/allies-09a/allies09a-AI.lua @@ -58,8 +58,6 @@ SovietAircraftType = { "yak" } SovietSSType = { "ss" } VehicleUnits = { "3tnk", "3tnk", "3tnk", "v2rl" } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SendInfantryAttackGroup = function() if #InfantryAttackGroup < InfantryAttackGroupSize then return diff --git a/mods/ra/maps/ant-03/ant-03.lua b/mods/ra/maps/ant-03/ant-03.lua index 14d97ab1c0..64417b8f16 100644 --- a/mods/ra/maps/ant-03/ant-03.lua +++ b/mods/ra/maps/ant-03/ant-03.lua @@ -6,7 +6,6 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end StartAnts = { StartAnt1, StartAnt2 } Hive1Killzone = { CPos.New(80,83), CPos.New(81,83), CPos.New(82,83), CPos.New(83,83), CPos.New(84,83), CPos.New(85,83), CPos.New(85,84), CPos.New(85,85), CPos.New(85,86), CPos.New(85,87), CPos.New(84,87), CPos.New(83,87), CPos.New(82,87), CPos.New(81,87), CPos.New(80,87), CPos.New(80,86), CPos.New(80,85), CPos.New(80,84) } Hive2Killzone = { CPos.New(84,50), CPos.New(85,50), CPos.New(86,50), CPos.New(87,50), CPos.New(88,50), CPos.New(89,50), CPos.New(89,51), CPos.New(89,52), CPos.New(89,53), CPos.New(89,54), CPos.New(88,54), CPos.New(87,54), CPos.New(86,54), CPos.New(85,54), CPos.New(84,54), CPos.New(84,53), CPos.New(84,52), CPos.New(84,51) } diff --git a/mods/ra/maps/evacuation/evacuation.lua b/mods/ra/maps/evacuation/evacuation.lua index d5015d3d79..9b577b3c0f 100644 --- a/mods/ra/maps/evacuation/evacuation.lua +++ b/mods/ra/maps/evacuation/evacuation.lua @@ -72,14 +72,6 @@ ReinforcementsDelay = DateTime.Minutes(16) ReinforcementsUnits = { "2tnk", "2tnk", "2tnk", "2tnk", "2tnk", "2tnk", "1tnk", "1tnk", "jeep", "e1", "e1", "e1", "e1", "e3", "e3", "mcv", "truk", "truk", "truk", "truk", "truk", "truk" } -IdleHunt = function(actor) - Trigger.OnIdle(actor, function(a) - if a.IsInWorld then - a.Hunt() - end - end) -end - SpawnAlliedReinforcements = function() if allies2.IsLocalPlayer then UserInterface.SetMissionText("") diff --git a/mods/ra/maps/exodus/exodus.lua b/mods/ra/maps/exodus/exodus.lua index d8511fc7b3..a735e2d213 100644 --- a/mods/ra/maps/exodus/exodus.lua +++ b/mods/ra/maps/exodus/exodus.lua @@ -184,13 +184,6 @@ SendSovietParadrop = function() Trigger.AfterDelay(sovietParadropTicks, SendSovietParadrop) end -IdleHunt = function(unit) - Trigger.OnIdle(unit, unit.Hunt) - Trigger.OnCapture(unit, function() - Trigger.ClearAll(unit) - end) -end - AircraftTargets = function(yak) local targets = Utils.Where(Map.ActorsInWorld, function(a) return (a.Owner == allies1 or a.Owner == allies2) and a.HasProperty("Health") and yak.CanTarget(a) 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 4dfdaa70e8..b030f0dcb9 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 @@ -52,8 +52,6 @@ lstReinforcements = } } -IdleHunt = function(actor) if not actor.IsDead then Trigger.OnIdle(actor, actor.Hunt) end end - VIPs = { } MissionStart = function() FlareBoy.Move(LightFlare.Location) diff --git a/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua b/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua index 3a319dc840..01ad8004bd 100644 --- a/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua +++ b/mods/ra/maps/fall-of-greece-2-evacuation/evacuation.lua @@ -22,7 +22,6 @@ NWVillage = { NWChurch, NWHouse1, NWHouse2, NWHouse3 } SWVillage = { SWChurch, SWHouse1, SWHouse2, SWHouse3, SWHouse4 } MiddleVillage = { MiddleChurch, MiddleHouse1, MiddleHouse2, MiddleHouse3, MiddleHouse4 } EastVillage = { EastChurch, EastHouse1, EastHouse2, EastHouse3 } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end MissionStart = function() Reinforcements.Reinforce(Allies, AlliedReinforcementsA, { AlliedSpawn.Location, AlliedBase.Location }, 5) diff --git a/mods/ra/maps/in-the-nick-of-time/in-the-nick-of-time.lua b/mods/ra/maps/in-the-nick-of-time/in-the-nick-of-time.lua index c416fcded2..ac0da1f533 100644 --- a/mods/ra/maps/in-the-nick-of-time/in-the-nick-of-time.lua +++ b/mods/ra/maps/in-the-nick-of-time/in-the-nick-of-time.lua @@ -37,7 +37,6 @@ NorthWaterTeam = { "1tnk", "1tnk", "1tnk", "2tnk", "2tnk" } BoatofMammoths = { "4tnk", "4tnk", "4tnk", "4tnk", "4tnk" } EvacuateFootprint = { CPos.New(93,92), CPos.New(94,92), CPos.New(95,92), CPos.New(96,92), CPos.New(97,92), CPos.New(98,92), CPos.New(99,92) } TimerTicks = DateTime.Minutes(54) -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end AlliedReinforcements = function() Reinforcements.Reinforce(Greece, StartUnits, { AlliesEntry.Location, AlliesRally.Location }, 6) diff --git a/mods/ra/maps/infiltration/infiltration.lua b/mods/ra/maps/infiltration/infiltration.lua index 4eeb4b8e6a..7825070110 100644 --- a/mods/ra/maps/infiltration/infiltration.lua +++ b/mods/ra/maps/infiltration/infiltration.lua @@ -216,10 +216,6 @@ InsertSpies = function() end end -IdleHunt = function(unit) - Trigger.OnIdle(unit, unit.Hunt) -end - StopHunt = function(unit) if not unit.IsDead then unit.Stop() diff --git a/mods/ra/maps/intervention/intervention.lua b/mods/ra/maps/intervention/intervention.lua index 16445c5fd5..331424d7f6 100644 --- a/mods/ra/maps/intervention/intervention.lua +++ b/mods/ra/maps/intervention/intervention.lua @@ -62,14 +62,6 @@ GroundPatrolUnits = { "3tnk", "3tnk" } } -IdleHunt = function(actor) - Trigger.OnIdle(actor, function(a) - if a.IsInWorld then - a.Hunt() - end - end) -end - ParadropSovietUnits = function() local powerproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = soviets }) local aircraft = powerproxy.TargetParatroopers(MCVDeployLocation.CenterPosition, Angle.New(812)) diff --git a/mods/ra/maps/production-disruption/production-disruption.lua b/mods/ra/maps/production-disruption/production-disruption.lua index 3b1ebc0c63..2d39e64689 100644 --- a/mods/ra/maps/production-disruption/production-disruption.lua +++ b/mods/ra/maps/production-disruption/production-disruption.lua @@ -20,8 +20,6 @@ SovietSquad = { "e1", "e1", "e1", "e4", "e4" } V2Squad = { "v2rl", "v2rl" } SubEscapePath = { SubPath1, SubPath2, SubPath3 } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - MissionStart = function() LZCamera = Actor.Create("camera", true, { Owner = Greece, Location = LZ.Location }) Chalk1.TargetParatroopers(LZ.CenterPosition, Angle.New(740)) diff --git a/mods/ra/maps/sarin-gas-1-crackdown/crackdown-AI.lua b/mods/ra/maps/sarin-gas-1-crackdown/crackdown-AI.lua index c6f017abb8..d8d2eedfa8 100644 --- a/mods/ra/maps/sarin-gas-1-crackdown/crackdown-AI.lua +++ b/mods/ra/maps/sarin-gas-1-crackdown/crackdown-AI.lua @@ -33,8 +33,6 @@ GroundWavesDelays = hard = 2 } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SendBGAttackGroup = function() if #BGAttackGroup < BGAttackGroupSize then return diff --git a/mods/ra/maps/sarin-gas-2-down-under/downunder.lua b/mods/ra/maps/sarin-gas-2-down-under/downunder.lua index 80d82c7eed..2b53e2b2e9 100644 --- a/mods/ra/maps/sarin-gas-2-down-under/downunder.lua +++ b/mods/ra/maps/sarin-gas-2-down-under/downunder.lua @@ -356,8 +356,6 @@ SpyTruckDrive = function() end) end -IdleHunt = function(actor) if not actor.IsDead then Trigger.OnIdle(actor, actor.Hunt) end end - PrisonEscape = function() local alarmed Trigger.OnEnteredFootprint(PrisonAlarm, function(unit, id) diff --git a/mods/ra/maps/sarin-gas-3-controlled-burn/controlledburn.lua b/mods/ra/maps/sarin-gas-3-controlled-burn/controlledburn.lua index 7e2d20129f..e6af453d5d 100644 --- a/mods/ra/maps/sarin-gas-3-controlled-burn/controlledburn.lua +++ b/mods/ra/maps/sarin-gas-3-controlled-burn/controlledburn.lua @@ -20,8 +20,6 @@ MCVReinforcements = hard = { "1tnk", "1tnk", "mcv" } } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SetupTriggers = function() Trigger.OnEnteredFootprint(MammothStart, function(actor, mammothcam) if actor.Owner == Greece then diff --git a/mods/ra/maps/shock-therapy/shock-therapy.lua b/mods/ra/maps/shock-therapy/shock-therapy.lua index a73d40c539..304c38d844 100644 --- a/mods/ra/maps/shock-therapy/shock-therapy.lua +++ b/mods/ra/maps/shock-therapy/shock-therapy.lua @@ -26,7 +26,6 @@ AlliedInfantry = { "e1", "e1", "e1", "e3" } AttackGroupSize = 4 InfantryDelay = DateTime.Seconds(10) IdlingUnits = { } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end MissionStart = function() LZCamera = Actor.Create("camera", true, { Owner = USSR, Location = LZ.Location }) diff --git a/mods/ra/maps/siberian-conflict-1-fresh-tracks/fresh-tracks.lua b/mods/ra/maps/siberian-conflict-1-fresh-tracks/fresh-tracks.lua index 01a2fea450..9211b7a789 100644 --- a/mods/ra/maps/siberian-conflict-1-fresh-tracks/fresh-tracks.lua +++ b/mods/ra/maps/siberian-conflict-1-fresh-tracks/fresh-tracks.lua @@ -12,8 +12,6 @@ Squad2 = { SecondSquad1, SecondSquad2, SecondSquad3 } PatrolMammothPath = { Patrol1.Location, Patrol2.Location, Patrol3.Location, Patrol4.Location, Patrol5.Location, Patrol6.Location, Patrol7.Location } ConvoyEscape = { CPos.New(113, 42), CPos.New(117, 71) } -IdleHunt = function(actor) if not actor.IsDead then Trigger.OnIdle(actor, actor.Hunt) end end - ConvoyUnits = { easy = { { "e2", "e2", "e2", "truk", "truk", "truk" }, { "3tnk", "3tnk", "truk", "truk", "truk" } }, diff --git a/mods/ra/maps/siberian-conflict-3-wasteland/wasteland-AI.lua b/mods/ra/maps/siberian-conflict-3-wasteland/wasteland-AI.lua index 5f3e72e46a..8573c7e848 100644 --- a/mods/ra/maps/siberian-conflict-3-wasteland/wasteland-AI.lua +++ b/mods/ra/maps/siberian-conflict-3-wasteland/wasteland-AI.lua @@ -23,8 +23,6 @@ ProductionInterval = hard = DateTime.Seconds(11) } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - ParadropDelays = { easy = { DateTime.Minutes(3), DateTime.Minutes(4) }, diff --git a/mods/ra/maps/soviet-04a/soviet04a-AI.lua b/mods/ra/maps/soviet-04a/soviet04a-AI.lua index a424de0656..b46861f419 100644 --- a/mods/ra/maps/soviet-04a/soviet04a-AI.lua +++ b/mods/ra/maps/soviet-04a/soviet04a-AI.lua @@ -6,8 +6,6 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - IdlingUnits = function() local lazyUnits = Greece.GetGroundAttackers() diff --git a/mods/ra/maps/soviet-04b/soviet04b-AI.lua b/mods/ra/maps/soviet-04b/soviet04b-AI.lua index 3a395db407..74ef249b9f 100644 --- a/mods/ra/maps/soviet-04b/soviet04b-AI.lua +++ b/mods/ra/maps/soviet-04b/soviet04b-AI.lua @@ -6,8 +6,6 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - IdlingUnits = function() local lazyUnits = Greece.GetGroundAttackers() diff --git a/mods/ra/maps/soviet-05/soviet05-AI.lua b/mods/ra/maps/soviet-05/soviet05-AI.lua index 7b7e370ac9..b5602067fe 100644 --- a/mods/ra/maps/soviet-05/soviet05-AI.lua +++ b/mods/ra/maps/soviet-05/soviet05-AI.lua @@ -6,9 +6,6 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] - -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - IdlingUnits = function() local lazyUnits = Utils.Where(Map.ActorsInWorld, function(actor) return actor.HasProperty("Hunt") and actor.Owner == Greece end) diff --git a/mods/ra/maps/soviet-06a/soviet06a-AI.lua b/mods/ra/maps/soviet-06a/soviet06a-AI.lua index 69a167786c..b3d6a2890e 100644 --- a/mods/ra/maps/soviet-06a/soviet06a-AI.lua +++ b/mods/ra/maps/soviet-06a/soviet06a-AI.lua @@ -6,8 +6,6 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - IdlingUnits = function() local lazyUnits = enemy.GetGroundAttackers() diff --git a/mods/ra/maps/soviet-06b/soviet06b-AI.lua b/mods/ra/maps/soviet-06b/soviet06b-AI.lua index d6687aab94..605d3ebc76 100644 --- a/mods/ra/maps/soviet-06b/soviet06b-AI.lua +++ b/mods/ra/maps/soviet-06b/soviet06b-AI.lua @@ -6,8 +6,6 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - IdlingUnits = function() local lazyUnits = enemy.GetGroundAttackers() diff --git a/mods/ra/maps/soviet-08a/soviet08a-AI.lua b/mods/ra/maps/soviet-08a/soviet08a-AI.lua index cd592de771..f98f1b8e5c 100644 --- a/mods/ra/maps/soviet-08a/soviet08a-AI.lua +++ b/mods/ra/maps/soviet-08a/soviet08a-AI.lua @@ -56,8 +56,6 @@ AlliedVehicles = Upgraded = { "2tnk", "arty" } } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - WTransWaves = function() local way = Utils.Random(WTransWays) local units = Utils.Random(WTransUnits) diff --git a/mods/ra/maps/soviet-08b/soviet08b-AI.lua b/mods/ra/maps/soviet-08b/soviet08b-AI.lua index 3a0a29b053..2ee41318f0 100644 --- a/mods/ra/maps/soviet-08b/soviet08b-AI.lua +++ b/mods/ra/maps/soviet-08b/soviet08b-AI.lua @@ -56,8 +56,6 @@ AlliedVehicles = Upgraded = { "2tnk", "arty" } } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - WTransWaves = function() local way = Utils.Random(WTransWays) local units = Utils.Random(WTransUnits) diff --git a/mods/ra/maps/soviet-09/soviet09-AI.lua b/mods/ra/maps/soviet-09/soviet09-AI.lua index db1ab97e0f..95bbb18b91 100644 --- a/mods/ra/maps/soviet-09/soviet09-AI.lua +++ b/mods/ra/maps/soviet-09/soviet09-AI.lua @@ -6,8 +6,6 @@ the License, or (at your option) any later version. For more information, see COPYING. ]] -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - AttackGroup = { } AttackGroupSize = 12 AlliedInfantry = { "e1", "e3" } diff --git a/mods/ra/maps/soviet-11a/soviet11a-AI.lua b/mods/ra/maps/soviet-11a/soviet11a-AI.lua index aa483856c3..e502b37ecb 100644 --- a/mods/ra/maps/soviet-11a/soviet11a-AI.lua +++ b/mods/ra/maps/soviet-11a/soviet11a-AI.lua @@ -73,8 +73,6 @@ ProductionDelays = hard = 1 } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SendCruiser = function() if NavalYard2.IsDead or NavalYard2.Owner ~= Greece then return diff --git a/mods/ra/maps/soviet-11b/soviet11b-AI.lua b/mods/ra/maps/soviet-11b/soviet11b-AI.lua index a557ac2d0b..d8257e0805 100644 --- a/mods/ra/maps/soviet-11b/soviet11b-AI.lua +++ b/mods/ra/maps/soviet-11b/soviet11b-AI.lua @@ -76,8 +76,6 @@ ProductionDelays = hard = 1 } -IdleHunt = function(unit) if not unit.IsDead then Trigger.OnIdle(unit, unit.Hunt) end end - SendCruiser = function() if NavalYard2.IsDead or NavalYard2.Owner ~= Greece then return diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua index 0c3083767f..5edb6e44fb 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua @@ -37,14 +37,6 @@ TanyaTrigger = { CPos.New(59, 43), CPos.New(60, 43), CPos.New(61, 43), CPos.New( GreeceHarvestersAreDead = false AlloyFacilityDestroyed = false -IdleHunt = function(actor) - Trigger.OnIdle(actor, function(a) - if a.IsInWorld then - a.Hunt() - end - end) -end - WorldLoaded = function() --Players Setup diff --git a/mods/ra/maps/survival01/survival01.lua b/mods/ra/maps/survival01/survival01.lua index 769244bdf0..09e0fe73b3 100644 --- a/mods/ra/maps/survival01/survival01.lua +++ b/mods/ra/maps/survival01/survival01.lua @@ -182,14 +182,6 @@ FinishTimer = function() Trigger.AfterDelay(DateTime.Seconds(10), function() UserInterface.SetMissionText("") end) end -IdleHunt = function(unit) - Trigger.OnIdle(unit, function(a) - if a.IsInWorld then - a.Hunt() - end - end) -end - SendSovietParadrops = function(table) local aircraft = powerproxy.TargetParatroopers(table[2].CenterPosition, table[1]) Utils.Do(aircraft, function(a) diff --git a/mods/ra/maps/survival02/survival02.lua b/mods/ra/maps/survival02/survival02.lua index dbd7b846ec..af887c8640 100644 --- a/mods/ra/maps/survival02/survival02.lua +++ b/mods/ra/maps/survival02/survival02.lua @@ -43,14 +43,6 @@ ParaWaves = { delay = AttackTicks * 3, type = "SovietSquad", target = SovietParaDrop1 } } -IdleHunt = function(unit) - Trigger.OnIdle(unit, function(a) - if a.IsInWorld then - a.Hunt() - end - end) -end - GuardHarvester = function(unit, harvester) if not unit.IsDead then unit.Stop()