From 80ced88ef13915496de863f425258e1a8a5dfc93 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 28 Oct 2021 08:31:14 +0200 Subject: [PATCH 1/5] Fix for docs build --- Moose Development/Moose/Core/Menu.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Core/Menu.lua b/Moose Development/Moose/Core/Menu.lua index e968b9350..f0962380d 100644 --- a/Moose Development/Moose/Core/Menu.lua +++ b/Moose Development/Moose/Core/Menu.lua @@ -207,7 +207,7 @@ end do -- MENU_BASE --- @type MENU_BASE - -- @extends Base#BASE + -- @extends Core.Base#BASE --- Defines the main MENU class where other MENU classes are derived from. -- This is an abstract class, so don't use it. From 2e4fd72781dd4c4b460a3e8984b8aa12cd294fa9 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 28 Oct 2021 10:18:43 +0200 Subject: [PATCH 2/5] Update Fox.lua Removed incomplete line `--@field #boolean` --- Moose Development/Moose/Functional/Fox.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Functional/Fox.lua b/Moose Development/Moose/Functional/Fox.lua index efcdc99a5..6624c352e 100644 --- a/Moose Development/Moose/Functional/Fox.lua +++ b/Moose Development/Moose/Functional/Fox.lua @@ -23,7 +23,6 @@ -- @module Functional.FOX -- @image Functional_FOX.png - --- FOX class. -- @type FOX -- @field #string ClassName Name of the class. @@ -47,8 +46,7 @@ -- @field #number dt10 Time step [sec] for missile position updates if distance to target > 10 km and < 50 km. Default 1 sec. -- @field #number dt05 Time step [sec] for missile position updates if distance to target > 5 km and < 10 km. Default 0.5 sec. -- @field #number dt01 Time step [sec] for missile position updates if distance to target > 1 km and < 5 km. Default 0.1 sec. --- @field #number dt00 Time step [sec] for missile position updates if distance to target < 1 km. Default 0.01 sec. --- @field #boolean +-- @field #number dt00 Time step [sec] for missile position updates if distance to target < 1 km. Default 0.01 sec. -- @extends Core.Fsm#FSM --- Fox 3! @@ -1813,4 +1811,4 @@ end --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file From 98c6c88391e524d6ceca4b827156feaff1e20fdf Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 29 Oct 2021 18:32:13 +0200 Subject: [PATCH 3/5] Completed GetSetComplement --- Moose Development/Moose/Core/Set.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 44194929f..5230b20fe 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -308,17 +308,14 @@ do -- SET_BASE -- @return Core.Set#SET_BASE The set of objects that are in set *B* but **not** in this set *A*. function SET_BASE:GetSetComplement(SetB) - local complement=SET_BASE:New() + local complement = self:GetSetUnion(SetB) + local intersection = self:GetSetIntersection(SetB) - local union=self:GetSetUnion(SetA, SetB) - - for _,Object in pairs(union.Set) do - if SetA:IsIncludeObject(Object) and SetB:IsIncludeObject(Object) then - intersection:Add(intersection) - end + for _,Object in pairs(intersection.Set) do + complement:Remove(Object.ObjectName,true) end - return intersection + return complement end From 18745158a38701b64c48ca984974845463d64270 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sat, 30 Oct 2021 16:33:14 +0200 Subject: [PATCH 4/5] Speedmax returning 0 not nil --- Moose Development/Moose/Wrapper/Group.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index f1443b2d0..72c9215ab 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -568,12 +568,12 @@ function GROUP:GetSpeedMax() local Units=self:GetUnits() - local speedmax=nil + local speedmax=0 for _,unit in pairs(Units) do local unit=unit --Wrapper.Unit#UNIT local speed=unit:GetSpeedMax() - if speedmax==nil then + if speedmax==0 then speedmax=speed elseif speed Date: Sat, 30 Oct 2021 16:33:18 +0200 Subject: [PATCH 5/5] Speedmax returning 0 not nil --- Moose Development/Moose/Wrapper/Unit.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 3fb557504..098508f56 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -442,7 +442,7 @@ function UNIT:GetSpeedMax() return SpeedMax*3.6 end - return nil + return 0 end --- Returns the unit's max range in meters derived from the DCS descriptors.