From de0c8e37893876b4c9997e1ef69eb8526e374b16 Mon Sep 17 00:00:00 2001
From: funkyfranky <frank@inter-zone.de>
Date: Wed, 27 Mar 2019 16:23:39 +0100
Subject: [PATCH] AB 0.996w

---
 Moose Development/Moose/Core/Spawn.lua        | 23 +++++++++++--------
 Moose Development/Moose/Ops/Airboss.lua       | 10 +++++++-
 .../Moose/Ops/RecoveryTanker.lua              |  2 +-
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua
index d65aae7a2..2655bfcdc 100644
--- a/Moose Development/Moose/Core/Spawn.lua	
+++ b/Moose Development/Moose/Core/Spawn.lua	
@@ -1470,12 +1470,20 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
       self:T( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
       
       -- Template group, unit and its attributes.
-      local TemplateGroup = GROUP:FindByName(self.SpawnTemplatePrefix)
-      local TemplateUnit=TemplateGroup:GetUnit(1)
+      --local TemplateGroup = GROUP:FindByName(self.SpawnTemplatePrefix)
+      --local TemplateUnit=TemplateGroup:GetUnit(1)
+      --local ishelo=TemplateUnit:HasAttribute("Helicopters")
+      --local isbomber=TemplateUnit:HasAttribute("Bombers")
+      --local istransport=TemplateUnit:HasAttribute("Transports")
+      --local isfighter=TemplateUnit:HasAttribute("Battleplanes")
+      
+      local group=TemplateGroup
+      local istransport=group:HasAttribute("Transports") and group:HasAttribute("Planes")
+      local isawacs=group:HasAttribute("AWACS")
+      local isfighter=group:HasAttribute("Fighters") or group:HasAttribute("Interceptors") or group:HasAttribute("Multirole fighters") or (group:HasAttribute("Bombers") and not group:HasAttribute("Strategic bombers"))
+      local isbomber=group:HasAttribute("Strategic bombers")
+      local istanker=group:HasAttribute("Tankers")
       local ishelo=TemplateUnit:HasAttribute("Helicopters")
-      local isbomber=TemplateUnit:HasAttribute("Bombers")
-      local istransport=TemplateUnit:HasAttribute("Transports")
-      local isfighter=TemplateUnit:HasAttribute("Battleplanes")
       
       -- Number of units in the group. With grouping this can actually differ from the template group size!
       local nunits=#SpawnTemplate.units
@@ -1585,10 +1593,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
           else
             -- Fixed wing aircraft is spawned.
             if termtype==nil then
-            --TODO: Add some default cases for transport, bombers etc. if no explicit terminal type is provided.
-            --TODO: We don't want Bombers to spawn in shelters. But I don't know a good attribute for just fighers.
-            --TODO: Some attributes are "Helicopters", "Bombers", "Transports", "Battleplanes". Need to check it out.
-              if isbomber or istransport then
+              if isbomber or istransport or istanker or isawacs then
                 -- First we fill the potentially bigger spots.
                 self:T(string.format("Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig))
                 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup, AIRBASE.TerminalType.OpenBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits)
diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua
index 8d3623ddf..76a63905d 100644
--- a/Moose Development/Moose/Ops/Airboss.lua	
+++ b/Moose Development/Moose/Ops/Airboss.lua	
@@ -9055,9 +9055,17 @@ function AIRBOSS:_Break(playerData, part)
     self:_AbortPattern(playerData, X, Z, breakpoint, true)
     return
   end
+  
+  -- Player made a very tight turn and did not trigger the latebreak threshold at 0.8 NM.
+  local tooclose=false
+  if part==AIRBOSS.PatternStep.LATEBREAK then
+    if X<0 and Z<UTILS.NMToMeters(0.8) then
+      tooclose=true
+    end  
+  end
 
   -- Check limits.
-  if self:_CheckLimits(X, Z, breakpoint) then
+  if self:_CheckLimits(X, Z, breakpoint) or tooclose then
   
     -- Hint for player about altitude, AoA etc.
     self:_PlayerHint(playerData)
diff --git a/Moose Development/Moose/Ops/RecoveryTanker.lua b/Moose Development/Moose/Ops/RecoveryTanker.lua
index 1ad33047f..68a026276 100644
--- a/Moose Development/Moose/Ops/RecoveryTanker.lua	
+++ b/Moose Development/Moose/Ops/RecoveryTanker.lua	
@@ -884,7 +884,7 @@ function RECOVERYTANKER:onafterStart(From, Event, To)
     else
     
       -- Spawn tanker at airbase.
-      self.tanker=Spawn:SpawnAtAirbase(self.airbase, self.takeoff)
+      self.tanker=Spawn:SpawnAtAirbase(self.airbase, self.takeoff, nil, AIRBASE.TerminalType.OpenBig)
       
     end