Updates for visibility of squadrons before start.

Moose Development/Moose/AI/AI_A2A.lua

@@ -502,9 +502,10 @@ function AI_A2A:onafterStatus()
 
     if RTB == true then
       self:__RTB( 0.5 )
+    else
+      self:__Status( 10 )
     end
     
-    self:__Status( 10 )
   end
 end
 

Moose Development/Moose/AI/AI_A2A_Dispatcher.lua

@@ -1030,16 +1030,20 @@ do -- AI_A2A_DISPATCHER
     for SquadronName, DefenderSquadron in pairs( self.DefenderSquadrons ) do
       DefenderSquadron.Resource = {}
       for Resource = 1, DefenderSquadron.ResourceCount do
+        self:ParkDefender( DefenderSquadron )
+      end
+    end
+  end
+  
+
+  --- @param #AI_A2A_DISPATCHER self
+  function AI_A2A_DISPATCHER:ParkDefender( DefenderSquadron )
     local TemplateID = math.random( 1, #DefenderSquadron.Spawn )
     local Spawn = DefenderSquadron.Spawn[ TemplateID ] -- Core.Spawn#SPAWN
     Spawn:InitGrouping( 1 )
     local SpawnGroup
-        if DefenderSquadron.Uncontrolled then
+    if self:IsSquadronVisible( DefenderSquadron.Name ) then
       SpawnGroup = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, SPAWN.Takeoff.Cold )
-        else
-          Spawn:InitLateActivated( true )
-          SpawnGroup = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, SPAWN.Takeoff.Cold )
-        end
       local GroupName = SpawnGroup:GetName()
       DefenderSquadron.Resources = DefenderSquadron.Resources or {}
       DefenderSquadron.Resources[TemplateID] = DefenderSquadron.Resources[TemplateID] or {}
@@ -1047,7 +1051,6 @@ do -- AI_A2A_DISPATCHER
       DefenderSquadron.Resources[TemplateID][GroupName] = SpawnGroup
     end
   end
-  end
 
 
   --- @param #AI_A2A_DISPATCHER self
@@ -1090,6 +1093,7 @@ do -- AI_A2A_DISPATCHER
           self:RemoveDefenderFromSquadron( Squadron, Defender )
         end
         DefenderUnit:Destroy()
+        self:ParkDefender( Squadron, Defender )
         return
       end
       if DefenderUnit:GetLife() ~= DefenderUnit:GetLife0() then
@@ -1116,6 +1120,7 @@ do -- AI_A2A_DISPATCHER
           self:RemoveDefenderFromSquadron( Squadron, Defender )
         end
         DefenderUnit:Destroy()
+        self:ParkDefender( Squadron, Defender )
       end
     end 
   end
@@ -1607,6 +1612,29 @@ do -- AI_A2A_DISPATCHER
 
   end
 
+  --- Check if the Squadron is visible before startup of the dispatcher.
+  -- @param #AI_A2A_DISPATCHER self
+  -- @param #string SquadronName The squadron name.
+  -- @return #bool true if visible.
+  -- @usage
+  -- 
+  --        -- Set the Squadron visible before startup of dispatcher.
+  --        local IsVisible = A2ADispatcher:IsSquadronVisible( "Mineralnye" )
+  --        
+  function AI_A2A_DISPATCHER:IsSquadronVisible( SquadronName )
+  
+    self.DefenderSquadrons[SquadronName] = self.DefenderSquadrons[SquadronName] or {} 
+    
+    local DefenderSquadron = self:GetSquadron( SquadronName )
+
+    if DefenderSquadron then
+      return DefenderSquadron.Uncontrolled == true
+    end
+    
+    return nil
+    
+  end
+
   --- Set a CAP for a Squadron.
   -- @param #AI_A2A_DISPATCHER self
   -- @param #string SquadronName The squadron name.
@@ -2705,18 +2733,21 @@ do -- AI_A2A_DISPATCHER
 
   ---
   -- @param #AI_A2A_DISPATCHER self
-  function AI_A2A_DISPATCHER:ResourceActivate( DefenderSquadron )
+  function AI_A2A_DISPATCHER:ResourceActivate( DefenderSquadron, DefendersNeeded )
   
     local SquadronName = DefenderSquadron.Name
