New File Structure Updates

Moose Development/Moose/Core/Zone.lua

@@ -1,4 +1,4 @@
---- This module contains the ZONE classes, inherited from @{Zone#ZONE_BASE}.
+--- This module contains the ZONE classes, inherited from @{Core.Zone#ZONE_BASE}.
 -- There are essentially two core functions that zones accomodate:
 -- 
 --   * Test if an object is within the zone boundaries.
@@ -7,7 +7,7 @@
 -- The object classes are using the zone classes to test the zone boundaries, which can take various forms:
 -- 
 --   * Test if completely within the zone.
---   * Test if partly within the zone (for @{Group#GROUP} objects).
+--   * Test if partly within the zone (for @{Wrapper.Group#GROUP} objects).
 --   * Test if not in the zone.
 --   * Distance to the nearest intersecting point of the zone.
 --   * Distance to the center of the zone.
@@ -15,16 +15,16 @@
 -- 
 -- Each of these ZONE classes have a zone name, and specific parameters defining the zone type:
 --   
---   * @{Zone#ZONE_BASE}: The ZONE_BASE class defining the base for all other zone classes.
---   * @{Zone#ZONE_RADIUS}: The ZONE_RADIUS class defined by a zone name, a location and a radius.
---   * @{Zone#ZONE}: The ZONE class, defined by the zone name as defined within the Mission Editor.
---   * @{Zone#ZONE_UNIT}: The ZONE_UNIT class defines by a zone around a @{Unit#UNIT} with a radius.
---   * @{Zone#ZONE_GROUP}: The ZONE_GROUP class defines by a zone around a @{Group#GROUP} with a radius.
---   * @{Zone#ZONE_POLYGON}: The ZONE_POLYGON class defines by a sequence of @{Group#GROUP} waypoints within the Mission Editor, forming a polygon.
+--   * @{Core.Zone#ZONE_BASE}: The ZONE_BASE class defining the base for all other zone classes.
+--   * @{Core.Zone#ZONE_RADIUS}: The ZONE_RADIUS class defined by a zone name, a location and a radius.
+--   * @{Core.Zone#ZONE}: The ZONE class, defined by the zone name as defined within the Mission Editor.
+--   * @{Core.Zone#ZONE_UNIT}: The ZONE_UNIT class defines by a zone around a @{Wrapper.Unit#UNIT} with a radius.
+--   * @{Core.Zone#ZONE_GROUP}: The ZONE_GROUP class defines by a zone around a @{Wrapper.Group#GROUP} with a radius.
+--   * @{Core.Zone#ZONE_POLYGON}: The ZONE_POLYGON class defines by a sequence of @{Wrapper.Group#GROUP} waypoints within the Mission Editor, forming a polygon.
 -- 
 -- ===
 -- 
--- 1) @{Zone#ZONE_BASE} class, extends @{Base#BASE}
+-- 1) @{Core.Zone#ZONE_BASE} class, extends @{Core.Base#BASE}
 -- ================================================
 -- This class is an abstract BASE class for derived classes, and is not meant to be instantiated.
 -- 
@@ -32,10 +32,10 @@
 -- 
 --   * @{#ZONE_BASE.GetName}(): Returns the name of the zone.
 -- 
--- ### 1.2) Each zone implements two polymorphic functions defined in @{Zone#ZONE_BASE}:
+-- ### 1.2) Each zone implements two polymorphic functions defined in @{Core.Zone#ZONE_BASE}:
 -- 
---   * @{#ZONE_BASE.IsPointVec2InZone}(): Returns if a @{Point#POINT_VEC2} is within the zone.
---   * @{#ZONE_BASE.IsPointVec3InZone}(): Returns if a @{Point#POINT_VEC3} is within the zone.
+--   * @{#ZONE_BASE.IsPointVec2InZone}(): Returns if a @{Core.Point#POINT_VEC2} is within the zone.
+--   * @{#ZONE_BASE.IsPointVec3InZone}(): Returns if a @{Core.Point#POINT_VEC3} is within the zone.
 --   
 -- ### 1.3) A zone has a probability factor that can be set to randomize a selection between zones:
 -- 
@@ -45,8 +45,8 @@
 -- 
 -- ### 1.4) A zone manages Vectors:
 -- 
---   * @{#ZONE_BASE.GetVec2}(): Returns the @{DCSTypes#Vec2} coordinate of the zone.
---   * @{#ZONE_BASE.GetRandomVec2}(): Define a random @{DCSTypes#Vec2} within the zone.
+--   * @{#ZONE_BASE.GetVec2}(): Returns the @{Dcs.DCSTypes#Vec2} coordinate of the zone.
+--   * @{#ZONE_BASE.GetRandomVec2}(): Define a random @{Dcs.DCSTypes#Vec2} within the zone.
 -- 
 -- ### 1.5) A zone has a bounding square:
 -- 
@@ -59,12 +59,12 @@
 -- 
 -- ===
 -- 
--- 2) @{Zone#ZONE_RADIUS} class, extends @{Zone#ZONE_BASE}
+-- 2) @{Core.Zone#ZONE_RADIUS} class, extends @{Core.Zone#ZONE_BASE}
 -- =======================================================
 -- The ZONE_RADIUS class defined by a zone name, a location and a radius.
--- This class implements the inherited functions from Zone#ZONE_BASE taking into account the own zone format and properties.
+-- This class implements the inherited functions from Core.Zone#ZONE_BASE taking into account the own zone format and properties.
 -- 
--- ### 2.1) @{Zone#ZONE_RADIUS} constructor:
+-- ### 2.1) @{Core.Zone#ZONE_RADIUS} constructor:
 -- 
 --   * @{#ZONE_BASE.New}(): Constructor.
 --   
@@ -75,45 +75,45 @@
 -- 
 -- ### 2.3) Manage the location of the zone:
 -- 
---   * @{#ZONE_BASE.SetVec2}(): Sets the @{DCSTypes#Vec2} of the zone.
---   * @{#ZONE_BASE.GetVec2}(): Returns the @{DCSTypes#Vec2} of the zone.
---   * @{#ZONE_BASE.GetVec3}(): Returns the @{DCSTypes#Vec3} of the zone, taking an additional height parameter.
+--   * @{#ZONE_BASE.SetVec2}(): Sets the @{Dcs.DCSTypes#Vec2} of the zone.
+--   * @{#ZONE_BASE.GetVec2}(): Returns the @{Dcs.DCSTypes#Vec2} of the zone.
+--   * @{#ZONE_BASE.GetVec3}(): Returns the @{Dcs.DCSTypes#Vec3} of the zone, taking an additional height parameter.
 -- 
 -- ===
 -- 
--- 3) @{Zone#ZONE} class, extends @{Zone#ZONE_RADIUS}
+-- 3) @{Core.Zone#ZONE} class, extends @{Core.Zone#ZONE_RADIUS}
 -- ==========================================
 -- The ZONE class, defined by the zone name as defined within the Mission Editor.
--- This class implements the inherited functions from {Zone#ZONE_RADIUS} taking into account the own zone format and properties.
+-- This class implements the inherited functions from {Core.Zone#ZONE_RADIUS} taking into account the own zone format and properties.
 -- 
 -- ===
 -- 
--- 4) @{Zone#ZONE_UNIT} class, extends @{Zone#ZONE_RADIUS}
+-- 4) @{Core.Zone#ZONE_UNIT} class, extends @{Core.Zone#ZONE_RADIUS}
 -- =======================================================
--- The ZONE_UNIT class defined by a zone around a @{Unit#UNIT} with a radius.
--- This class implements the inherited functions from @{Zone#ZONE_RADIUS} taking into account the own zone format and properties.
+-- The ZONE_UNIT class defined by a zone around a @{Wrapper.Unit#UNIT} with a radius.
+-- This class implements the inherited functions from @{Core.Zone#ZONE_RADIUS} taking into account the own zone format and properties.
 -- 
 -- ===
 -- 
--- 5) @{Zone#ZONE_GROUP} class, extends @{Zone#ZONE_RADIUS}
+-- 5) @{Core.Zone#ZONE_GROUP} class, extends @{Core.Zone#ZONE_RADIUS}
 -- =======================================================
--- The ZONE_GROUP class defines by a zone around a @{Group#GROUP} with a radius. The current leader of the group defines the center of the zone.
--- This class implements the inherited functions from @{Zone#ZONE_RADIUS} taking into account the own zone format and properties.
+-- The ZONE_GROUP class defines by a zone around a @{Wrapper.Group#GROUP} with a radius. The current leader of the group defines the center of the zone.
+-- This class implements the inherited functions from @{Core.Zone#ZONE_RADIUS} taking into account the own zone format and properties.
 -- 
 -- ===
 -- 
--- 6) @{Zone#ZONE_POLYGON_BASE} class, extends @{Zone#ZONE_BASE}
+-- 6) @{Core.Zone#ZONE_POLYGON_BASE} class, extends @{Core.Zone#ZONE_BASE}
 -- ========================================================
--- The ZONE_POLYGON_BASE class defined by a sequence of @{Group#GROUP} waypoints within the Mission Editor, forming a polygon.
--- This class implements the inherited functions from @{Zone#ZONE_RADIUS} taking into account the own zone format and properties.
+-- The ZONE_POLYGON_BASE class defined by a sequence of @{Wrapper.Group#GROUP} waypoints within the Mission Editor, forming a polygon.
+-- This class implements the inherited functions from @{Core.Zone#ZONE_RADIUS} taking into account the own zone format and properties.
 -- This class is an abstract BASE class for derived classes, and is not meant to be instantiated.
 -- 
 -- ===
 -- 
--- 7) @{Zone#ZONE_POLYGON} class, extends @{Zone#ZONE_POLYGON_BASE}
+-- 7) @{Core.Zone#ZONE_POLYGON} class, extends @{Core.Zone#ZONE_POLYGON_BASE}
 -- ================================================================
--- The ZONE_POLYGON class defined by a sequence of @{Group#GROUP} waypoints within the Mission Editor, forming a polygon.
--- This class implements the inherited functions from @{Zone#ZONE_RADIUS} taking into account the own zone format and properties.
+-- The ZONE_POLYGON class defined by a sequence of @{Wrapper.Group#GROUP} waypoints within the Mission Editor, forming a polygon.
+-- This class implements the inherited functions from @{Core.Zone#ZONE_RADIUS} taking into account the own zone format and properties.
 -- 
 -- ====
 -- 
@@ -145,7 +145,7 @@
 -- @type ZONE_BASE
 -- @field #string ZoneName Name of the zone.
 -- @field #number ZoneProbability A value between 0 and 1. 0 = 0% and 1 = 100% probability.
--- @extends Base#BASE
+-- @extends Core.Base#BASE
 ZONE_BASE = {
   ClassName = "ZONE_BASE",
   ZoneName = "",
@@ -155,10 +155,10 @@ ZONE_BASE = {
 
 --- The ZONE_BASE.BoundingSquare
 -- @type ZONE_BASE.BoundingSquare
--- @field DCSTypes#Distance x1 The lower x coordinate (left down)
--- @field DCSTypes#Distance y1 The lower y coordinate (left down)
--- @field DCSTypes#Distance x2 The higher x coordinate (right up)
--- @field DCSTypes#Distance y2 The higher y coordinate (right up)
+-- @field Dcs.DCSTypes#Distance x1 The lower x coordinate (left down)
+-- @field Dcs.DCSTypes#Distance y1 The lower y coordinate (left down)
+-- @field Dcs.DCSTypes#Distance x2 The higher x coordinate (right up)
+-- @field Dcs.DCSTypes#Distance y2 The higher y coordinate (right up)
 
 
 --- ZONE_BASE constructor
@@ -184,7 +184,7 @@ function ZONE_BASE:GetName()
 end
 --- Returns if a location is within the zone.
 -- @param #ZONE_BASE self
--- @param DCSTypes#Vec2 Vec2 The location to test.
+-- @param Dcs.DCSTypes#Vec2 Vec2 The location to test.
 -- @return #boolean true if the location is within the zone.
 function ZONE_BASE:IsPointVec2InZone( Vec2 )
   self:F2( Vec2 )
@@ -194,7 +194,7 @@ end
 
 --- Returns if a point is within the zone.
 -- @param #ZONE_BASE self
--- @param DCSTypes#Vec3 Vec3 The point to test.
+-- @param Dcs.DCSTypes#Vec3 Vec3 The point to test.
 -- @return #boolean true if the point is within the zone.
 function ZONE_BASE:IsPointVec3InZone( Vec3 )
   self:F2( Vec3 )
@@ -204,7 +204,7 @@ function ZONE_BASE:IsPointVec3InZone( Vec3 )
   return InZone
 end
 
---- Returns the @{DCSTypes#Vec2} coordinate of the zone.
+--- Returns the @{Dcs.DCSTypes#Vec2} coordinate of the zone.
 -- @param #ZONE_BASE self
 -- @return #nil.
 function ZONE_BASE:GetVec2()
@@ -212,9 +212,9 @@ function ZONE_BASE:GetVec2()
 
   return nil 
 end
---- Define a random @{DCSTypes#Vec2} within the zone.
+--- Define a random @{Dcs.DCSTypes#Vec2} within the zone.
 -- @param #ZONE_BASE self
--- @return DCSTypes#Vec2 The Vec2 coordinates.
+-- @return Dcs.DCSTypes#Vec2 The Vec2 coordinates.
 function ZONE_BASE:GetRandomVec2()
   return nil
 end
@@ -273,9 +273,9 @@ end
 
 --- The ZONE_RADIUS class, defined by a zone name, a location and a radius.
 -- @type ZONE_RADIUS
--- @field DCSTypes#Vec2 Vec2 The current location of the zone.
--- @field DCSTypes#Distance Radius The radius of the zone.
--- @extends Zone#ZONE_BASE
+-- @field Dcs.DCSTypes#Vec2 Vec2 The current location of the zone.
+-- @field Dcs.DCSTypes#Distance Radius The radius of the zone.
+-- @extends Core.Zone#ZONE_BASE
 ZONE_RADIUS = {
 	ClassName="ZONE_RADIUS",
 	}
@@ -283,8 +283,8 @@ ZONE_RADIUS = {
 --- Constructor of @{#ZONE_RADIUS}, taking the zone name, the zone location and a radius.
 -- @param #ZONE_RADIUS self
 -- @param #string ZoneName Name of the zone.
--- @param DCSTypes#Vec2 Vec2 The location of the zone.
--- @param DCSTypes#Distance Radius The radius of the zone.
+-- @param Dcs.DCSTypes#Vec2 Vec2 The location of the zone.
+-- @param Dcs.DCSTypes#Distance Radius The radius of the zone.
 -- @return #ZONE_RADIUS self
 function ZONE_RADIUS:New( ZoneName, Vec2, Radius )
 	local self = BASE:Inherit( self, ZONE_BASE:New( ZoneName ) )
@@ -325,9 +325,9 @@ end
 
 --- Flares the zone boundaries in a color.
 -- @param #ZONE_RADIUS self
--- @param Utils#FLARECOLOR FlareColor The flare color.
+-- @param Utilities.Utils#FLARECOLOR FlareColor The flare color.
 -- @param #number Points (optional) The amount of points in the circle.
--- @param DCSTypes#Azimuth Azimuth (optional) Azimuth The azimuth of the flare.
+-- @param Dcs.DCSTypes#Azimuth Azimuth (optional) Azimuth The azimuth of the flare.
 -- @return #ZONE_RADIUS self
 function ZONE_RADIUS:FlareZone( FlareColor, Points, Azimuth )
   self:F2( { FlareColor, Azimuth } )
@@ -352,7 +352,7 @@ end
 
 --- Returns the radius of the zone.
 -- @param #ZONE_RADIUS self
--- @return DCSTypes#Distance The radius of the zone.
+-- @return Dcs.DCSTypes#Distance The radius of the zone.
 function ZONE_RADIUS:GetRadius()
   self:F2( self.ZoneName )
 
@@ -363,8 +363,8 @@ end
 
 --- Sets the radius of the zone.
 -- @param #ZONE_RADIUS self
--- @param DCSTypes#Distance Radius The radius of the zone.
--- @return DCSTypes#Distance The radius of the zone.
+-- @param Dcs.DCSTypes#Distance Radius The radius of the zone.
+-- @return Dcs.DCSTypes#Distance The radius of the zone.
 function ZONE_RADIUS:SetRadius( Radius )
   self:F2( self.ZoneName )
 
@@ -374,9 +374,9 @@ function ZONE_RADIUS:SetRadius( Radius )
   return self.Radius
 end
 
---- Returns the @{DCSTypes#Vec2} of the zone.
+--- Returns the @{Dcs.DCSTypes#Vec2} of the zone.
 -- @param #ZONE_RADIUS self
--- @return DCSTypes#Vec2 The location of the zone.
+-- @return Dcs.DCSTypes#Vec2 The location of the zone.
 function ZONE_RADIUS:GetVec2()
 	self:F2( self.ZoneName )
 
@@ -385,10 +385,10 @@ function ZONE_RADIUS:GetVec2()
 	return self.Vec2	
 end
 
---- Sets the @{DCSTypes#Vec2} of the zone.
+--- Sets the @{Dcs.DCSTypes#Vec2} of the zone.
 -- @param #ZONE_RADIUS self
--- @param DCSTypes#Vec2 Vec2 The new location of the zone.
--- @return DCSTypes#Vec2 The new location of the zone.
+-- @param Dcs.DCSTypes#Vec2 Vec2 The new location of the zone.
+-- @return Dcs.DCSTypes#Vec2 The new location of the zone.
 function ZONE_RADIUS:SetVec2( Vec2 )
   self:F2( self.ZoneName )
   
@@ -399,10 +399,10 @@ function ZONE_RADIUS:SetVec2( Vec2 )
   return self.Vec2 
 end
 
---- Returns the @{DCSTypes#Vec3} of the ZONE_RADIUS.
+--- Returns the @{Dcs.DCSTypes#Vec3} of the ZONE_RADIUS.
 -- @param #ZONE_RADIUS self
--- @param DCSTypes#Distance Height The height to add to the land height where the center of the zone is located.
--- @return DCSTypes#Vec3 The point of the zone.
+-- @param Dcs.DCSTypes#Distance Height The height to add to the land height where the center of the zone is located.
+-- @return Dcs.DCSTypes#Vec3 The point of the zone.
 function ZONE_RADIUS:GetVec3( Height )
   self:F2( { self.ZoneName, Height } )
 
@@ -419,7 +419,7 @@ end
 
 --- Returns if a location is within the zone.
 -- @param #ZONE_RADIUS self
--- @param DCSTypes#Vec2 Vec2 The location to test.
+-- @param Dcs.DCSTypes#Vec2 Vec2 The location to test.
 -- @return #boolean true if the location is within the zone.
 function ZONE_RADIUS:IsPointVec2InZone( Vec2 )
   self:F2( Vec2 )
@@ -437,7 +437,7 @@ end
 
 --- Returns if a point is within the zone.
 -- @param #ZONE_RADIUS self
--- @param DCSTypes#Vec3 Vec3 The point to test.
+-- @param Dcs.DCSTypes#Vec3 Vec3 The point to test.
 -- @return #boolean true if the point is within the zone.
 function ZONE_RADIUS:IsPointVec3InZone( Vec3 )
   self:F2( Vec3 )
@@ -449,7 +449,7 @@ end
 
 --- Returns a random location within the zone.
 -- @param #ZONE_RADIUS self
--- @return DCSTypes#Vec2 The random location within the zone.
+-- @return Dcs.DCSTypes#Vec2 The random location within the zone.
 function ZONE_RADIUS:GetRandomVec2()
 	self:F( self.ZoneName )
 
@@ -469,7 +469,7 @@ end
 
 --- The ZONE class, defined by the zone name as defined within the Mission Editor. The location and the radius are automatically collected from the mission settings.
 -- @type ZONE
--- @extends Zone#ZONE_RADIUS
+-- @extends Core.Zone#ZONE_RADIUS
 ZONE = {
   ClassName="ZONE",
   }
@@ -497,10 +497,10 @@ function ZONE:New( ZoneName )
 end
 
 
---- The ZONE_UNIT class defined by a zone around a @{Unit#UNIT} with a radius.
+--- The ZONE_UNIT class defined by a zone around a @{Wrapper.Unit#UNIT} with a radius.
 -- @type ZONE_UNIT
--- @field Unit#UNIT ZoneUNIT
--- @extends Zone#ZONE_RADIUS
+-- @field Wrapper.Unit#UNIT ZoneUNIT
+-- @extends Core.Zone#ZONE_RADIUS
 ZONE_UNIT = {
   ClassName="ZONE_UNIT",
   }
@@ -508,8 +508,8 @@ ZONE_UNIT = {
 --- Constructor to create a ZONE_UNIT instance, taking the zone name, a zone unit and a radius.
 -- @param #ZONE_UNIT self
 -- @param #string ZoneName Name of the zone.
--- @param Unit#UNIT ZoneUNIT The unit as the center of the zone.
--- @param DCSTypes#Distance Radius The radius of the zone.
+-- @param Wrapper.Unit#UNIT ZoneUNIT The unit as the center of the zone.
+-- @param Dcs.DCSTypes#Distance Radius The radius of the zone.
 -- @return #ZONE_UNIT self
 function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius )
   local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius ) )
@@ -522,9 +522,9 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius )
 end
 
 
---- Returns the current location of the @{Unit#UNIT}.
+--- Returns the current location of the @{Wrapper.Unit#UNIT}.
 -- @param #ZONE_UNIT self
--- @return DCSTypes#Vec2 The location of the zone based on the @{Unit#UNIT}location.
+-- @return Dcs.DCSTypes#Vec2 The location of the zone based on the @{Wrapper.Unit#UNIT}location.
 function ZONE_UNIT:GetVec2()
   self:F( self.ZoneName )
   
@@ -543,7 +543,7 @@ end
 
 --- Returns a random location within the zone.
 -- @param #ZONE_UNIT self
--- @return DCSTypes#Vec2 The random location within the zone.
+-- @return Dcs.DCSTypes#Vec2 The random location within the zone.
 function ZONE_UNIT:GetRandomVec2()
   self:F( self.ZoneName )
 
@@ -563,10 +563,10 @@ function ZONE_UNIT:GetRandomVec2()
   return RandomVec2
 end
 
---- Returns the @{DCSTypes#Vec3} of the ZONE_UNIT.
+--- Returns the @{Dcs.DCSTypes#Vec3} of the ZONE_UNIT.
 -- @param #ZONE_UNIT self
--- @param DCSTypes#Distance Height The height to add to the land height where the center of the zone is located.
--- @return DCSTypes#Vec3 The point of the zone.
+-- @param Dcs.DCSTypes#Distance Height The height to add to the land height where the center of the zone is located.
+-- @return Dcs.DCSTypes#Vec3 The point of the zone.
 function ZONE_UNIT:GetVec3( Height )
   self:F2( self.ZoneName )
   
@@ -583,17 +583,17 @@ end
 
 --- The ZONE_GROUP class defined by a zone around a @{Group}, taking the average center point of all the units within the Group, with a radius.
 -- @type ZONE_GROUP
--- @field Group#GROUP ZoneGROUP
--- @extends Zone#ZONE_RADIUS
+-- @field Wrapper.Group#GROUP ZoneGROUP
+-- @extends Core.Zone#ZONE_RADIUS
 ZONE_GROUP = {
   ClassName="ZONE_GROUP",
   }
   
---- Constructor to create a ZONE_GROUP instance, taking the zone name, a zone @{Group#GROUP} and a radius.
+--- Constructor to create a ZONE_GROUP instance, taking the zone name, a zone @{Wrapper.Group#GROUP} and a radius.
 -- @param #ZONE_GROUP self
 -- @param #string ZoneName Name of the zone.
--- @param Group#GROUP ZoneGROUP The @{Group} as the center of the zone.
--- @param DCSTypes#Distance Radius The radius of the zone.
+-- @param Wrapper.Group#GROUP ZoneGROUP The @{Group} as the center of the zone.
+-- @param Dcs.DCSTypes#Distance Radius The radius of the zone.
 -- @return #ZONE_GROUP self
 function ZONE_GROUP:New( ZoneName, ZoneGROUP, Radius )
   local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneGROUP:GetVec2(), Radius ) )
@@ -607,7 +607,7 @@ end
 
 --- Returns the current location of the @{Group}.
 -- @param #ZONE_GROUP self
--- @return DCSTypes#Vec2 The location of the zone based on the @{Group} location.
+-- @return Dcs.DCSTypes#Vec2 The location of the zone based on the @{Group} location.
 function ZONE_GROUP:GetVec2()
   self:F( self.ZoneName )
   
@@ -620,7 +620,7 @@ end
 
 --- Returns a random location within the zone of the @{Group}.
 -- @param #ZONE_GROUP self
--- @return DCSTypes#Vec2 The random location of the zone based on the @{Group} location.
+-- @return Dcs.DCSTypes#Vec2 The random location of the zone based on the @{Group} location.
 function ZONE_GROUP:GetRandomVec2()
   self:F( self.ZoneName )
 
@@ -640,23 +640,23 @@ end
 
 -- Polygons
 
---- The ZONE_POLYGON_BASE class defined by an array of @{DCSTypes#Vec2}, forming a polygon.
+--- The ZONE_POLYGON_BASE class defined by an array of @{Dcs.DCSTypes#Vec2}, forming a polygon.
 -- @type ZONE_POLYGON_BASE
--- @field #ZONE_POLYGON_BASE.ListVec2 Polygon The polygon defined by an array of @{DCSTypes#Vec2}.
--- @extends Zone#ZONE_BASE
+-- @field #ZONE_POLYGON_BASE.ListVec2 Polygon The polygon defined by an array of @{Dcs.DCSTypes#Vec2}.
+-- @extends Core.Zone#ZONE_BASE
 ZONE_POLYGON_BASE = {
   ClassName="ZONE_POLYGON_BASE",
   }
 
 --- A points array.
 -- @type ZONE_POLYGON_BASE.ListVec2
--- @list <DCSTypes#Vec2>
+-- @list <Dcs.DCSTypes#Vec2>
 
---- Constructor to create a ZONE_POLYGON_BASE instance, taking the zone name and an array of @{DCSTypes#Vec2}, forming a polygon.
--- The @{Group#GROUP} waypoints define the polygon corners. The first and the last point are automatically connected.
+--- Constructor to create a ZONE_POLYGON_BASE instance, taking the zone name and an array of @{Dcs.DCSTypes#Vec2}, forming a polygon.
+-- The @{Wrapper.Group#GROUP} waypoints define the polygon corners. The first and the last point are automatically connected.
 -- @param #ZONE_POLYGON_BASE self
 -- @param #string ZoneName Name of the zone.
--- @param #ZONE_POLYGON_BASE.ListVec2 PointsArray An array of @{DCSTypes#Vec2}, forming a polygon..
+-- @param #ZONE_POLYGON_BASE.ListVec2 PointsArray An array of @{Dcs.DCSTypes#Vec2}, forming a polygon..
 -- @return #ZONE_POLYGON_BASE self
 function ZONE_POLYGON_BASE:New( ZoneName, PointsArray )
   local self = BASE:Inherit( self, ZONE_BASE:New( ZoneName ) )
@@ -725,7 +725,7 @@ end
 --- Returns if a location is within the zone.
 -- Source learned and taken from: https://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
 -- @param #ZONE_POLYGON_BASE self
--- @param DCSTypes#Vec2 Vec2 The location to test.
+-- @param Dcs.DCSTypes#Vec2 Vec2 The location to test.
 -- @return #boolean true if the location is within the zone.
 function ZONE_POLYGON_BASE:IsPointVec2InZone( Vec2 )
   self:F2( Vec2 )
@@ -753,9 +753,9 @@ function ZONE_POLYGON_BASE:IsPointVec2InZone( Vec2 )
   return InPolygon
 end
 
---- Define a random @{DCSTypes#Vec2} within the zone.
+--- Define a random @{Dcs.DCSTypes#Vec2} within the zone.
 -- @param #ZONE_POLYGON_BASE self
--- @return DCSTypes#Vec2 The Vec2 coordinate.
+-- @return Dcs.DCSTypes#Vec2 The Vec2 coordinate.
 function ZONE_POLYGON_BASE:GetRandomVec2()
   self:F2()
 
@@ -805,18 +805,18 @@ end
 
 
 
---- The ZONE_POLYGON class defined by a sequence of @{Group#GROUP} waypoints within the Mission Editor, forming a polygon.
+--- The ZONE_POLYGON class defined by a sequence of @{Wrapper.Group#GROUP} waypoints within the Mission Editor, forming a polygon.
 -- @type ZONE_POLYGON
--- @extends Zone#ZONE_POLYGON_BASE
+-- @extends Core.Zone#ZONE_POLYGON_BASE
 ZONE_POLYGON = {
   ClassName="ZONE_POLYGON",
   }
 
---- Constructor to create a ZONE_POLYGON instance, taking the zone name and the name of the @{Group#GROUP} defined within the Mission Editor.
--- The @{Group#GROUP} waypoints define the polygon corners. The first and the last point are automatically connected by ZONE_POLYGON.
+--- Constructor to create a ZONE_POLYGON instance, taking the zone name and the name of the @{Wrapper.Group#GROUP} defined within the Mission Editor.
+-- The @{Wrapper.Group#GROUP} waypoints define the polygon corners. The first and the last point are automatically connected by ZONE_POLYGON.
 -- @param #ZONE_POLYGON self
 -- @param #string ZoneName Name of the zone.
--- @param Group#GROUP ZoneGroup The GROUP waypoints as defined within the Mission Editor define the polygon shape.
+-- @param Wrapper.Group#GROUP ZoneGroup The GROUP waypoints as defined within the Mission Editor define the polygon shape.
 -- @return #ZONE_POLYGON self
 function ZONE_POLYGON:New( ZoneName, ZoneGroup )