From 9006e17c2557db1b7b0f13f75e1dc7abf42ed7b5 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sat, 1 Jul 2017 19:00:44 +0200 Subject: [PATCH] Fixed problem with BASE:GetParent method --- Moose Development/Moose/AI/AI_A2A_Dispatcher.lua | 2 -- Moose Development/Moose/Core/Base.lua | 3 ++- Moose Mission Setup/Moose.lua | 2 +- docs/Documentation/AI_A2A.html | 1 + docs/Documentation/AI_A2A_Dispatcher.html | 13 +++---------- docs/Documentation/AI_Patrol.html | 3 --- docs/Documentation/Cargo.html | 2 -- docs/Documentation/Detection.html | 4 +--- docs/Documentation/Point.html | 1 - docs/Documentation/Spawn.html | 7 +++++-- docs/Documentation/Spot.html | 4 ---- docs/Documentation/Task_Cargo.html | 3 +-- 12 files changed, 14 insertions(+), 31 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index 316a7ab12..fcb65227a 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -551,8 +551,6 @@ do -- AI_A2A_DISPATCHER --- AI_A2A_DISPATCHER constructor. -- @param #AI_A2A_DISPATCHER self -- @param Functional.Detection#DETECTION_BASE Detection The DETECTION object that will detects targets using the the Early Warning Radar network. - -- @param #number GroupingRadius The radius in meters wherein detected planes are being grouped as one target area. - -- For airplanes, 6000 (6km) is recommended, and is also the default value of this parameter. -- @return #AI_A2A_DISPATCHER self -- @usage -- diff --git a/Moose Development/Moose/Core/Base.lua b/Moose Development/Moose/Core/Base.lua index 68356d0eb..c7dd7f446 100644 --- a/Moose Development/Moose/Core/Base.lua +++ b/Moose Development/Moose/Core/Base.lua @@ -250,6 +250,7 @@ function BASE:Inherit( Child, Parent ) local Child = routines.utils.deepCopy( Child ) if Child ~= nil then + Child.ClassParent = Parent -- This is for "private" methods... -- When a __ is passed to a method as "self", the __index will search for the method on the public method list of the same object too! @@ -277,7 +278,7 @@ end -- @param #BASE Child is the Child class from which the Parent class needs to be retrieved. -- @return #BASE function BASE:GetParent( Child ) - local Parent = getmetatable( Child ) + local Parent = Child.ClassParent -- env.info('Inherited class of ' .. Child.ClassName .. ' is ' .. Parent.ClassName ) return Parent end diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index ba2e8320e..dbcc4bd87 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170630_1035' ) +env.info( 'Moose Generation Timestamp: 20170701_1713' ) local base = _G diff --git a/docs/Documentation/AI_A2A.html b/docs/Documentation/AI_A2A.html index ee2dc9007..2a24504d1 100644 --- a/docs/Documentation/AI_A2A.html +++ b/docs/Documentation/AI_A2A.html @@ -575,6 +575,7 @@
+ #number AI_A2A.IdleCount diff --git a/docs/Documentation/AI_A2A_Dispatcher.html b/docs/Documentation/AI_A2A_Dispatcher.html index b2cf47842..2dba4f655 100644 --- a/docs/Documentation/AI_A2A_Dispatcher.html +++ b/docs/Documentation/AI_A2A_Dispatcher.html @@ -345,7 +345,7 @@ - AI_A2A_DISPATCHER:New(Detection, GroupingRadius) + AI_A2A_DISPATCHER:New(Detection)

AIA2ADISPATCHER constructor.

@@ -2005,27 +2005,20 @@ Takeoff From the airbase hot, from the airbase cold, in the air, from the runway
-AI_A2A_DISPATCHER:New(Detection, GroupingRadius) +AI_A2A_DISPATCHER:New(Detection)

AIA2ADISPATCHER constructor.

-

Parameters

+

Parameter

  • Functional.Detection#DETECTION_BASE Detection : The DETECTION object that will detects targets using the the Early Warning Radar network.

    -
    • -
  • - -

    #number GroupingRadius : -The radius in meters wherein detected planes are being grouped as one target area. -For airplanes, 6000 (6km) is recommended, and is also the default value of this parameter.

    -

Return value

diff --git a/docs/Documentation/AI_Patrol.html b/docs/Documentation/AI_Patrol.html index 43392b308..93a9f8ce6 100644 --- a/docs/Documentation/AI_Patrol.html +++ b/docs/Documentation/AI_Patrol.html @@ -926,9 +926,6 @@ Use the method AIPATROLZONE.M - -

This table contains the targets detected during patrol.

-
diff --git a/docs/Documentation/Cargo.html b/docs/Documentation/Cargo.html index e3fae231c..262969991 100644 --- a/docs/Documentation/Cargo.html +++ b/docs/Documentation/Cargo.html @@ -2934,7 +2934,6 @@ The range till cargo will board.

- CARGO_UNIT.CargoCarrier @@ -3060,7 +3059,6 @@ The range till cargo will board.

- #number CARGO_UNIT.RunCount diff --git a/docs/Documentation/Detection.html b/docs/Documentation/Detection.html index 8c70074f0..1754d0aa0 100644 --- a/docs/Documentation/Detection.html +++ b/docs/Documentation/Detection.html @@ -2393,7 +2393,6 @@ The index of the DetectedItem.

- #number DETECTION_BASE.DetectedItemCount @@ -2407,7 +2406,6 @@ The index of the DetectedItem.

- #number DETECTION_BASE.DetectedItemMax @@ -2565,7 +2563,7 @@ The index of the DetectedItem.

- + #number DETECTION_BASE.DetectionInterval diff --git a/docs/Documentation/Point.html b/docs/Documentation/Point.html index c9a6550f1..ba2001e76 100644 --- a/docs/Documentation/Point.html +++ b/docs/Documentation/Point.html @@ -2823,7 +2823,6 @@ The y coordinate.

- POINT_VEC2.z diff --git a/docs/Documentation/Spawn.html b/docs/Documentation/Spawn.html index 6c440cb38..0f27003d1 100644 --- a/docs/Documentation/Spawn.html +++ b/docs/Documentation/Spawn.html @@ -2746,6 +2746,9 @@ when nothing was spawned.

+ +

By default, no InitLimit

+
@@ -2781,7 +2784,7 @@ when nothing was spawned.

- + #number SPAWN.SpawnMaxGroups @@ -2798,7 +2801,7 @@ when nothing was spawned.

- + #number SPAWN.SpawnMaxUnitsAlive diff --git a/docs/Documentation/Spot.html b/docs/Documentation/Spot.html index 5fdc3b305..ead3792db 100644 --- a/docs/Documentation/Spot.html +++ b/docs/Documentation/Spot.html @@ -765,7 +765,6 @@ true if it is lasing

- SPOT.ScheduleID @@ -779,7 +778,6 @@ true if it is lasing

- SPOT.SpotIR @@ -793,7 +791,6 @@ true if it is lasing

- SPOT.SpotLaser @@ -807,7 +804,6 @@ true if it is lasing

- SPOT.Target diff --git a/docs/Documentation/Task_Cargo.html b/docs/Documentation/Task_Cargo.html index 9bf9da484..8c17ced64 100644 --- a/docs/Documentation/Task_Cargo.html +++ b/docs/Documentation/Task_Cargo.html @@ -510,7 +510,7 @@ based on the tasking capabilities defined in Task#TA
- Core.Cargo#CARGO + FSM_PROCESS.Cargo @@ -524,7 +524,6 @@ based on the tasking capabilities defined in Task#TA
- FSM_PROCESS.DeployZone