From 1afe1c48b4bd32ecde3ab131298aa57415ff288a Mon Sep 17 00:00:00 2001
From: FlightControl <sven.van.de.velde@telenet.be>
Date: Mon, 1 Jul 2019 17:28:49 +0300
Subject: [PATCH] Updates - Much improved version!

---
 .../Moose/AI/AI_Escort_Dispatcher.lua             | 15 +++++++++------
 Moose Development/Moose/AI/AI_Escort_Request.lua  |  1 +
 Moose Development/Moose/Core/Spawn.lua            |  5 +++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua b/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua
index 686805d5f..a4000ccf8 100644
--- a/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua	
+++ b/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua	
@@ -98,6 +98,7 @@ function AI_ESCORT_DISPATCHER:OnEventBirth( EventData )
   local PlayerGroup = EventData.IniGroup
   local PlayerUnit = EventData.IniUnit
   
+  self:I({EscortAirbase= self.EscortAirbase } )
   self:I({PlayerGroupName = PlayerGroupName } )
   self:I({PlayerGroup = PlayerGroup})
   self:I({FirstGroup = self.CarrierSet:GetFirst()})
@@ -106,11 +107,13 @@ function AI_ESCORT_DISPATCHER:OnEventBirth( EventData )
   if self.CarrierSet:FindGroup( PlayerGroupName ) then
     if not self.AI_Escorts[PlayerGroupName] then
       local LeaderUnit = PlayerUnit
-      local EscortGroup = self.EscortSpawn:SpawnAtAirbase( self.EscortAirbase )
-      local EscortSet = SET_GROUP:New()
-      EscortSet:AddGroup( EscortGroup )
-      self:ScheduleOnce( 0.1,
-        function()
+      local EscortGroup = self.EscortSpawn:SpawnAtAirbase( self.EscortAirbase, SPAWN.Takeoff.Hot )
+      self:I({EscortGroup = EscortGroup})
+      
+      self:ScheduleOnce( 1,
+        function( EscortGroup )
+          local EscortSet = SET_GROUP:New()
+          EscortSet:AddGroup( EscortGroup )
           self.AI_Escorts[PlayerGroupName] = AI_ESCORT:New( LeaderUnit, EscortSet, self.EscortName, self.EscortBriefing )
           self.AI_Escorts[PlayerGroupName]:FormationTrail( 0, 100, 0 )
           if EscortGroup:IsHelicopter() then
@@ -119,7 +122,7 @@ function AI_ESCORT_DISPATCHER:OnEventBirth( EventData )
             self.AI_Escorts[PlayerGroupName]:MenusAirplanes()
           end
           self.AI_Escorts[PlayerGroupName]:__Start( 0.1 )
-        end
+        end, EscortGroup
       )
     end
   end
diff --git a/Moose Development/Moose/AI/AI_Escort_Request.lua b/Moose Development/Moose/AI/AI_Escort_Request.lua
index 9cc537b4c..5eb274278 100644
--- a/Moose Development/Moose/AI/AI_Escort_Request.lua	
+++ b/Moose Development/Moose/AI/AI_Escort_Request.lua	
@@ -269,6 +269,7 @@ function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet )
   self:F()
 
   if not self.MenuRequestEscort then
+    self.MainMenu = MENU_GROUP:New( self.PlayerGroup, self.EscortName )
     self.MenuRequestEscort = MENU_GROUP_COMMAND:New( self.LeaderGroup, "Request new escort ", self.MainMenu, 
       function()
         self:SpawnEscort()
diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua
index ff6387c5a..dc30d2325 100644
--- a/Moose Development/Moose/Core/Spawn.lua	
+++ b/Moose Development/Moose/Core/Spawn.lua	
@@ -2215,10 +2215,11 @@ function SPAWN:ParkAtAirbase( SpawnAirbase, TerminalType, Parkingdata ) -- R2.2,
   self:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, 1 )
 
   for SpawnIndex = 2, self.SpawnMaxGroups do
-    self:ScheduleOnce( SpawnIndex * 0.1, SPAWN.ParkAircraft, self, SpawnAirbase, TerminalType, Parkingdata, SpawnIndex )
+    self:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex )
+    --self:ScheduleOnce( SpawnIndex * 0.1, SPAWN.ParkAircraft, self, SpawnAirbase, TerminalType, Parkingdata, SpawnIndex )
   end
   
-  self:SetSpawnIndex()
+  self:SetSpawnIndex( 0 )
   
   return nil
 end