From 6e18de4370c5e8c1d66c42a432a02c747b9005d8 Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Mon, 9 Sep 2019 22:24:25 +0200
Subject: [PATCH] Fix idling aircraft on Intervention

---
 mods/ra/maps/intervention/intervention.lua | 12 +++++-------
 mods/ra/maps/intervention/rules.yaml       |  9 +++++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mods/ra/maps/intervention/intervention.lua b/mods/ra/maps/intervention/intervention.lua
index 64a48d46d6..de05530564 100644
--- a/mods/ra/maps/intervention/intervention.lua
+++ b/mods/ra/maps/intervention/intervention.lua
@@ -35,10 +35,10 @@ end
 
 Village = { FarmHouse1, FarmHouse2, FarmHouse3, FarmHouse4, FarmHouse5, FarmHouse6, FarmHouse7, FarmHouse8, FarmHouse9, Church }
 VillageRaidInterval = DateTime.Minutes(3)
-VillageRaidAircraft = { "mig", "mig" }
+VillageRaidAircraft = { "mig.scripted", "mig.scripted" }
 VillageRaidWpts = { VillageRaidEntrypoint.Location, VillageRaidWpt1.Location, VillageRaidWpt2.Location }
 
-BaseRaidAircraft = { "mig", "mig" }
+BaseRaidAircraft = { "mig.scripted", "mig.scripted" }
 BaseRaidWpts = { BaseRaidEntrypoint.Location, UboatPatrolWpt1.Location, BaseRaidWpt2.Location }
 
 BaseFrontAttackUnits = { "e3", "e3", "e1", "e1", "e1", "3tnk", "3tnk", "apc" }
@@ -77,7 +77,7 @@ ParadropSovietUnits = function()
 	powerproxy.Destroy()
 end
 
-AirRaid = function(planeTypes, ingress, egress, target)
+AirRaid = function(planeTypes, ingress, target)
 	if target == nil then
 		return
 	end
@@ -89,8 +89,6 @@ AirRaid = function(planeTypes, ingress, egress, target)
 
 			Utils.Do(ingress, function(wpt) plane.Move(wpt) end)
 			plane.Attack(target)
-			Utils.Do(egress, function(wpt) plane.Move(wpt) end)
-			plane.Destroy()
 		end)
 	end
 end
@@ -106,7 +104,7 @@ BaseRaid = function()
 
 	local target = Utils.Random(targets)
 
-	AirRaid(BaseRaidAircraft, BaseRaidWpts, { VillageRaidEntrypoint.Location }, target)
+	AirRaid(BaseRaidAircraft, BaseRaidWpts, target)
 
 	Trigger.AfterDelay(BaseRaidInterval, BaseRaid)
 end
@@ -124,7 +122,7 @@ VillageRaid = function()
 		return
 	end
 
-	AirRaid(VillageRaidAircraft, VillageRaidWpts, { BaseRaidEntrypoint.Location }, target)
+	AirRaid(VillageRaidAircraft, VillageRaidWpts, target)
 
 	Trigger.AfterDelay(VillageRaidInterval, VillageRaid)
 end
diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml
index 9924770aed..7d81416577 100644
--- a/mods/ra/maps/intervention/rules.yaml
+++ b/mods/ra/maps/intervention/rules.yaml
@@ -71,11 +71,16 @@ GIVEFIX:
 	Tooltip:
 		Name: Weapons Factory or Helipad
 
-MIG:
+MIG.SCRIPTED:
+	Inherits: MIG
 	Buildable:
-		Prerequisites: ~afld
+		Prerequisites: ~disabled
+	RenderSprites:
+		Image: mig
 	AmmoPool:
 		Ammo: 2
+	Aircraft:
+		IdleBehavior: LeaveMap
 
 HELI:
 	Buildable: