From 9cb3111dd51ab3e8fc79587cabc458d18e94f692 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 26 Oct 2020 09:13:49 +0100 Subject: [PATCH 1/2] Github issues addressed - Fixes #1342 - Fixes #1333 - Fixes #1331 --- Moose Development/Moose/AI/AI_A2A_Dispatcher.lua | 4 ++-- Moose Development/Moose/Functional/Warehouse.lua | 2 +- Moose Development/Moose/Wrapper/Controllable.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index cdf8d52ad..05ef48758 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -2774,7 +2774,7 @@ do -- AI_A2A_DISPATCHER -- A2ADispatcher = AI_A2A_DISPATCHER:New( Detection ) -- -- -- Now Setup the default fuel treshold. - -- A2ADispatcher:SetSquadronRefuelThreshold( "SquadronName", 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank. + -- A2ADispatcher:SetSquadronFuelThreshold( "SquadronName", 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank. -- function AI_A2A_DISPATCHER:SetSquadronFuelThreshold( SquadronName, FuelThreshold ) @@ -2817,7 +2817,7 @@ do -- AI_A2A_DISPATCHER -- A2ADispatcher = AI_A2A_DISPATCHER:New( Detection ) -- -- -- Now Setup the squadron fuel treshold. - -- A2ADispatcher:SetSquadronRefuelThreshold( "SquadronName", 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank. + -- A2ADispatcher:SetSquadronFuelThreshold( "SquadronName", 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank. -- -- -- Now Setup the squadron tanker. -- A2ADispatcher:SetSquadronTanker( "SquadronName", "Tanker" ) -- The group name of the tanker is "Tanker" in the Mission Editor. diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 06b8c67c4..e8423265a 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -7025,7 +7025,7 @@ function WAREHOUSE:_CheckRequestNow(request) -- If no transport is requested, assets need to be mobile unless it is a self request. local onlymobile=false - if type(request.transport)=="number" and request.ntransport==0 and not request.toself then + if type(request.ntransport)=="number" and request.ntransport==0 and not request.toself then onlymobile=true end diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 9dded0f5a..7332271ab 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -2828,7 +2828,7 @@ function CONTROLLABLE:GetDetectedUnitSet(DetectVisual, DetectOptical, DetectRada return unitset end ---- Return the detected target groups of the controllable as a @{SET_GROUP}. +--- Return the detected target groups of the controllable as a @{Core.Set#SET_GROUP}. -- The optional parametes specify the detection methods that can be applied. -- If no detection method is given, the detection will use all the available methods by default. -- @param Wrapper.Controllable#CONTROLLABLE self From 812fb99e6622fd3168e333d2277c94f31fd48550 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 26 Oct 2020 16:16:04 +0100 Subject: [PATCH 2/2] 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