From 812fb99e6622fd3168e333d2277c94f31fd48550 Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Mon, 26 Oct 2020 16:16:04 +0100
Subject: [PATCH] Small Updates

AIRBOSS
- Added USS Harry S. Truman (CVN-75) [Super Carrier Module]
- Fixed little bug in stop time

RADIOQUEUE
- Allowing GROUND units as relay. Only ships cannot be used.
---
 Moose Development/Moose/Core/RadioQueue.lua |  4 ++--
 Moose Development/Moose/Ops/Airboss.lua     | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Moose Development/Moose/Core/RadioQueue.lua b/Moose Development/Moose/Core/RadioQueue.lua
index 6a217c815..a63677a98 100644
--- a/Moose Development/Moose/Core/RadioQueue.lua	
+++ b/Moose Development/Moose/Core/RadioQueue.lua	
@@ -525,7 +525,7 @@ end
 
 --- Get unit from which we want to transmit a radio message. This has to be an aircraft for subtitles to work.
 -- @param #RADIOQUEUE self
--- @return Wrapper.Unit#UNIT Sending aircraft unit or nil if was not setup, is not an aircraft or is not alive.
+-- @return Wrapper.Unit#UNIT Sending unit or nil if was not setup, is not an aircraft or ground unit or is not alive.
 function RADIOQUEUE:_GetRadioSender()
 
   -- Check if we have a sending aircraft.
@@ -538,7 +538,7 @@ function RADIOQUEUE:_GetRadioSender()
     sender=UNIT:FindByName(self.sendername)
 
     -- Check that sender is alive and an aircraft.
-    if sender and sender:IsAlive() and sender:IsAir() then
+    if sender and sender:IsAlive() and (sender:IsAir() or sender:IsGround()) then
       return sender
     end
     
diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua
index 51b053471..3a92617e8 100644
--- a/Moose Development/Moose/Ops/Airboss.lua	
+++ b/Moose Development/Moose/Ops/Airboss.lua	
@@ -1273,17 +1273,19 @@ AIRBOSS.AircraftCarrier={
 
 --- Carrier types.
 -- @type AIRBOSS.CarrierType
--- @field #string ROOSEVELT USS Theodore Roosevelt (CVN-71)
--- @field #string LINCOLN USS Abraham Lincoln (CVN-72)
--- @field #string WASHINGTON USS George Washington (CVN-73)
+-- @field #string ROOSEVELT USS Theodore Roosevelt (CVN-71) [Super Carrier Module]
+-- @field #string LINCOLN USS Abraham Lincoln (CVN-72) [Super Carrier Module]
+-- @field #string WASHINGTON USS George Washington (CVN-73) [Super Carrier Module]
 -- @field #string STENNIS USS John C. Stennis (CVN-74)
--- @field #string VINSON USS Carl Vinson (CVN-70)
+-- @field #string TRUMAN USS Harry S. Truman (CVN-75) [Super Carrier Module]
+-- @field #string VINSON USS Carl Vinson (CVN-70) [Obsolete]
 -- @field #string TARAWA USS Tarawa (LHA-1)
 -- @field #string KUZNETSOV Admiral Kuznetsov (CV 1143.5)
 AIRBOSS.CarrierType={
   ROOSEVELT="CVN_71",
   LINCOLN="CVN_72",
   WASHINGTON="CVN_73",
+  TRUMAN="CVN_75",
   STENNIS="Stennis",
   VINSON="VINSON",
   TARAWA="LHA_Tarawa",
@@ -1939,8 +1941,10 @@ function AIRBOSS:New(carriername, alias)
     self:_InitNimitz()
   elseif self.carriertype==AIRBOSS.CarrierType.LINCOLN then
     self:_InitNimitz()    
-  elseif self.carriertype==AIRBOSS.CarrierType.WASHINGTON then
+  elseif self.carriertype==AIRBOSS.CarrierType.WASHINGTON then  
     self:_InitNimitz()
+  elseif self.carriertype==AIRBOSS.CarrierType.TRUMAN then  
+    self:_InitNimitz()    
   elseif self.carriertype==AIRBOSS.CarrierType.VINSON then
     -- TODO: Carl Vinson parameters.
     self:_InitStennis()
@@ -2464,7 +2468,7 @@ function AIRBOSS:AddRecoveryWindow(starttime, stoptime, case, holdingoffset, tur
   local Tstart=UTILS.ClockToSeconds(starttime)
 
   -- Set stop time.
-  local Tstop=UTILS.ClockToSeconds(stoptime or Tstart+90*60)
+  local Tstop=stoptime and UTILS.ClockToSeconds(stoptime) or Tstart+90*60
 
   -- Consistancy check for timing.
   if Tstart>Tstop then