+    DefendersNeeded = DefendersNeeded or 4
+    local DefenderGrouping = DefenderSquadron.Grouping or self.DefenderDefault.Grouping
+    DefenderGrouping = ( DefenderGrouping < DefendersNeeded ) and DefenderGrouping or DefendersNeeded
+    
+    if self:IsSquadronVisible( SquadronName ) then
     
       -- Here we CAP the new planes.
       -- The Resources table is filled in advance.
       local TemplateID = math.random( 1, #DefenderSquadron.Spawn ) -- Choose the template.
   
       -- We determine the grouping based on the parameters set.
-    local DefenderGrouping = DefenderSquadron.Grouping or self.DefenderDefault.Grouping
       self:F( { DefenderGrouping = DefenderGrouping } )
-    --Spawn:InitGrouping( DefenderGrouping )
       
       -- New we will form the group to spawn in.
       -- We search for the first free resource matching the template.
@@ -2744,6 +2775,7 @@ do -- AI_A2A_DISPATCHER
         
       end 
       
+      if DefenderCAPTemplate then
         local TakeoffMethod = self:GetSquadronTakeoff( SquadronName )
         local SpawnGroup = GROUP:Register( DefenderName )
         DefenderCAPTemplate.lateActivation = nil
@@ -2754,9 +2786,23 @@ do -- AI_A2A_DISPATCHER
         local Defender = _DATABASE:Spawn( DefenderCAPTemplate )
       
         self:AddDefenderToSquadron( DefenderSquadron, Defender, DefenderGrouping )
-
         return Defender, DefenderGrouping
       end
+    else
+      local Spawn = DefenderSquadron.Spawn[ math.random( 1, #DefenderSquadron.Spawn ) ] -- Core.Spawn#SPAWN
+      if DefenderGrouping then
+        Spawn:InitGrouping( DefenderGrouping )
+      else
+        Spawn:InitGrouping()
+      end
+      
+      local TakeoffMethod = self:GetSquadronTakeoff( SquadronName )
+      local Defender = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, TakeoffMethod, DefenderSquadron.TakeoffAltitude or self.DefenderDefault.TakeoffAltitude ) -- Wrapper.Group#GROUP
+      return Defender, DefenderGrouping
+    end
+
+    return nil, nil
+  end
   
   ---
   -- @param #AI_A2A_DISPATCHER self
@@ -2824,9 +2870,9 @@ do -- AI_A2A_DISPATCHER
             if Dispatcher:GetSquadronLanding( Squadron.Name ) == AI_A2A_DISPATCHER.Landing.NearAirbase then
               Dispatcher:RemoveDefenderFromSquadron( Squadron, Defender )
               Defender:Destroy()
+              self:ParkDefender( Squadron, Defender )
             end
           end
-
         end
       end
     end
@@ -2941,19 +2987,7 @@ do -- AI_A2A_DISPATCHER
               
               while ( DefendersNeeded > 0 ) do
             
-                local DefenderGCI, DefenderGrouping = self:ResourceActivate( DefenderSquadron )    
+                local DefenderGCI, DefenderGrouping = self:ResourceActivate( DefenderSquadron, DefendersNeeded )    
-                
---                local Spawn = DefenderSquadron.Spawn[ math.random( 1, #DefenderSquadron.Spawn ) ] -- Core.Spawn#SPAWN
---                local DefenderGrouping = ( DefenderGrouping < DefendersNeeded ) and DefenderGrouping or DefendersNeeded
---                if DefenderGrouping then
---                  Spawn:InitGrouping( DefenderGrouping )
---                else
---                  Spawn:InitGrouping()
---                end
---                
---                local TakeoffMethod = self:GetSquadronTakeoff( ClosestDefenderSquadronName )
---                local DefenderGCI = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, TakeoffMethod, DefenderSquadron.TakeoffAltitude or self.DefenderDefault.TakeoffAltitude ) -- Wrapper.Group#GROUP
---                self:F( { GCIDefender = DefenderGCI:GetName() } )
   
                 DefendersNeeded = DefendersNeeded - DefenderGrouping
         
@@ -3023,6 +3057,7 @@ do -- AI_A2A_DISPATCHER
                     if Dispatcher:GetSquadronLanding( Squadron.Name ) == AI_A2A_DISPATCHER.Landing.NearAirbase then
                       Dispatcher:RemoveDefenderFromSquadron( Squadron, Defender )
                       Defender:Destroy()
+                      self:ParkDefender( Squadron, Defender )
                     end
                   end
                 end  -- if DefenderGCI then