New File Structure Updates

Moose Development/Moose/Wrapper/Airbase.lua

@@ -2,7 +2,7 @@
 -- 
 -- ===
 -- 
--- 1) @{Airbase#AIRBASE} class, extends @{Positionable#POSITIONABLE}
+-- 1) @{Wrapper.Airbase#AIRBASE} class, extends @{Wrapper.Positionable#POSITIONABLE}
 -- =================================================================
 -- The @{AIRBASE} class is a wrapper class to handle the DCS Airbase objects:
 -- 
@@ -33,7 +33,7 @@
 -- ---------------------
 -- The DCS Airbase APIs are used extensively within MOOSE. The AIRBASE class has for each DCS Airbase API a corresponding method.
 -- To be able to distinguish easily in your code the difference between a AIRBASE API call and a DCS Airbase API call,
--- the first letter of the method is also capitalized. So, by example, the DCS Airbase method @{DCSAirbase#Airbase.getName}()
+-- the first letter of the method is also capitalized. So, by example, the DCS Airbase method @{Dcs.DCSWrapper.Airbase#Airbase.getName}()
 -- is implemented in the AIRBASE class as @{#AIRBASE.GetName}().
 -- 
 -- More functions will be added
@@ -49,7 +49,7 @@
 
 --- The AIRBASE class
 -- @type AIRBASE
--- @extends Positionable#POSITIONABLE
+-- @extends Wrapper.Positionable#POSITIONABLE
 AIRBASE = {
   ClassName="AIRBASE",
   CategoryName = { 
@@ -64,7 +64,7 @@ AIRBASE = {
 --- Create a new AIRBASE from DCSAirbase.
 -- @param #AIRBASE self
 -- @param #string AirbaseName The name of the airbase.
--- @return Airbase#AIRBASE
+-- @return Wrapper.Airbase#AIRBASE
 function AIRBASE:Register( AirbaseName )
 
   local self = BASE:Inherit( self, POSITIONABLE:New( AirbaseName ) )
@@ -76,8 +76,8 @@ end
 
 --- Finds a AIRBASE from the _DATABASE using a DCSAirbase object.
 -- @param #AIRBASE self
--- @param DCSAirbase#Airbase DCSAirbase An existing DCS Airbase object reference.
--- @return Airbase#AIRBASE self
+-- @param Dcs.DCSWrapper.Airbase#Airbase DCSAirbase An existing DCS Airbase object reference.
+-- @return Wrapper.Airbase#AIRBASE self
 function AIRBASE:Find( DCSAirbase )
 
   local AirbaseName = DCSAirbase:getName()
@@ -88,7 +88,7 @@ end
 --- Find a AIRBASE in the _DATABASE using the name of an existing DCS Airbase.
 -- @param #AIRBASE self
 -- @param #string AirbaseName The Airbase Name.
--- @return Airbase#AIRBASE self
+-- @return Wrapper.Airbase#AIRBASE self
 function AIRBASE:FindByName( AirbaseName )
   
   local AirbaseFound = _DATABASE:FindAirbase( AirbaseName )

Moose Development/Moose/Wrapper/Client.lua

@@ -1,10 +1,10 @@
 --- This module contains the CLIENT class.
 -- 
--- 1) @{Client#CLIENT} class, extends @{Unit#UNIT}
+-- 1) @{Wrapper.Client#CLIENT} class, extends @{Wrapper.Unit#UNIT}
 -- ===============================================
 -- Clients are those **Units** defined within the Mission Editor that have the skillset defined as __Client__ or __Player__.
 -- Note that clients are NOT the same as Units, they are NOT necessarily alive.
--- The @{Client#CLIENT} class is a wrapper class to handle the DCS Unit objects that have the skillset defined as __Client__ or __Player__:
+-- The @{Wrapper.Client#CLIENT} class is a wrapper class to handle the DCS Unit objects that have the skillset defined as __Client__ or __Player__:
 -- 
 --  * Wraps the DCS Unit objects with skill level set to Player or Client.
 --  * Support all DCS Unit APIs.
@@ -39,7 +39,7 @@
 
 --- The CLIENT class
 -- @type CLIENT
--- @extends Unit#UNIT
+-- @extends Wrapper.Unit#UNIT
 CLIENT = {
 	ONBOARDSIDE = {
 		NONE = 0,
@@ -259,7 +259,7 @@ end
 --- Return the DCSGroup of a Client.
 -- This function is modified to deal with a couple of bugs in DCS 1.5.3
 -- @param #CLIENT self
--- @return DCSGroup#Group
+-- @return Dcs.DCSWrapper.Group#Group
 function CLIENT:GetDCSGroup()
   self:F3()
 
@@ -333,10 +333,10 @@ function CLIENT:GetDCSGroup()
 end 
 
 
--- TODO: Check DCSTypes#Group.ID
+-- TODO: Check Dcs.DCSTypes#Group.ID
 --- Get the group ID of the client.
 -- @param #CLIENT self
--- @return DCSTypes#Group.ID
+-- @return Dcs.DCSTypes#Group.ID
 function CLIENT:GetClientGroupID()
 
   local ClientGroup = self:GetDCSGroup()
@@ -359,7 +359,7 @@ end
 
 --- Returns the UNIT of the CLIENT.
 -- @param #CLIENT self
--- @return Unit#UNIT
+-- @return Wrapper.Unit#UNIT
 function CLIENT:GetClientGroupUnit()
 	self:F2()
 
@@ -375,7 +375,7 @@ end
 
 --- Returns the DCSUnit of the CLIENT.
 -- @param #CLIENT self
--- @return DCSTypes#Unit
+-- @return Dcs.DCSTypes#Unit
 function CLIENT:GetClientGroupDCSUnit()
 	self:F2()
 
@@ -396,8 +396,8 @@ function CLIENT:IsTransport()
 	return self.ClientTransport
 end
 
---- Shows the @{Cargo#CARGO} contained within the CLIENT to the player as a message.
--- The @{Cargo#CARGO} is shown using the @{Message#MESSAGE} distribution system.
+--- Shows the @{Fsm.Cargo#CARGO} contained within the CLIENT to the player as a message.
+-- The @{Fsm.Cargo#CARGO} is shown using the @{Core.Message#MESSAGE} distribution system.
 -- @param #CLIENT self
 function CLIENT:ShowCargo()
 	self:F()
@@ -430,7 +430,7 @@ end
 -- @param #string Message is the text describing the message.
 -- @param #number MessageDuration is the duration in seconds that the Message should be displayed.
 -- @param #string MessageCategory is the category of the message (the title).
--- @param #number MessageInterval is the interval in seconds between the display of the @{Message#MESSAGE} when the CLIENT is in the air.
+-- @param #number MessageInterval is the interval in seconds between the display of the @{Core.Message#MESSAGE} when the CLIENT is in the air.
 -- @param #string MessageID is the identifier of the message when displayed with intervals.
 function CLIENT:Message( Message, MessageDuration, MessageCategory, MessageInterval, MessageID )
 	self:F( { Message, MessageDuration, MessageCategory, MessageInterval } )

Moose Development/Moose/Wrapper/Controllable.lua

@@ -1,8 +1,8 @@
 --- This module contains the CONTROLLABLE class.
 -- 
--- 1) @{Controllable#CONTROLLABLE} class, extends @{Positionable#POSITIONABLE}
+-- 1) @{Wrapper.Controllable#CONTROLLABLE} class, extends @{Wrapper.Positionable#POSITIONABLE}
 -- ===========================================================
--- The @{Controllable#CONTROLLABLE} class is a wrapper class to handle the DCS Controllable objects:
+-- The @{Wrapper.Controllable#CONTROLLABLE} class is a wrapper class to handle the DCS Controllable objects:
 --
 --  * Support all DCS Controllable APIs.
 --  * Enhance with Controllable specific APIs not in the DCS Controllable API set.
@@ -18,7 +18,7 @@
 -- 1.2) CONTROLLABLE task methods
 -- ------------------------------
 -- Several controllable task methods are available that help you to prepare tasks. 
--- These methods return a string consisting of the task description, which can then be given to either a @{Controllable#CONTROLLABLE.PushTask} or @{Controllable#SetTask} method to assign the task to the CONTROLLABLE.
+-- These methods return a string consisting of the task description, which can then be given to either a @{Wrapper.Controllable#CONTROLLABLE.PushTask} or @{Wrapper.Controllable#SetTask} method to assign the task to the CONTROLLABLE.
 -- Tasks are specific for the category of the CONTROLLABLE, more specific, for AIR, GROUND or AIR and GROUND. 
 -- Each task description where applicable indicates for which controllable category the task is valid.
 -- There are 2 main subdivisions of tasks: Assigned tasks and EnRoute tasks.
@@ -44,7 +44,7 @@
 --   * @{#CONTROLLABLE.TaskHold}: (GROUND) Hold ground controllable from moving.
 --   * @{#CONTROLLABLE.TaskHoldPosition}: (AIR) Hold position at the current position of the first unit of the controllable.
 --   * @{#CONTROLLABLE.TaskLand}: (AIR HELICOPTER) Landing at the ground. For helicopters only.
---   * @{#CONTROLLABLE.TaskLandAtZone}: (AIR) Land the controllable at a @{Zone#ZONE_RADIUS).
+--   * @{#CONTROLLABLE.TaskLandAtZone}: (AIR) Land the controllable at a @{Core.Zone#ZONE_RADIUS).
 --   * @{#CONTROLLABLE.TaskOrbitCircle}: (AIR) Orbit at the current position of the first unit of the controllable at a specified alititude.
 --   * @{#CONTROLLABLE.TaskOrbitCircleAtVec2}: (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
 --   * @{#CONTROLLABLE.TaskRefueling}: (AIR) Refueling from the nearest tanker. No parameters.
@@ -128,7 +128,7 @@
 --- The CONTROLLABLE class
 -- @type CONTROLLABLE
 -- @extends Wrapper.Positionable#POSITIONABLE
--- @field DCSControllable#Controllable DCSControllable The DCS controllable class.
+-- @field Dcs.DCSWrapper.Controllable#Controllable DCSControllable The DCS controllable class.
 -- @field #string ControllableName The name of the controllable.
 CONTROLLABLE = {
   ClassName = "CONTROLLABLE",
@@ -138,7 +138,7 @@ CONTROLLABLE = {
 
 --- Create a new CONTROLLABLE from a DCSControllable
 -- @param #CONTROLLABLE self
--- @param DCSControllable#Controllable ControllableName The DCS Controllable name
+-- @param Dcs.DCSWrapper.Controllable#Controllable ControllableName The DCS Controllable name
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:New( ControllableName )
   local self = BASE:Inherit( self, POSITIONABLE:New( ControllableName ) )
@@ -151,7 +151,7 @@ end
 
 --- Get the controller for the CONTROLLABLE.
 -- @param #CONTROLLABLE self
--- @return DCSController#Controller
+-- @return Dcs.DCSController#Controller
 function CONTROLLABLE:_GetController()
   self:F2( { self.ControllableName } )
   local DCSControllable = self:GetDCSObject()
@@ -171,7 +171,7 @@ end
 
 --- Popping current Task from the controllable.
 -- @param #CONTROLLABLE self
--- @return Controllable#CONTROLLABLE self
+-- @return Wrapper.Controllable#CONTROLLABLE self
 function CONTROLLABLE:PopCurrentTask()
   self:F2()
 
@@ -188,7 +188,7 @@ end
 
 --- Pushing Task on the queue from the controllable.
 -- @param #CONTROLLABLE self
--- @return Controllable#CONTROLLABLE self
+-- @return Wrapper.Controllable#CONTROLLABLE self
 function CONTROLLABLE:PushTask( DCSTask, WaitTime )
   self:F2()
 
@@ -215,7 +215,7 @@ end
 
 --- Clearing the Task Queue and Setting the Task on the queue from the controllable.
 -- @param #CONTROLLABLE self
--- @return Controllable#CONTROLLABLE self
+-- @return Wrapper.Controllable#CONTROLLABLE self
 function CONTROLLABLE:SetTask( DCSTask, WaitTime )
   self:F2( { DCSTask } )
 
@@ -245,13 +245,13 @@ end
 
 --- Return a condition section for a controlled task.
 -- @param #CONTROLLABLE self
--- @param DCSTime#Time time
+-- @param Dcs.DCSTime#Time time
 -- @param #string userFlag
 -- @param #boolean userFlagValue
 -- @param #string condition
--- @param DCSTime#Time duration
+-- @param Dcs.DCSTime#Time duration
 -- @param #number lastWayPoint
--- return DCSTask#Task
+-- return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:TaskCondition( time, userFlag, userFlagValue, condition, duration, lastWayPoint )
   self:F2( { time, userFlag, userFlagValue, condition, duration, lastWayPoint } )
 
@@ -269,9 +269,9 @@ end
 
 --- Return a Controlled Task taking a Task and a TaskCondition.
 -- @param #CONTROLLABLE self
--- @param DCSTask#Task DCSTask
+-- @param Dcs.DCSTasking.Task#Task DCSTask
 -- @param #DCSStopCondition DCSStopCondition
--- @return DCSTask#Task
+-- @return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:TaskControlled( DCSTask, DCSStopCondition )
   self:F2( { DCSTask, DCSStopCondition } )
 
@@ -291,8 +291,8 @@ end
 
 --- Return a Combo Task taking an array of Tasks.
 -- @param #CONTROLLABLE self
--- @param DCSTask#TaskArray DCSTasks Array of @{DCSTask#Task}
--- @return DCSTask#Task
+-- @param Dcs.DCSTasking.Task#TaskArray DCSTasks Array of @{Dcs.DCSTasking.Task#Task}
+-- @return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:TaskCombo( DCSTasks )
   self:F2( { DCSTasks } )
 
@@ -311,8 +311,8 @@ end
 
 --- Return a WrappedAction Task taking a Command.
 -- @param #CONTROLLABLE self
--- @param DCSCommand#Command DCSCommand
--- @return DCSTask#Task
+-- @param Dcs.DCSCommand#Command DCSCommand
+-- @return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:TaskWrappedAction( DCSCommand, Index )
   self:F2( { DCSCommand } )
 
@@ -334,7 +334,7 @@ end
 
 --- Executes a command action
 -- @param #CONTROLLABLE self
--- @param DCSCommand#Command DCSCommand
+-- @param Dcs.DCSCommand#Command DCSCommand
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:SetCommand( DCSCommand )
   self:F2( DCSCommand )
@@ -354,7 +354,7 @@ end
 -- @param #CONTROLLABLE self
 -- @param #number FromWayPoint
 -- @param #number ToWayPoint
--- @return DCSTask#Task
+-- @return Dcs.DCSTasking.Task#Task
 -- @usage
 -- --- This test demonstrates the use(s) of the SwitchWayPoint method of the GROUP class.
 -- HeliGroup = GROUP:FindByName( "Helicopter" )
@@ -385,7 +385,7 @@ end
 --- Perform stop route command
 -- @param #CONTROLLABLE self
 -- @param #boolean StopRoute
--- @return DCSTask#Task
+-- @return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:CommandStopRoute( StopRoute, Index )
   self:F2( { StopRoute, Index } )
 
@@ -406,14 +406,14 @@ end
 
 --- (AIR) Attack a Controllable.
 -- @param #CONTROLLABLE self
--- @param Controllable#CONTROLLABLE AttackGroup The Controllable to be attacked.
+-- @param Wrapper.Controllable#CONTROLLABLE AttackGroup The Controllable to be attacked.
 -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
--- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
+-- @param Dcs.DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
 -- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/controllable will not make more attack than allowed even if the target controllable not destroyed and the aicraft/controllable still have ammo. If not defined the aircraft/controllable will attack target until it will be destroyed or until the aircraft/controllable will run out of ammo.
--- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
--- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Controllable/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/controllable will choose closest altitude to the desired attack start altitude. If the desired altitude is defined controllable/aircraft will not attack from safe altitude.
+-- @param Dcs.DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
+-- @param Dcs.DCSTypes#Distance Altitude (optional) Desired attack start altitude. Controllable/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/controllable will choose closest altitude to the desired attack start altitude. If the desired altitude is defined controllable/aircraft will not attack from safe altitude.
 -- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackControllable" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskAttackGroup( AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
   self:F2( { self.ControllableName, AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
 
@@ -464,14 +464,14 @@ end
 
 --- (AIR) Attack the Unit.
 -- @param #CONTROLLABLE self
--- @param Unit#UNIT AttackUnit The unit.
+-- @param Wrapper.Unit#UNIT AttackUnit The unit.
 -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
--- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
+-- @param Dcs.DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
 -- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/controllable will not make more attack than allowed even if the target controllable not destroyed and the aicraft/controllable still have ammo. If not defined the aircraft/controllable will attack target until it will be destroyed or until the aircraft/controllable will run out of ammo.
--- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
+-- @param Dcs.DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
 -- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackControllable" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
 -- @param #boolean ControllableAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the controllable. Has effect only if the task is assigned to a controllable, not to a single aircraft.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskAttackUnit( AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, ControllableAttack )
   self:F2( { self.ControllableName, AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, ControllableAttack } )
 
@@ -508,13 +508,13 @@ end
 
 --- (AIR) Delivering weapon at the point on the ground. 
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Vec2 2D-coordinates of the point to deliver weapon at.
+-- @param Dcs.DCSTypes#Vec2 Vec2 2D-coordinates of the point to deliver weapon at.
 -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
--- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
+-- @param Dcs.DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
 -- @param #number AttackQty (optional) Desired quantity of passes. The parameter is not the same in AttackControllable and AttackUnit tasks. 
--- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
+-- @param Dcs.DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
 -- @param #boolean ControllableAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the controllable. Has effect only if the task is assigned to a controllable, not to a single aircraft.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskBombing( Vec2, WeaponType, WeaponExpend, AttackQty, Direction, ControllableAttack )
   self:F2( { self.ControllableName, Vec2, WeaponType, WeaponExpend, AttackQty, Direction, ControllableAttack } )
 
@@ -548,7 +548,7 @@ end
 
 --- (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Point The point to hold the position.
+-- @param Dcs.DCSTypes#Vec2 Point The point to hold the position.
 -- @param #number Altitude The altitude to hold the position.
 -- @param #number Speed The speed flying when holding the position.
 -- @return #CONTROLLABLE self
@@ -626,13 +626,13 @@ end
 
 --- (AIR) Attacking the map object (building, structure, e.t.c).
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Vec2 2D-coordinates of the point the map object is closest to. The distance between the point and the map object must not be greater than 2000 meters. Object id is not used here because Mission Editor doesn't support map object identificators.
+-- @param Dcs.DCSTypes#Vec2 Vec2 2D-coordinates of the point the map object is closest to. The distance between the point and the map object must not be greater than 2000 meters. Object id is not used here because Mission Editor doesn't support map object identificators.
 -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
--- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
+-- @param Dcs.DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
 -- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/controllable will not make more attack than allowed even if the target controllable not destroyed and the aicraft/controllable still have ammo. If not defined the aircraft/controllable will attack target until it will be destroyed or until the aircraft/controllable will run out of ammo.
--- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
+-- @param Dcs.DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
 -- @param #boolean ControllableAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the controllable. Has effect only if the task is assigned to a controllable, not to a single aircraft.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskAttackMapObject( Vec2, WeaponType, WeaponExpend, AttackQty, Direction, ControllableAttack )
   self:F2( { self.ControllableName, Vec2, WeaponType, WeaponExpend, AttackQty, Direction, ControllableAttack } )
 
@@ -667,13 +667,13 @@ end
 
 --- (AIR) Delivering weapon on the runway.
 -- @param #CONTROLLABLE self
--- @param Airbase#AIRBASE Airbase Airbase to attack.
+-- @param Wrapper.Airbase#AIRBASE Airbase Airbase to attack.
 -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
--- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
+-- @param Dcs.DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
 -- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/controllable will not make more attack than allowed even if the target controllable not destroyed and the aicraft/controllable still have ammo. If not defined the aircraft/controllable will attack target until it will be destroyed or until the aircraft/controllable will run out of ammo.
--- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
+-- @param Dcs.DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
 -- @param #boolean ControllableAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the controllable. Has effect only if the task is assigned to a controllable, not to a single aircraft.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskBombingRunway( Airbase, WeaponType, WeaponExpend, AttackQty, Direction, ControllableAttack )
   self:F2( { self.ControllableName, Airbase, WeaponType, WeaponExpend, AttackQty, Direction, ControllableAttack } )
 
@@ -708,7 +708,7 @@ end
 
 --- (AIR) Refueling from the nearest tanker. No parameters.
 -- @param #CONTROLLABLE self
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskRefueling()
   self:F2( { self.ControllableName } )
 
@@ -730,7 +730,7 @@ end
 
 --- (AIR HELICOPTER) Landing at the ground. For helicopters only.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Point The point where to land.
+-- @param Dcs.DCSTypes#Vec2 Point The point where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:TaskLandAtVec2( Point, Duration )
@@ -767,9 +767,9 @@ function CONTROLLABLE:TaskLandAtVec2( Point, Duration )
   return DCSTask
 end
 
---- (AIR) Land the controllable at a @{Zone#ZONE_RADIUS).
+--- (AIR) Land the controllable at a @{Core.Zone#ZONE_RADIUS).
 -- @param #CONTROLLABLE self
--- @param Zone#ZONE Zone The zone where to land.
+-- @param Core.Zone#ZONE Zone The zone where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:TaskLandAtZone( Zone, Duration, RandomPoint )
@@ -794,10 +794,10 @@ end
 -- The unit / controllable will follow lead unit of another controllable, wingmens of both controllables will continue following their leaders. 
 -- If another controllable is on land the unit / controllable will orbit around. 
 -- @param #CONTROLLABLE self
--- @param Controllable#CONTROLLABLE FollowControllable The controllable to be followed.
--- @param DCSTypes#Vec3 Vec3 Position of the unit / lead unit of the controllable relative lead unit of another controllable in frame reference oriented by course of lead unit of another controllable. If another controllable is on land the unit / controllable will orbit around.
+-- @param Wrapper.Controllable#CONTROLLABLE FollowControllable The controllable to be followed.
+-- @param Dcs.DCSTypes#Vec3 Vec3 Position of the unit / lead unit of the controllable relative lead unit of another controllable in frame reference oriented by course of lead unit of another controllable. If another controllable is on land the unit / controllable will orbit around.
 -- @param #number LastWaypointIndex Detach waypoint of another controllable. Once reached the unit / controllable Follow task is finished.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskFollow( FollowControllable, Vec3, LastWaypointIndex )
   self:F2( { self.ControllableName, FollowControllable, Vec3, LastWaypointIndex } )
 
@@ -836,12 +836,12 @@ end
 -- The unit / controllable will follow lead unit of another controllable, wingmens of both controllables will continue following their leaders. 
 -- The unit / controllable will also protect that controllable from threats of specified types.
 -- @param #CONTROLLABLE self
--- @param Controllable#CONTROLLABLE EscortControllable The controllable to be escorted.
--- @param DCSTypes#Vec3 Vec3 Position of the unit / lead unit of the controllable relative lead unit of another controllable in frame reference oriented by course of lead unit of another controllable. If another controllable is on land the unit / controllable will orbit around.
+-- @param Wrapper.Controllable#CONTROLLABLE EscortControllable The controllable to be escorted.
+-- @param Dcs.DCSTypes#Vec3 Vec3 Position of the unit / lead unit of the controllable relative lead unit of another controllable in frame reference oriented by course of lead unit of another controllable. If another controllable is on land the unit / controllable will orbit around.
 -- @param #number LastWaypointIndex Detach waypoint of another controllable. Once reached the unit / controllable Follow task is finished.
 -- @param #number EngagementDistanceMax Maximal distance from escorted controllable to threat. If the threat is already engaged by escort escort will disengage if the distance becomes greater than 1.5 * engagementDistMax. 
--- @param DCSTypes#AttributeNameArray TargetTypes Array of AttributeName that is contains threat categories allowed to engage. 
--- @return DCSTask#Task The DCS task structure.
+-- @param Dcs.DCSTypes#AttributeNameArray TargetTypes Array of AttributeName that is contains threat categories allowed to engage. 
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskEscort( FollowControllable, Vec3, LastWaypointIndex, EngagementDistance, TargetTypes )
   self:F2( { self.ControllableName, FollowControllable, Vec3, LastWaypointIndex, EngagementDistance, TargetTypes } )
 
@@ -883,9 +883,9 @@ end
 
 --- (GROUND) Fire at a VEC2 point until ammunition is finished.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Vec2 The point to fire at.
--- @param DCSTypes#Distance Radius The radius of the zone to deploy the fire at.
--- @return DCSTask#Task The DCS task structure.
+-- @param Dcs.DCSTypes#Vec2 Vec2 The point to fire at.
+-- @param Dcs.DCSTypes#Distance Radius The radius of the zone to deploy the fire at.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskFireAtPoint( Vec2, Radius )
   self:F2( { self.ControllableName, Vec2, Radius } )
 
@@ -911,7 +911,7 @@ end
 
 --- (GROUND) Hold ground controllable from moving.
 -- @param #CONTROLLABLE self
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskHold()
   self:F2( { self.ControllableName } )
 
@@ -938,11 +938,11 @@ end
 -- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
 -- If the task is assigned to the controllable lead unit will be a FAC. 
 -- @param #CONTROLLABLE self
--- @param Controllable#CONTROLLABLE AttackGroup Target CONTROLLABLE.
+-- @param Wrapper.Controllable#CONTROLLABLE AttackGroup Target CONTROLLABLE.
 -- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
--- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param Dcs.DCSTypes#AI.Task.Designation Designation (optional) Designation type.
 -- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskFAC_AttackGroup( AttackGroup, WeaponType, Designation, Datalink )
   self:F2( { self.ControllableName, AttackGroup, WeaponType, Designation, Datalink } )
 
@@ -974,10 +974,10 @@ end
 
 --- (AIR) Engaging targets of defined types.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Distance Distance Maximal distance from the target to a route leg. If the target is on a greater distance it will be ignored. 
--- @param DCSTypes#AttributeNameArray TargetTypes Array of target categories allowed to engage. 
+-- @param Dcs.DCSTypes#Distance Distance Maximal distance from the target to a route leg. If the target is on a greater distance it will be ignored. 
+-- @param Dcs.DCSTypes#AttributeNameArray TargetTypes Array of target categories allowed to engage. 
 -- @param #number Priority All enroute tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskEngageTargets( Distance, TargetTypes, Priority )
   self:F2( { self.ControllableName, Distance, TargetTypes, Priority } )
 
@@ -1007,11 +1007,11 @@ end
 
 --- (AIR) Engaging a targets of defined types at circle-shaped zone.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Vec2 2D-coordinates of the zone. 
--- @param DCSTypes#Distance Radius Radius of the zone. 
--- @param DCSTypes#AttributeNameArray TargetTypes Array of target categories allowed to engage. 
+-- @param Dcs.DCSTypes#Vec2 Vec2 2D-coordinates of the zone. 
+-- @param Dcs.DCSTypes#Distance Radius Radius of the zone. 
+-- @param Dcs.DCSTypes#AttributeNameArray TargetTypes Array of target categories allowed to engage. 
 -- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskEngageTargets( Vec2, Radius, TargetTypes, Priority )
   self:F2( { self.ControllableName, Vec2, Radius, TargetTypes, Priority } )
 
@@ -1042,15 +1042,15 @@ end
 
 --- (AIR) Engaging a controllable. The task does not assign the target controllable to the unit/controllable to attack now; it just allows the unit/controllable to engage the target controllable as well as other assigned targets.
 -- @param #CONTROLLABLE self
--- @param Controllable#CONTROLLABLE AttackGroup The Controllable to be attacked.
+-- @param Wrapper.Controllable#CONTROLLABLE AttackGroup The Controllable to be attacked.
 -- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
 -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
--- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
+-- @param Dcs.DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
 -- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/controllable will not make more attack than allowed even if the target controllable not destroyed and the aicraft/controllable still have ammo. If not defined the aircraft/controllable will attack target until it will be destroyed or until the aircraft/controllable will run out of ammo.
--- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
--- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Controllable/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/controllable will choose closest altitude to the desired attack start altitude. If the desired altitude is defined controllable/aircraft will not attack from safe altitude.
+-- @param Dcs.DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
+-- @param Dcs.DCSTypes#Distance Altitude (optional) Desired attack start altitude. Controllable/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/controllable will choose closest altitude to the desired attack start altitude. If the desired altitude is defined controllable/aircraft will not attack from safe altitude.
 -- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackControllable" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskEngageGroup( AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
   self:F2( { self.ControllableName, AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
 
@@ -1103,15 +1103,15 @@ end
 
 --- (AIR) Attack the Unit.
 -- @param #CONTROLLABLE self
--- @param Unit#UNIT AttackUnit The UNIT.
+-- @param Wrapper.Unit#UNIT AttackUnit The UNIT.
 -- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
 -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
--- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
+-- @param Dcs.DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion.
 -- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/controllable will not make more attack than allowed even if the target controllable not destroyed and the aicraft/controllable still have ammo. If not defined the aircraft/controllable will attack target until it will be destroyed or until the aircraft/controllable will run out of ammo.
--- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
+-- @param Dcs.DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.
 -- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackControllable" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
 -- @param #boolean ControllableAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the controllable. Has effect only if the task is assigned to a controllable, not to a single aircraft.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskEngageUnit( AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, ControllableAttack )
   self:F2( { self.ControllableName, AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, ControllableAttack } )
 
@@ -1151,7 +1151,7 @@ end
 
 --- (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.
 -- @param #CONTROLLABLE self
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskAWACS( )
   self:F2( { self.ControllableName } )
 
@@ -1174,7 +1174,7 @@ end
 
 --- (AIR) Aircraft will act as a tanker for friendly units. No parameters.
 -- @param #CONTROLLABLE self
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskTanker( )
   self:F2( { self.ControllableName } )
 
@@ -1199,7 +1199,7 @@ end
 
 --- (GROUND) Ground unit (EW-radar) will act as an EWR for friendly units (will provide them with information about contacts). No parameters.
 -- @param #CONTROLLABLE self
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskEWR( )
   self:F2( { self.ControllableName } )
 
@@ -1226,12 +1226,12 @@ end
 -- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
 -- If the task is assigned to the controllable lead unit will be a FAC. 
 -- @param #CONTROLLABLE self
--- @param Controllable#CONTROLLABLE AttackGroup Target CONTROLLABLE.
+-- @param Wrapper.Controllable#CONTROLLABLE AttackGroup Target CONTROLLABLE.
 -- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
 -- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
--- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param Dcs.DCSTypes#AI.Task.Designation Designation (optional) Designation type.
 -- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskFAC_EngageGroup( AttackGroup, Priority, WeaponType, Designation, Datalink )
   self:F2( { self.ControllableName, AttackGroup, WeaponType, Priority, Designation, Datalink } )
 
@@ -1266,9 +1266,9 @@ end
 -- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
 -- If the task is assigned to the controllable lead unit will be a FAC. 
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Distance Radius  The maximal distance from the FAC to a target.
+-- @param Dcs.DCSTypes#Distance Radius  The maximal distance from the FAC to a target.
 -- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskFAC( Radius, Priority )
   self:F2( { self.ControllableName, Radius, Priority } )
 
@@ -1297,10 +1297,10 @@ end
 
 --- (AIR) Move the controllable to a Vec2 Point, wait for a defined duration and embark a controllable.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Point The point where to wait.
+-- @param Dcs.DCSTypes#Vec2 Point The point where to wait.
 -- @param #number Duration The duration in seconds to wait.
 -- @param #CONTROLLABLE EmbarkingControllable The controllable to be embarked.
--- @return DCSTask#Task The DCS task structure
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure
 function CONTROLLABLE:TaskEmbarking( Point, Duration, EmbarkingControllable )
   self:F2( { self.ControllableName, Point, Duration, EmbarkingControllable.DCSControllable } )
 
@@ -1324,13 +1324,13 @@ end
 
 --- Move to a defined Vec2 Point, and embark to a controllable when arrived within a defined Radius.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec2 Point The point where to wait.
+-- @param Dcs.DCSTypes#Vec2 Point The point where to wait.
 -- @param #number Radius The radius of the embarking zone around the Point.
--- @return DCSTask#Task The DCS task structure.
+-- @return Dcs.DCSTasking.Task#Task The DCS task structure.
 function CONTROLLABLE:TaskEmbarkToTransport( Point, Radius )
   self:F2( { self.ControllableName, Point, Radius } )
 
-  local DCSTask --DCSTask#Task
+  local DCSTask --Dcs.DCSTasking.Task#Task
   DCSTask = { id = 'EmbarkToTransport',
     params = { x = Point.x,
       y = Point.y,
@@ -1347,7 +1347,7 @@ end
 --- (AIR + GROUND) Return a mission task from a mission template.
 -- @param #CONTROLLABLE self
 -- @param #table TaskMission A table containing the mission task.
--- @return DCSTask#Task
+-- @return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:TaskMission( TaskMission )
   self:F2( Points )
 
@@ -1361,7 +1361,7 @@ end
 --- Return a Misson task to follow a given route defined by Points.
 -- @param #CONTROLLABLE self
 -- @param #table Points A table of route points.
--- @return DCSTask#Task
+-- @return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:TaskRoute( Points )
   self:F2( Points )
 
@@ -1374,7 +1374,7 @@ end
 
 --- (AIR + GROUND) Make the Controllable move to fly to a given point.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec3 Point The destination point in Vec3 format.
+-- @param Dcs.DCSTypes#Vec3 Point The destination point in Vec3 format.
 -- @param #number Speed The speed to travel.
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:TaskRouteToVec2( Point, Speed )
@@ -1425,7 +1425,7 @@ end
 
 --- (AIR + GROUND) Make the Controllable move to a given point.
 -- @param #CONTROLLABLE self
--- @param DCSTypes#Vec3 Point The destination point in Vec3 format.
+-- @param Dcs.DCSTypes#Vec3 Point The destination point in Vec3 format.
 -- @param #number Speed The speed to travel.
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:TaskRouteToVec3( Point, Speed )
@@ -1508,7 +1508,7 @@ end
 -- A speed can be given in km/h.
 -- A given formation can be given.
 -- @param #CONTROLLABLE self
--- @param Zone#ZONE Zone The zone where to route to.
+-- @param Core.Zone#ZONE Zone The zone where to route to.
 -- @param #boolean Randomize Defines whether to target point gets randomized within the Zone.
 -- @param #number Speed The speed.
 -- @param Base#FORMATION Formation The formation string.
@@ -1566,11 +1566,11 @@ function CONTROLLABLE:TaskRouteToZone( Zone, Randomize, Speed, Formation )
   return nil
 end
 
---- (AIR) Return the Controllable to an @{Airbase#AIRBASE}
+--- (AIR) Return the Controllable to an @{Wrapper.Airbase#AIRBASE}
 -- A speed can be given in km/h.
 -- A given formation can be given.
 -- @param #CONTROLLABLE self
--- @param Airbase#AIRBASE ReturnAirbase The @{Airbase#AIRBASE} to return to.
+-- @param Wrapper.Airbase#AIRBASE ReturnAirbase The @{Wrapper.Airbase#AIRBASE} to return to.
 -- @param #number Speed (optional) The speed.
 -- @return #string The route
 function CONTROLLABLE:RouteReturnToAirbase( ReturnAirbase, Speed )
@@ -1690,7 +1690,7 @@ function CONTROLLABLE:GetTaskRoute()
   return routines.utils.deepCopy( _DATABASE.Templates.Controllables[self.ControllableName].Template.route.points )
 end
 
---- Return the route of a controllable by using the @{Database#DATABASE} class.
+--- Return the route of a controllable by using the @{Core.Database#DATABASE} class.
 -- @param #CONTROLLABLE self
 -- @param #number Begin The route point from where the copy will start. The base route point is 0.
 -- @param #number End The route point where the copy will end. The End point is the last point - the End point. The last point has base 0.
@@ -1745,7 +1745,7 @@ end
 --- Return the detected targets of the controllable.
 -- 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 Controllable#CONTROLLABLE self
+-- @param Wrapper.Controllable#CONTROLLABLE self
 -- @param #boolean DetectVisual (optional)
 -- @param #boolean DetectOptical (optional)
 -- @param #boolean DetectRadar (optional)
@@ -1814,8 +1814,8 @@ function CONTROLLABLE:OptionROEHoldFirePossible()
 end
 
 --- Holding weapons.
--- @param Controllable#CONTROLLABLE self
--- @return Controllable#CONTROLLABLE self
+-- @param Wrapper.Controllable#CONTROLLABLE self
+-- @return Wrapper.Controllable#CONTROLLABLE self
 function CONTROLLABLE:OptionROEHoldFire()
   self:F2( { self.ControllableName } )
 
@@ -2115,7 +2115,7 @@ function CONTROLLABLE:OptionROTVertical()
 end
 
 --- Retrieve the controllable mission and allow to place function hooks within the mission waypoint plan.
--- Use the method @{Controllable#CONTROLLABLE:WayPointFunction} to define the hook functions for specific waypoints.
+-- Use the method @{Wrapper.Controllable#CONTROLLABLE:WayPointFunction} to define the hook functions for specific waypoints.
 -- Use the method @{Controllable@CONTROLLABLE:WayPointExecute) to start the execution of the new mission plan.
 -- Note that when WayPointInitialize is called, the Mission of the controllable is RESTARTED!
 -- @param #CONTROLLABLE self
@@ -2206,8 +2206,8 @@ end
 --- Returns a message with the callsign embedded (if there is one).
 -- @param #CONTROLLABLE self
 -- @param #string Message The message text
--- @param DCSTypes#Duration Duration The duration of the message.
--- @return Message#MESSAGE
+-- @param Dcs.DCSTypes#Duration Duration The duration of the message.
+-- @return Core.Message#MESSAGE
 function CONTROLLABLE:GetMessage( Message, Duration )
 
   local DCSObject = self:GetDCSObject()
@@ -2222,7 +2222,7 @@ end
 -- The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.
 -- @param #CONTROLLABLE self
 -- @param #string Message The message text
--- @param DCSTypes#Duration Duration The duration of the message.
+-- @param Dcs.DCSTypes#Duration Duration The duration of the message.
 function CONTROLLABLE:MessageToAll( Message, Duration )
   self:F2( { Message, Duration } )
 
@@ -2238,7 +2238,7 @@ end
 -- The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.
 -- @param #CONTROLLABLE self
 -- @param #string Message The message text
--- @param DCSTYpes#Duration Duration The duration of the message.
+-- @param Dcs.DCSTYpes#Duration Duration The duration of the message.
 function CONTROLLABLE:MessageToRed( Message, Duration )
   self:F2( { Message, Duration } )
 
@@ -2254,7 +2254,7 @@ end
 -- The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.
 -- @param #CONTROLLABLE self
 -- @param #string Message The message text
--- @param DCSTypes#Duration Duration The duration of the message.
+-- @param Dcs.DCSTypes#Duration Duration The duration of the message.
 function CONTROLLABLE:MessageToBlue( Message, Duration )
   self:F2( { Message, Duration } )
 
@@ -2270,8 +2270,8 @@ end
 -- The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.
 -- @param #CONTROLLABLE self
 -- @param #string Message The message text
--- @param DCSTypes#Duration Duration The duration of the message.
--- @param Client#CLIENT Client The client object receiving the message.
+-- @param Dcs.DCSTypes#Duration Duration The duration of the message.
+-- @param Wrapper.Client#CLIENT Client The client object receiving the message.
 function CONTROLLABLE:MessageToClient( Message, Duration, Client )
   self:F2( { Message, Duration } )
 
@@ -2287,8 +2287,8 @@ end
 -- The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.
 -- @param #CONTROLLABLE self
 -- @param #string Message The message text
--- @param DCSTypes#Duration Duration The duration of the message.
--- @param Group#GROUP MessageGroup The GROUP object receiving the message.
+-- @param Dcs.DCSTypes#Duration Duration The duration of the message.
+-- @param Wrapper.Group#GROUP MessageGroup The GROUP object receiving the message.
 function CONTROLLABLE:MessageToGroup( Message, Duration, MessageGroup )
   self:F2( { Message, Duration } )
 
@@ -2306,7 +2306,7 @@ end
 -- The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.
 -- @param #CONTROLLABLE self
 -- @param #string Message The message text
--- @param DCSTypes#Duration Duration The duration of the message.
+-- @param Dcs.DCSTypes#Duration Duration The duration of the message.
 function CONTROLLABLE:Message( Message, Duration )
   self:F2( { Message, Duration } )
 

Moose Development/Moose/Wrapper/Group.lua

@@ -1,8 +1,8 @@
 --- This module contains the GROUP class.
 -- 
--- 1) @{Group#GROUP} class, extends @{Controllable#CONTROLLABLE}
+-- 1) @{Wrapper.Group#GROUP} class, extends @{Wrapper.Controllable#CONTROLLABLE}
 -- =============================================================
--- The @{Group#GROUP} class is a wrapper class to handle the DCS Group objects:
+-- The @{Wrapper.Group#GROUP} class is a wrapper class to handle the DCS Group objects:
 --
 --  * Support all DCS Group APIs.
 --  * Enhance with Group specific APIs not in the DCS Group API set.
@@ -32,7 +32,7 @@
 -- -----------------------
 -- Several group task methods are available that help you to prepare tasks. 
 -- These methods return a string consisting of the task description, which can then be given to either a  
--- @{Controllable#CONTROLLABLE.PushTask} or @{Controllable#CONTROLLABLE.SetTask} method to assign the task to the GROUP.
+-- @{Wrapper.Controllable#CONTROLLABLE.PushTask} or @{Wrapper.Controllable#CONTROLLABLE.SetTask} method to assign the task to the GROUP.
 -- Tasks are specific for the category of the GROUP, more specific, for AIR, GROUND or AIR and GROUND. 
 -- Each task description where applicable indicates for which group category the task is valid.
 -- There are 2 main subdivisions of tasks: Assigned tasks and EnRoute tasks.
@@ -44,63 +44,63 @@
 -- 
 -- Find below a list of the **assigned task** methods:
 -- 
---   * @{Controllable#CONTROLLABLE.TaskAttackGroup}: (AIR) Attack a Group.
---   * @{Controllable#CONTROLLABLE.TaskAttackMapObject}: (AIR) Attacking the map object (building, structure, e.t.c).
---   * @{Controllable#CONTROLLABLE.TaskAttackUnit}: (AIR) Attack the Unit.
---   * @{Controllable#CONTROLLABLE.TaskBombing}: (Controllable#CONTROLLABLEDelivering weapon at the point on the ground.
---   * @{Controllable#CONTROLLABLE.TaskBombingRunway}: (AIR) Delivering weapon on the runway.
---   * @{Controllable#CONTROLLABLE.TaskEmbarking}: (AIR) Move the group to a Vec2 Point, wait for a defined duration and embark a group.
---   * @{Controllable#CONTROLLABLE.TaskEmbarkToTransport}: (GROUND) Embark to a Transport landed at a location.
---   * @{Controllable#CONTROLLABLE.TaskEscort}: (AIR) Escort another airborne group. 
---   * @{Controllable#CONTROLLABLE.TaskFAC_AttackGroup}: (AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction.
---   * @{Controllable#CONTROLLABLE.TaskFireAtPoint}: (GROUND) Fire at a VEC2 point until ammunition is finished.
---   * @{Controllable#CONTROLLABLE.TaskFollow}: (AIR) Following another airborne group.
---   * @{Controllable#CONTROLLABLE.TaskHold}: (GROUND) Hold ground group from moving.
---   * @{Controllable#CONTROLLABLE.TaskHoldPosition}: (AIR) Hold position at the current position of the first unit of the group.
---   * @{Controllable#CONTROLLABLE.TaskLand}: (AIR HELICOPTER) Landing at the ground. For helicopters only.
---   * @{Controllable#CONTROLLABLE.TaskLandAtZone}: (AIR) Land the group at a @{Zone#ZONE_RADIUS).
---   * @{Controllable#CONTROLLABLE.TaskOrbitCircle}: (AIR) Orbit at the current position of the first unit of the group at a specified alititude.
---   * @{Controllable#CONTROLLABLE.TaskOrbitCircleAtVec2}: (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
---   * @{Controllable#CONTROLLABLE.TaskRefueling}: (AIR) Refueling from the nearest tanker. No parameters.
---   * @{Controllable#CONTROLLABLE.TaskRoute}: (AIR + GROUND) Return a Misson task to follow a given route defined by Points.
---   * @{Controllable#CONTROLLABLE.TaskRouteToVec2}: (AIR + GROUND) Make the Group move to a given point.
---   * @{Controllable#CONTROLLABLE.TaskRouteToVec3}: (AIR + GROUND) Make the Group move to a given point.
---   * @{Controllable#CONTROLLABLE.TaskRouteToZone}: (AIR + GROUND) Route the group to a given zone.
---   * @{Controllable#CONTROLLABLE.TaskReturnToBase}: (AIR) Route the group to an airbase.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskAttackGroup}: (AIR) Attack a Group.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskAttackMapObject}: (AIR) Attacking the map object (building, structure, e.t.c).
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskAttackUnit}: (AIR) Attack the Unit.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskBombing}: (Wrapper.Controllable#CONTROLLABLEDelivering weapon at the point on the ground.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskBombingRunway}: (AIR) Delivering weapon on the runway.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskEmbarking}: (AIR) Move the group to a Vec2 Point, wait for a defined duration and embark a group.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskEmbarkToTransport}: (GROUND) Embark to a Transport landed at a location.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskEscort}: (AIR) Escort another airborne group. 
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskFAC_AttackGroup}: (AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskFireAtPoint}: (GROUND) Fire at a VEC2 point until ammunition is finished.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskFollow}: (AIR) Following another airborne group.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskHold}: (GROUND) Hold ground group from moving.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskHoldPosition}: (AIR) Hold position at the current position of the first unit of the group.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskLand}: (AIR HELICOPTER) Landing at the ground. For helicopters only.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskLandAtZone}: (AIR) Land the group at a @{Core.Zone#ZONE_RADIUS).
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskOrbitCircle}: (AIR) Orbit at the current position of the first unit of the group at a specified alititude.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskOrbitCircleAtVec2}: (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskRefueling}: (AIR) Refueling from the nearest tanker. No parameters.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskRoute}: (AIR + GROUND) Return a Misson task to follow a given route defined by Points.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskRouteToVec2}: (AIR + GROUND) Make the Group move to a given point.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskRouteToVec3}: (AIR + GROUND) Make the Group move to a given point.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskRouteToZone}: (AIR + GROUND) Route the group to a given zone.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskReturnToBase}: (AIR) Route the group to an airbase.
 --
 -- ### 1.2.2) EnRoute task methods
 -- 
 -- EnRoute tasks require the targets of the task need to be detected by the group (using its sensors) before the task can be executed:
 -- 
---   * @{Controllable#CONTROLLABLE.EnRouteTaskAWACS}: (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.
---   * @{Controllable#CONTROLLABLE.EnRouteTaskEngageGroup}: (AIR) Engaging a group. The task does not assign the target group to the unit/group to attack now; it just allows the unit/group to engage the target group as well as other assigned targets.
---   * @{Controllable#CONTROLLABLE.EnRouteTaskEngageTargets}: (AIR) Engaging targets of defined types.
---   * @{Controllable#CONTROLLABLE.EnRouteTaskEWR}: (AIR) Attack the Unit.
---   * @{Controllable#CONTROLLABLE.EnRouteTaskFAC}: (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose a targets (enemy ground group) around as well as other assigned targets.
---   * @{Controllable#CONTROLLABLE.EnRouteTaskFAC_EngageGroup}: (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose the target (enemy ground group) as well as other assigned targets.
---   * @{Controllable#CONTROLLABLE.EnRouteTaskTanker}: (AIR) Aircraft will act as a tanker for friendly units. No parameters.
+--   * @{Wrapper.Controllable#CONTROLLABLE.EnRouteTaskAWACS}: (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.
+--   * @{Wrapper.Controllable#CONTROLLABLE.EnRouteTaskEngageGroup}: (AIR) Engaging a group. The task does not assign the target group to the unit/group to attack now; it just allows the unit/group to engage the target group as well as other assigned targets.
+--   * @{Wrapper.Controllable#CONTROLLABLE.EnRouteTaskEngageTargets}: (AIR) Engaging targets of defined types.
+--   * @{Wrapper.Controllable#CONTROLLABLE.EnRouteTaskEWR}: (AIR) Attack the Unit.
+--   * @{Wrapper.Controllable#CONTROLLABLE.EnRouteTaskFAC}: (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose a targets (enemy ground group) around as well as other assigned targets.
+--   * @{Wrapper.Controllable#CONTROLLABLE.EnRouteTaskFAC_EngageGroup}: (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose the target (enemy ground group) as well as other assigned targets.
+--   * @{Wrapper.Controllable#CONTROLLABLE.EnRouteTaskTanker}: (AIR) Aircraft will act as a tanker for friendly units. No parameters.
 -- 
 -- ### 1.2.3) Preparation task methods
 -- 
 -- There are certain task methods that allow to tailor the task behaviour:
 --
---   * @{Controllable#CONTROLLABLE.TaskWrappedAction}: Return a WrappedAction Task taking a Command.
---   * @{Controllable#CONTROLLABLE.TaskCombo}: Return a Combo Task taking an array of Tasks.
---   * @{Controllable#CONTROLLABLE.TaskCondition}: Return a condition section for a controlled task.
---   * @{Controllable#CONTROLLABLE.TaskControlled}: Return a Controlled Task taking a Task and a TaskCondition.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskWrappedAction}: Return a WrappedAction Task taking a Command.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskCombo}: Return a Combo Task taking an array of Tasks.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskCondition}: Return a condition section for a controlled task.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskControlled}: Return a Controlled Task taking a Task and a TaskCondition.
 -- 
 -- ### 1.2.4) Obtain the mission from group templates
 -- 
 -- Group templates contain complete mission descriptions. Sometimes you want to copy a complete mission from a group and assign it to another:
 -- 
---   * @{Controllable#CONTROLLABLE.TaskMission}: (AIR + GROUND) Return a mission task from a mission template.
+--   * @{Wrapper.Controllable#CONTROLLABLE.TaskMission}: (AIR + GROUND) Return a mission task from a mission template.
 --
 -- 1.3) GROUP Command methods
 -- --------------------------
--- Group **command methods** prepare the execution of commands using the @{Controllable#CONTROLLABLE.SetCommand} method:
+-- Group **command methods** prepare the execution of commands using the @{Wrapper.Controllable#CONTROLLABLE.SetCommand} method:
 -- 
---   * @{Controllable#CONTROLLABLE.CommandDoScript}: Do Script command.
---   * @{Controllable#CONTROLLABLE.CommandSwitchWayPoint}: Perform a switch waypoint command.
+--   * @{Wrapper.Controllable#CONTROLLABLE.CommandDoScript}: Do Script command.
+--   * @{Wrapper.Controllable#CONTROLLABLE.CommandSwitchWayPoint}: Perform a switch waypoint command.
 -- 
 -- 1.4) GROUP Option methods
 -- -------------------------
@@ -108,31 +108,31 @@
 -- 
 -- ### 1.4.1) Rule of Engagement:
 -- 
---   * @{Controllable#CONTROLLABLE.OptionROEWeaponFree} 
---   * @{Controllable#CONTROLLABLE.OptionROEOpenFire}
---   * @{Controllable#CONTROLLABLE.OptionROEReturnFire}
---   * @{Controllable#CONTROLLABLE.OptionROEEvadeFire}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEWeaponFree} 
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEOpenFire}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEReturnFire}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEEvadeFire}
 -- 
 -- To check whether an ROE option is valid for a specific group, use:
 -- 
---   * @{Controllable#CONTROLLABLE.OptionROEWeaponFreePossible} 
---   * @{Controllable#CONTROLLABLE.OptionROEOpenFirePossible}
---   * @{Controllable#CONTROLLABLE.OptionROEReturnFirePossible}
---   * @{Controllable#CONTROLLABLE.OptionROEEvadeFirePossible}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEWeaponFreePossible} 
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEOpenFirePossible}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEReturnFirePossible}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROEEvadeFirePossible}
 -- 
 -- ### 1.4.2) Rule on thread:
 -- 
---   * @{Controllable#CONTROLLABLE.OptionROTNoReaction}
---   * @{Controllable#CONTROLLABLE.OptionROTPassiveDefense}
---   * @{Controllable#CONTROLLABLE.OptionROTEvadeFire}
---   * @{Controllable#CONTROLLABLE.OptionROTVertical}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTNoReaction}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTPassiveDefense}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTEvadeFire}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTVertical}
 -- 
 -- To test whether an ROT option is valid for a specific group, use:
 -- 
---   * @{Controllable#CONTROLLABLE.OptionROTNoReactionPossible}
---   * @{Controllable#CONTROLLABLE.OptionROTPassiveDefensePossible}
---   * @{Controllable#CONTROLLABLE.OptionROTEvadeFirePossible}
---   * @{Controllable#CONTROLLABLE.OptionROTVerticalPossible}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTNoReactionPossible}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTPassiveDefensePossible}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTEvadeFirePossible}
+--   * @{Wrapper.Controllable#CONTROLLABLE.OptionROTVerticalPossible}
 -- 
 -- 1.5) GROUP Zone validation methods
 -- ----------------------------------
@@ -143,14 +143,14 @@
 --   * @{#GROUP.IsPartlyInZone}: Returns true if some units of the group are within a @{Zone}.
 --   * @{#GROUP.IsNotInZone}: Returns true if none of the group units of the group are within a @{Zone}.
 --   
--- The zone can be of any @{Zone} class derived from @{Zone#ZONE_BASE}. So, these methods are polymorphic to the zones tested on.
+-- The zone can be of any @{Zone} class derived from @{Core.Zone#ZONE_BASE}. So, these methods are polymorphic to the zones tested on.
 -- 
 -- @module Group
 -- @author FlightControl
 
 --- The GROUP class
 -- @type GROUP
--- @extends Controllable#CONTROLLABLE
+-- @extends Wrapper.Controllable#CONTROLLABLE
 -- @field #string GroupName The name of the group.
 GROUP = {
   ClassName = "GROUP",
@@ -158,7 +158,7 @@ GROUP = {
 
 --- Create a new GROUP from a DCSGroup
 -- @param #GROUP self
--- @param DCSGroup#Group GroupName The DCS Group name
+-- @param Dcs.DCSWrapper.Group#Group GroupName The DCS Group name
 -- @return #GROUP self
 function GROUP:Register( GroupName )
   local self = BASE:Inherit( self, CONTROLLABLE:New( GroupName ) )
@@ -171,11 +171,11 @@ end
 
 --- Find the GROUP wrapper class instance using the DCS Group.
 -- @param #GROUP self
--- @param DCSGroup#Group DCSGroup The DCS Group.
+-- @param Dcs.DCSWrapper.Group#Group DCSGroup The DCS Group.
 -- @return #GROUP The GROUP.
 function GROUP:Find( DCSGroup )
 
-  local GroupName = DCSGroup:getName() -- Group#GROUP
+  local GroupName = DCSGroup:getName() -- Wrapper.Group#GROUP
   local GroupFound = _DATABASE:FindGroup( GroupName )
   return GroupFound
 end
@@ -194,7 +194,7 @@ end
 
 --- Returns the DCS Group.
 -- @param #GROUP self
--- @return DCSGroup#Group The DCS Group.
+-- @return Dcs.DCSWrapper.Group#Group The DCS Group.
 function GROUP:GetDCSObject()
   local DCSGroup = Group.getByName( self.GroupName )
 
@@ -246,7 +246,7 @@ end
 
 --- Returns category of the DCS Group.
 -- @param #GROUP self
--- @return DCSGroup#Group.Category The category ID
+-- @return Dcs.DCSWrapper.Group#Group.Category The category ID
 function GROUP:GetCategory()
   self:F2( self.GroupName )
 
@@ -286,7 +286,7 @@ end
 
 --- Returns the coalition of the DCS Group.
 -- @param #GROUP self
--- @return DCSCoalitionObject#coalition.side The coalition side of the DCS Group.
+-- @return Dcs.DCSCoalitionWrapper.Object#coalition.side The coalition side of the DCS Group.
 function GROUP:GetCoalition()
   self:F2( self.GroupName )
 
@@ -302,7 +302,7 @@ end
 
 --- Returns the country of the DCS Group.
 -- @param #GROUP self
--- @return DCScountry#country.id The country identifier.
+-- @return Dcs.DCScountry#country.id The country identifier.
 -- @return #nil The DCS Group is not existing or alive.
 function GROUP:GetCountry()
   self:F2( self.GroupName )
@@ -321,7 +321,7 @@ end
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the UNIT wrapper class to be returned.
--- @return Unit#UNIT The UNIT wrapper class.
+-- @return Wrapper.Unit#UNIT The UNIT wrapper class.
 function GROUP:GetUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
@@ -341,7 +341,7 @@ end
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the DCS Unit to be returned.
--- @return DCSUnit#Unit The DCS Unit.
+-- @return Dcs.DCSWrapper.Unit#Unit The DCS Unit.
 function GROUP:GetDCSUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
@@ -474,7 +474,7 @@ end
 
 --- Returns the current point (Vec2 vector) of the first DCS Unit in the DCS Group.
 -- @param #GROUP self
--- @return DCSTypes#Vec2 Current Vec2 point of the first DCS Unit of the DCS Group.
+-- @return Dcs.DCSTypes#Vec2 Current Vec2 point of the first DCS Unit of the DCS Group.
 function GROUP:GetVec2()
   self:F2( self.GroupName )
 
@@ -486,7 +486,7 @@ function GROUP:GetVec2()
 end
 
 --- Returns the current Vec3 vector of the first DCS Unit in the GROUP.
--- @return DCSTypes#Vec3 Current Vec3 of the first DCS Unit of the GROUP.
+-- @return Dcs.DCSTypes#Vec3 Current Vec3 of the first DCS Unit of the GROUP.
 function GROUP:GetVec3()
   self:F2( self.GroupName )
 
@@ -501,13 +501,13 @@ end
 
 --- Returns true if all units of the group are within a @{Zone}.
 -- @param #GROUP self
--- @param Zone#ZONE_BASE Zone The zone to test.
--- @return #boolean Returns true if the Group is completely within the @{Zone#ZONE_BASE}
+-- @param Core.Zone#ZONE_BASE Zone The zone to test.
+-- @return #boolean Returns true if the Group is completely within the @{Core.Zone#ZONE_BASE}
 function GROUP:IsCompletelyInZone( Zone )
   self:F2( { self.GroupName, Zone } )
   
   for UnitID, UnitData in pairs( self:GetUnits() ) do
-    local Unit = UnitData -- Unit#UNIT
+    local Unit = UnitData -- Wrapper.Unit#UNIT
     -- TODO: Rename IsPointVec3InZone to IsVec3InZone
     if Zone:IsPointVec3InZone( Unit:GetVec3() ) then
     else
@@ -520,13 +520,13 @@ end
 
 --- Returns true if some units of the group are within a @{Zone}.
 -- @param #GROUP self
--- @param Zone#ZONE_BASE Zone The zone to test.
--- @return #boolean Returns true if the Group is completely within the @{Zone#ZONE_BASE}
+-- @param Core.Zone#ZONE_BASE Zone The zone to test.
+-- @return #boolean Returns true if the Group is completely within the @{Core.Zone#ZONE_BASE}
 function GROUP:IsPartlyInZone( Zone )
   self:F2( { self.GroupName, Zone } )
   
   for UnitID, UnitData in pairs( self:GetUnits() ) do
-    local Unit = UnitData -- Unit#UNIT
+    local Unit = UnitData -- Wrapper.Unit#UNIT
     if Zone:IsPointVec3InZone( Unit:GetVec3() ) then
       return true
     end
@@ -537,13 +537,13 @@ end
 
 --- Returns true if none of the group units of the group are within a @{Zone}.
 -- @param #GROUP self
--- @param Zone#ZONE_BASE Zone The zone to test.
--- @return #boolean Returns true if the Group is completely within the @{Zone#ZONE_BASE}
+-- @param Core.Zone#ZONE_BASE Zone The zone to test.
+-- @return #boolean Returns true if the Group is completely within the @{Core.Zone#ZONE_BASE}
 function GROUP:IsNotInZone( Zone )
   self:F2( { self.GroupName, Zone } )
   
   for UnitID, UnitData in pairs( self:GetUnits() ) do
-    local Unit = UnitData -- Unit#UNIT
+    local Unit = UnitData -- Wrapper.Unit#UNIT
     if Zone:IsPointVec3InZone( Unit:GetVec3() ) then
       return false
     end
@@ -712,7 +712,7 @@ end
 -- SPAWNING
 
 --- Respawn the @{GROUP} using a (tweaked) template of the Group.
--- The template must be retrieved with the @{Group#GROUP.GetTemplate}() function.
+-- The template must be retrieved with the @{Wrapper.Group#GROUP.GetTemplate}() function.
 -- The template contains all the definitions as declared within the mission file.
 -- To understand templates, do the following: 
 -- 
@@ -728,7 +728,7 @@ end
 --  * When the group is alive, it will tweak the template x, y and heading coordinates of the group and the embedded units to the current units positions.
 --  * Then it will destroy the current alive group.
 --  * And it will respawn the group using your new template definition.
--- @param Group#GROUP self
+-- @param Wrapper.Group#GROUP self
 -- @param #table Template The template of the Group retrieved with GROUP:GetTemplate()
 function GROUP:Respawn( Template )
 
@@ -740,7 +740,7 @@ function GROUP:Respawn( Template )
   
   self:E( #Template.units )
   for UnitID, UnitData in pairs( self:GetUnits() ) do
-    local GroupUnit = UnitData -- Unit#UNIT
+    local GroupUnit = UnitData -- Wrapper.Unit#UNIT
     self:E( GroupUnit:GetName() )
     if GroupUnit:IsAlive() then
       local GroupUnitVec3 = GroupUnit:GetVec3()
@@ -777,7 +777,7 @@ end
 
 --- Sets the CountryID of the group in a Template.
 -- @param #GROUP self
--- @param DCScountry#country.id CountryID The country ID.
+-- @param Dcs.DCScountry#country.id CountryID The country ID.
 -- @return #table 
 function GROUP:SetTemplateCountry( Template, CountryID )
   Template.CountryID = CountryID
@@ -786,7 +786,7 @@ end
 
 --- Sets the CoalitionID of the group in a Template.
 -- @param #GROUP self
--- @param DCSCoalitionObject#coalition.side CoalitionID The coalition ID.
+-- @param Dcs.DCSCoalitionWrapper.Object#coalition.side CoalitionID The coalition ID.
 -- @return #table 
 function GROUP:SetTemplateCoalition( Template, CoalitionID )
   Template.CoalitionID = CoalitionID
@@ -814,7 +814,7 @@ function GROUP:GetTaskRoute()
   return routines.utils.deepCopy( _DATABASE.Templates.Groups[self.GroupName].Template.route.points )
 end
 
---- Return the route of a group by using the @{Database#DATABASE} class.
+--- Return the route of a group by using the @{Core.Database#DATABASE} class.
 -- @param #GROUP self
 -- @param #number Begin The route point from where the copy will start. The base route point is 0.
 -- @param #number End The route point where the copy will end. The End point is the last point - the End point. The last point has base 0.

Moose Development/Moose/Wrapper/Identifiable.lua

@@ -1,6 +1,6 @@
 --- This module contains the IDENTIFIABLE class.
 -- 
--- 1) @{#IDENTIFIABLE} class, extends @{Object#OBJECT}
+-- 1) @{#IDENTIFIABLE} class, extends @{Wrapper.Object#OBJECT}
 -- ===============================================================
 -- The @{#IDENTIFIABLE} class is a wrapper class to handle the DCS Identifiable objects:
 --
@@ -50,7 +50,7 @@ local _CategoryName = {
 
 --- Create a new IDENTIFIABLE from a DCSIdentifiable
 -- @param #IDENTIFIABLE self
--- @param DCSIdentifiable#Identifiable IdentifiableName The DCS Identifiable name
+-- @param Dcs.DCSWrapper.Identifiable#Identifiable IdentifiableName The DCS Identifiable name
 -- @return #IDENTIFIABLE self
 function IDENTIFIABLE:New( IdentifiableName )
   local self = BASE:Inherit( self, OBJECT:New( IdentifiableName ) )
@@ -121,7 +121,7 @@ end
 
 --- Returns category of the DCS Identifiable.
 -- @param #IDENTIFIABLE self
--- @return DCSObject#Object.Category The category ID
+-- @return Dcs.DCSWrapper.Object#Object.Category The category ID
 function IDENTIFIABLE:GetCategory()
   self:F2( self.ObjectName )
 
@@ -153,7 +153,7 @@ end
 
 --- Returns coalition of the Identifiable.
 -- @param #IDENTIFIABLE self
--- @return DCSCoalitionObject#coalition.side The side of the coalition.
+-- @return Dcs.DCSCoalitionWrapper.Object#coalition.side The side of the coalition.
 -- @return #nil The DCS Identifiable is not existing or alive.  
 function IDENTIFIABLE:GetCoalition()
   self:F2( self.IdentifiableName )
@@ -172,7 +172,7 @@ end
 
 --- Returns country of the Identifiable.
 -- @param #IDENTIFIABLE self
--- @return DCScountry#country.id The country identifier.
+-- @return Dcs.DCScountry#country.id The country identifier.
 -- @return #nil The DCS Identifiable is not existing or alive.  
 function IDENTIFIABLE:GetCountry()
   self:F2( self.IdentifiableName )
@@ -193,7 +193,7 @@ end
 
 --- Returns Identifiable descriptor. Descriptor type depends on Identifiable category.
 -- @param #IDENTIFIABLE self
--- @return DCSIdentifiable#Identifiable.Desc The Identifiable descriptor.
+-- @return Dcs.DCSWrapper.Identifiable#Identifiable.Desc The Identifiable descriptor.
 -- @return #nil The DCS Identifiable is not existing or alive.  
 function IDENTIFIABLE:GetDesc()
   self:F2( self.IdentifiableName )

Moose Development/Moose/Wrapper/Object.lua

@@ -1,8 +1,8 @@
 --- This module contains the OBJECT class.
 -- 
--- 1) @{Object#OBJECT} class, extends @{Base#BASE}
+-- 1) @{Wrapper.Object#OBJECT} class, extends @{Core.Base#BASE}
 -- ===========================================================
--- The @{Object#OBJECT} class is a wrapper class to handle the DCS Object objects:
+-- The @{Wrapper.Object#OBJECT} class is a wrapper class to handle the DCS Object objects:
 --
 --  * Support all DCS Object APIs.
 --  * Enhance with Object specific APIs not in the DCS Object API set.
@@ -12,13 +12,13 @@
 -- ------------------------------
 -- The OBJECT class provides the following functions to construct a OBJECT instance:
 --
---  * @{Object#OBJECT.New}(): Create a OBJECT instance.
+--  * @{Wrapper.Object#OBJECT.New}(): Create a OBJECT instance.
 --
 -- 1.2) OBJECT methods:
 -- --------------------------
 -- The following methods can be used to identify an Object object:
 -- 
---    * @{Object#OBJECT.GetID}(): Returns the ID of the Object object.
+--    * @{Wrapper.Object#OBJECT.GetID}(): Returns the ID of the Object object.
 -- 
 -- ===
 -- 
@@ -41,7 +41,7 @@ OBJECT = {
 
 --- Create a new OBJECT from a DCSObject
 -- @param #OBJECT self
--- @param DCSObject#Object ObjectName The Object name
+-- @param Dcs.DCSWrapper.Object#Object ObjectName The Object name
 -- @return #OBJECT self
 function OBJECT:New( ObjectName )
   local self = BASE:Inherit( self, BASE:New() )
@@ -52,8 +52,8 @@ end
 
 
 --- Returns the unit's unique identifier.
--- @param Object#OBJECT self
--- @return DCSObject#Object.ID ObjectID
+-- @param Wrapper.Object#OBJECT self
+-- @return Dcs.DCSWrapper.Object#Object.ID ObjectID
 -- @return #nil The DCS Object is not existing or alive.  
 function OBJECT:GetID()
   self:F2( self.ObjectName )

Moose Development/Moose/Wrapper/Positionable.lua

@@ -1,8 +1,8 @@
 --- This module contains the POSITIONABLE class.
 -- 
--- 1) @{Positionable#POSITIONABLE} class, extends @{Identifiable#IDENTIFIABLE}
+-- 1) @{Wrapper.Positionable#POSITIONABLE} class, extends @{Wrapper.Identifiable#IDENTIFIABLE}
 -- ===========================================================
--- The @{Positionable#POSITIONABLE} class is a wrapper class to handle the POSITIONABLE objects:
+-- The @{Wrapper.Positionable#POSITIONABLE} class is a wrapper class to handle the POSITIONABLE objects:
 --
 --  * Support all DCS APIs.
 --  * Enhance with POSITIONABLE specific APIs not in the DCS API set.
@@ -12,14 +12,14 @@
 -- ------------------------------
 -- The POSITIONABLE class provides the following functions to construct a POSITIONABLE instance:
 --
---  * @{Positionable#POSITIONABLE.New}(): Create a POSITIONABLE instance.
+--  * @{Wrapper.Positionable#POSITIONABLE.New}(): Create a POSITIONABLE instance.
 --
 -- 1.2) POSITIONABLE methods:
 -- --------------------------
 -- The following methods can be used to identify an measurable object:
 -- 
---    * @{Positionable#POSITIONABLE.GetID}(): Returns the ID of the measurable object.
---    * @{Positionable#POSITIONABLE.GetName}(): Returns the name of the measurable object.
+--    * @{Wrapper.Positionable#POSITIONABLE.GetID}(): Returns the ID of the measurable object.
+--    * @{Wrapper.Positionable#POSITIONABLE.GetName}(): Returns the name of the measurable object.
 -- 
 -- ===
 -- 
@@ -41,7 +41,7 @@ POSITIONABLE = {
 
 --- Create a new POSITIONABLE from a DCSPositionable
 -- @param #POSITIONABLE self
--- @param DCSPositionable#Positionable PositionableName The POSITIONABLE name
+-- @param Dcs.DCSWrapper.Positionable#Positionable PositionableName The POSITIONABLE name
 -- @return #POSITIONABLE self
 function POSITIONABLE:New( PositionableName )
   local self = BASE:Inherit( self, IDENTIFIABLE:New( PositionableName ) )
@@ -49,9 +49,9 @@ function POSITIONABLE:New( PositionableName )
   return self
 end
 
---- Returns the @{DCSTypes#Position3} position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.
--- @param Positionable#POSITIONABLE self
--- @return DCSTypes#Position The 3D position vectors of the POSITIONABLE.
+--- Returns the @{Dcs.DCSTypes#Position3} position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.
+-- @param Wrapper.Positionable#POSITIONABLE self
+-- @return Dcs.DCSTypes#Position The 3D position vectors of the POSITIONABLE.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetPositionVec3()
   self:F2( self.PositionableName )
@@ -67,9 +67,9 @@ function POSITIONABLE:GetPositionVec3()
   return nil
 end
 
---- Returns the @{DCSTypes#Vec2} vector indicating the point in 2D of the POSITIONABLE within the mission.
--- @param Positionable#POSITIONABLE self
--- @return DCSTypes#Vec2 The 2D point vector of the POSITIONABLE.
+--- Returns the @{Dcs.DCSTypes#Vec2} vector indicating the point in 2D of the POSITIONABLE within the mission.
+-- @param Wrapper.Positionable#POSITIONABLE self
+-- @return Dcs.DCSTypes#Vec2 The 2D point vector of the POSITIONABLE.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetVec2()
   self:F2( self.PositionableName )
@@ -91,8 +91,8 @@ function POSITIONABLE:GetVec2()
 end
 
 --- Returns a POINT_VEC2 object indicating the point in 2D of the POSITIONABLE within the mission.
--- @param Positionable#POSITIONABLE self
--- @return Point#POINT_VEC2 The 2D point vector of the POSITIONABLE.
+-- @param Wrapper.Positionable#POSITIONABLE self
+-- @return Core.Point#POINT_VEC2 The 2D point vector of the POSITIONABLE.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetPointVec2()
   self:F2( self.PositionableName )
@@ -112,9 +112,9 @@ function POSITIONABLE:GetPointVec2()
 end
 
 
---- Returns a random @{DCSTypes#Vec3} vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.
--- @param Positionable#POSITIONABLE self
--- @return DCSTypes#Vec3 The 3D point vector of the POSITIONABLE.
+--- Returns a random @{Dcs.DCSTypes#Vec3} vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.
+-- @param Wrapper.Positionable#POSITIONABLE self
+-- @return Dcs.DCSTypes#Vec3 The 3D point vector of the POSITIONABLE.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetRandomVec3( Radius )
   self:F2( self.PositionableName )
@@ -136,9 +136,9 @@ function POSITIONABLE:GetRandomVec3( Radius )
   return nil
 end
 
---- Returns the @{DCSTypes#Vec3} vector indicating the 3D vector of the POSITIONABLE within the mission.
--- @param Positionable#POSITIONABLE self
--- @return DCSTypes#Vec3 The 3D point vector of the POSITIONABLE.
+--- Returns the @{Dcs.DCSTypes#Vec3} vector indicating the 3D vector of the POSITIONABLE within the mission.
+-- @param Wrapper.Positionable#POSITIONABLE self
+-- @return Dcs.DCSTypes#Vec3 The 3D point vector of the POSITIONABLE.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetVec3()
   self:F2( self.PositionableName )
@@ -155,8 +155,8 @@ function POSITIONABLE:GetVec3()
 end
 
 --- Returns the altitude of the POSITIONABLE.
--- @param Positionable#POSITIONABLE self
--- @return DCSTypes#Distance The altitude of the POSITIONABLE.
+-- @param Wrapper.Positionable#POSITIONABLE self
+-- @return Dcs.DCSTypes#Distance The altitude of the POSITIONABLE.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetAltitude()
   self:F2()
@@ -164,7 +164,7 @@ function POSITIONABLE:GetAltitude()
   local DCSPositionable = self:GetDCSObject()
   
   if DCSPositionable then
-    local PositionablePointVec3 = DCSPositionable:getPoint() --DCSTypes#Vec3
+    local PositionablePointVec3 = DCSPositionable:getPoint() --Dcs.DCSTypes#Vec3
     return PositionablePointVec3.y
   end
   
@@ -172,7 +172,7 @@ function POSITIONABLE:GetAltitude()
 end 
 
 --- Returns if the Positionable is located above a runway.
--- @param Positionable#POSITIONABLE self
+-- @param Wrapper.Positionable#POSITIONABLE self
 -- @return #boolean true if Positionable is above a runway.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:IsAboveRunway()
@@ -196,7 +196,7 @@ end
 
 
 --- Returns the POSITIONABLE heading in degrees.
--- @param Positionable#POSITIONABLE self
+-- @param Wrapper.Positionable#POSITIONABLE self
 -- @return #number The POSTIONABLE heading
 function POSITIONABLE:GetHeading()
   local DCSPositionable = self:GetDCSObject()
@@ -220,7 +220,7 @@ end
 
 
 --- Returns true if the POSITIONABLE is in the air.
--- @param Positionable#POSITIONABLE self
+-- @param Wrapper.Positionable#POSITIONABLE self
 -- @return #boolean true if in the air.
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:InAir()
@@ -239,8 +239,8 @@ end
 
  
 --- Returns the POSITIONABLE velocity vector.
--- @param Positionable#POSITIONABLE self
--- @return DCSTypes#Vec3 The velocity vector
+-- @param Wrapper.Positionable#POSITIONABLE self
+-- @return Dcs.DCSTypes#Vec3 The velocity vector
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetVelocity()
   self:F2( self.PositionableName )
@@ -257,7 +257,7 @@ function POSITIONABLE:GetVelocity()
 end
 
 --- Returns the POSITIONABLE velocity in km/h.
--- @param Positionable#POSITIONABLE self
+-- @param Wrapper.Positionable#POSITIONABLE self
 -- @return #number The velocity in km/h
 -- @return #nil The POSITIONABLE is not existing or alive.  
 function POSITIONABLE:GetVelocityKMH()

Moose Development/Moose/Wrapper/Static.lua

@@ -1,10 +1,10 @@
 --- This module contains the STATIC class.
 -- 
--- 1) @{Static#STATIC} class, extends @{Positionable#POSITIONABLE}
+-- 1) @{Wrapper.Static#STATIC} class, extends @{Wrapper.Positionable#POSITIONABLE}
 -- ===============================================================
 -- Statics are **Static Units** defined within the Mission Editor.
 -- Note that Statics are almost the same as Units, but they don't have a controller.
--- The @{Static#STATIC} class is a wrapper class to handle the DCS Static objects:
+-- The @{Wrapper.Static#STATIC} class is a wrapper class to handle the DCS Static objects:
 -- 
 --  * Wraps the DCS Static objects.
 --  * Support all DCS Static APIs.
@@ -38,7 +38,7 @@
 
 --- The STATIC class
 -- @type STATIC
--- @extends Positionable#POSITIONABLE
+-- @extends Wrapper.Positionable#POSITIONABLE
 STATIC = {
 	ClassName = "STATIC",
 }

Moose Development/Moose/Wrapper/Unit.lua

@@ -1,6 +1,6 @@
 --- This module contains the UNIT class.
 -- 
--- 1) @{#UNIT} class, extends @{Controllable#CONTROLLABLE}
+-- 1) @{#UNIT} class, extends @{Wrapper.Controllable#CONTROLLABLE}
 -- ===========================================================
 -- The @{#UNIT} class is a wrapper class to handle the DCS Unit objects:
 -- 
@@ -33,7 +33,7 @@
 -- ------------------
 -- The DCS Unit APIs are used extensively within MOOSE. The UNIT class has for each DCS Unit API a corresponding method.
 -- To be able to distinguish easily in your code the difference between a UNIT API call and a DCS Unit API call,
--- the first letter of the method is also capitalized. So, by example, the DCS Unit method @{DCSUnit#Unit.getName}()
+-- the first letter of the method is also capitalized. So, by example, the DCS Unit method @{Dcs.DCSWrapper.Unit#Unit.getName}()
 -- is implemented in the UNIT class as @{#UNIT.GetName}().
 -- 
 -- 1.3) Smoke, Flare Units
@@ -60,7 +60,7 @@
 -- The UNIT class contains methods to test the location or proximity against zones or other objects.
 -- 
 -- ### 1.6.1) Zones
--- To test whether the Unit is within a **zone**, use the @{#UNIT.IsInZone}() or the @{#UNIT.IsNotInZone}() methods. Any zone can be tested on, but the zone must be derived from @{Zone#ZONE_BASE}. 
+-- To test whether the Unit is within a **zone**, use the @{#UNIT.IsInZone}() or the @{#UNIT.IsNotInZone}() methods. Any zone can be tested on, but the zone must be derived from @{Core.Zone#ZONE_BASE}. 
 -- 
 -- ### 1.6.2) Units
 -- Test if another DCS Unit is within a given radius of the current DCS Unit, use the @{#UNIT.OtherUnitInRadius}() method.
@@ -133,7 +133,7 @@ end
 
 --- Finds a UNIT from the _DATABASE using a DCSUnit object.
 -- @param #UNIT self
--- @param DCSUnit#Unit DCSUnit An existing DCS Unit object reference.
+-- @param Dcs.DCSWrapper.Unit#Unit DCSUnit An existing DCS Unit object reference.
 -- @return #UNIT self
 function UNIT:Find( DCSUnit )
 
@@ -162,7 +162,7 @@ end
 
 
 --- @param #UNIT self
--- @return DCSUnit#Unit
+-- @return Dcs.DCSWrapper.Unit#Unit
 function UNIT:GetDCSObject()
 
   local DCSUnit = Unit.getByName( self.UnitName )
@@ -183,7 +183,7 @@ end
 --  * Then it will respawn the re-modelled group.
 --  
 -- @param #UNIT self
--- @param DCSTypes#Vec3 SpawnVec3 The position where to Spawn the new Unit at.
+-- @param Dcs.DCSTypes#Vec3 SpawnVec3 The position where to Spawn the new Unit at.
 -- @param #number Heading The heading of the unit respawn.
 function UNIT:ReSpawn( SpawnVec3, Heading )
 
@@ -383,7 +383,7 @@ end
 
 --- Returns the Unit's ammunition.
 -- @param #UNIT self
--- @return DCSUnit#Unit.Ammo
+-- @return Dcs.DCSWrapper.Unit#Unit.Ammo
 -- @return #nil The DCS Unit is not existing or alive.  
 function UNIT:GetAmmo()
   self:F2( self.UnitName )
@@ -400,7 +400,7 @@ end
 
 --- Returns the unit sensors.
 -- @param #UNIT self
--- @return DCSUnit#Unit.Sensors
+-- @return Dcs.DCSWrapper.Unit#Unit.Sensors
 -- @return #nil The DCS Unit is not existing or alive.  
 function UNIT:GetSensors()
   self:F2( self.UnitName )
@@ -464,7 +464,7 @@ end
 --  * Second value is the object of the radar's interest. Not nil only if at least one radar of the unit is tracking a target.
 -- @param #UNIT self
 -- @return #boolean  Indicates if at least one of the unit's radar(s) is on.
--- @return DCSObject#Object The object of the radar's interest. Not nil only if at least one radar of the unit is tracking a target.
+-- @return Dcs.DCSWrapper.Object#Object The object of the radar's interest. Not nil only if at least one radar of the unit is tracking a target.
 -- @return #nil The DCS Unit is not existing or alive.  
 function UNIT:GetRadar()
   self:F2( self.UnitName )
@@ -591,8 +591,8 @@ end
 
 --- Returns true if the unit is within a @{Zone}.
 -- @param #UNIT self
--- @param Zone#ZONE_BASE Zone The zone to test.
--- @return #boolean Returns true if the unit is within the @{Zone#ZONE_BASE}
+-- @param Core.Zone#ZONE_BASE Zone The zone to test.
+-- @return #boolean Returns true if the unit is within the @{Core.Zone#ZONE_BASE}
 function UNIT:IsInZone( Zone )
   self:F2( { self.UnitName, Zone } )
 
@@ -608,8 +608,8 @@ end
 
 --- Returns true if the unit is not within a @{Zone}.
 -- @param #UNIT self
--- @param Zone#ZONE_BASE Zone The zone to test.
--- @return #boolean Returns true if the unit is not within the @{Zone#ZONE_BASE}
+-- @param Core.Zone#ZONE_BASE Zone The zone to test.
+-- @return #boolean Returns true if the unit is not within the @{Core.Zone#ZONE_BASE}
 function UNIT:IsNotInZone( Zone )
   self:F2( { self.UnitName, Zone } )