From 1d5ddb3928c3e25fb960d6625ef93d0d73aee19f Mon Sep 17 00:00:00 2001 From: FlightControl Date: Wed, 26 Sep 2018 20:59:21 +0200 Subject: [PATCH 1/2] Fixes documentation --- Moose Development/Moose/Core/Fsm.lua | 2 +- Moose Development/Moose/Tasking/DetectionManager.lua | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Core/Fsm.lua b/Moose Development/Moose/Core/Fsm.lua index 7469a3726..9ff0b5d16 100644 --- a/Moose Development/Moose/Core/Fsm.lua +++ b/Moose Development/Moose/Core/Fsm.lua @@ -325,7 +325,7 @@ do -- FSM -- -- === -- - -- @field #FSM FSM + -- @field #FSM -- FSM = { ClassName = "FSM", diff --git a/Moose Development/Moose/Tasking/DetectionManager.lua b/Moose Development/Moose/Tasking/DetectionManager.lua index c27511cde..9e4532e39 100644 --- a/Moose Development/Moose/Tasking/DetectionManager.lua +++ b/Moose Development/Moose/Tasking/DetectionManager.lua @@ -43,11 +43,13 @@ do -- DETECTION MANAGER - --- DETECTION_MANAGER class. - -- @type DETECTION_MANAGER + --- @type DETECTION_MANAGER -- @field Core.Set#SET_GROUP SetGroup The groups to which the FAC will report to. -- @field Functional.Detection#DETECTION_BASE Detection The DETECTION_BASE object that is used to report the detected objects. -- @extends Core.Fsm#FSM + + --- DETECTION_MANAGER class. + -- @field #DETECTION_MANAGER DETECTION_MANAGER = { ClassName = "DETECTION_MANAGER", SetGroup = nil, From 3275fd2e5bb81be770eb950927a4c6f7d969f583 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Wed, 26 Sep 2018 21:16:47 +0200 Subject: [PATCH 2/2] Fixed issue with NearRadius. --- Moose Development/Moose/Cargo/CargoUnit.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Cargo/CargoUnit.lua b/Moose Development/Moose/Cargo/CargoUnit.lua index f499fb7a8..bb3df8657 100644 --- a/Moose Development/Moose/Cargo/CargoUnit.lua +++ b/Moose Development/Moose/Cargo/CargoUnit.lua @@ -242,7 +242,7 @@ do -- CARGO_UNIT if not self.CargoInAir then -- If NearRadius is given, then use the given NearRadius, otherwise calculate the NearRadius -- based upon the Carrier bounding radius, which is calculated from the bounding rectangle on the Y axis. - local NearRadius = CargoCarrier:GetBoundingRadius( NearRadius ) + 5 + local NearRadius = NearRadius or CargoCarrier:GetBoundingRadius( NearRadius ) + 5 if self:IsNear( CargoCarrier:GetPointVec2(), NearRadius ) then self:Load( CargoCarrier, NearRadius, ... ) else @@ -293,7 +293,7 @@ do -- CARGO_UNIT if CargoCarrier and CargoCarrier:IsAlive() and self.CargoObject and self.CargoObject:IsAlive() then if (CargoCarrier:IsAir() and not CargoCarrier:InAir()) or true then - local NearRadius = CargoCarrier:GetBoundingRadius( NearRadius ) + 5 + local NearRadius = NearRadius or CargoCarrier:GetBoundingRadius( NearRadius ) + 5 if self:IsNear( CargoCarrier:GetPointVec2(), NearRadius ) then self:__Load( 1, CargoCarrier, ... ) else