Various Fixes

-- Documentation fixes with links not working.
-- MENU_CLIENT_COMMAND had a small glitch, fixed that one too.
-- Implemented new Event Dispatcher.
--

Moose Development/Moose/Wrapper/Airbase.lua

@@ -2,7 +2,7 @@
 -- 
 -- ===
 -- 
--- 1) @{Wrapper.Airbase#AIRBASE} class, extends @{Wrapper.Positionable#POSITIONABLE}
+-- 1) @{Airbase#AIRBASE} class, extends @{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 @{Dcs.DCSWrapper.Airbase#Airbase.getName}()
+-- the first letter of the method is also capitalized. So, by example, the DCS Airbase method @{DCSWrapper.Airbase#Airbase.getName}()
 -- is implemented in the AIRBASE class as @{#AIRBASE.GetName}().
 -- 
 -- More functions will be added

Moose Development/Moose/Wrapper/Client.lua

@@ -1,10 +1,10 @@
 --- This module contains the CLIENT class.
 -- 
--- 1) @{Wrapper.Client#CLIENT} class, extends @{Wrapper.Unit#UNIT}
+-- 1) @{Client#CLIENT} class, extends @{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 @{Wrapper.Client#CLIENT} class is a wrapper class to handle the DCS Unit objects that have the skillset defined as __Client__ or __Player__:
+-- The @{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.
@@ -35,7 +35,6 @@
 -- IMPORTANT: ONE SHOULD NEVER SANATIZE these CLIENT OBJECT REFERENCES! (make the CLIENT object references nil).
 -- 
 -- @module Client
--- @author FlightControl
 
 --- The CLIENT class
 -- @type CLIENT
@@ -226,7 +225,7 @@ end
 
 --- Checks for a client alive event and calls a function on a continuous basis.
 -- @param #CLIENT self
--- @param #function CallBack Function.
+-- @param #function CallBackFunction Create a function that will be called when a player joins the slot.
 -- @return #CLIENT
 function CLIENT:Alive( CallBackFunction, ... )
   self:F()
@@ -399,8 +398,8 @@ function CLIENT:IsTransport()
 	return self.ClientTransport
 end
 
---- Shows the @{AI.AI_Cargo#CARGO} contained within the CLIENT to the player as a message.
--- The @{AI.AI_Cargo#CARGO} is shown using the @{Core.Message#MESSAGE} distribution system.
+--- Shows the @{AI_Cargo#CARGO} contained within the CLIENT to the player as a message.
+-- The @{AI_Cargo#CARGO} is shown using the @{Message#MESSAGE} distribution system.
 -- @param #CLIENT self
 function CLIENT:ShowCargo()
 	self:F()
@@ -433,7 +432,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 @{Core.Message#MESSAGE} when the CLIENT is in the air.
+-- @param #number MessageInterval is the interval in seconds between the display of the @{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) @{Wrapper.Controllable#CONTROLLABLE} class, extends @{Wrapper.Positionable#POSITIONABLE}
+-- 1) @{Controllable#CONTROLLABLE} class, extends @{Positionable#POSITIONABLE}
 -- ===========================================================
--- The @{Wrapper.Controllable#CONTROLLABLE} class is a wrapper class to handle the DCS Controllable objects:
+-- The @{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 @{Wrapper.Controllable#CONTROLLABLE.PushTask} or @{Wrapper.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 @{Controllable#CONTROLLABLE.PushTask} or @{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 @{Core.Zone#ZONE_RADIUS).
+--   * @{#CONTROLLABLE.TaskLandAtZone}: (AIR) Land the controllable at a @{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.
@@ -344,7 +344,7 @@ end
 
 --- Return a Combo Task taking an array of Tasks.
 -- @param #CONTROLLABLE self
--- @param Dcs.DCSTasking.Task#TaskArray DCSTasks Array of @{Dcs.DCSTasking.Task#Task}
+-- @param Dcs.DCSTasking.Task#TaskArray DCSTasks Array of @{DCSTasking.Task#Task}
 -- @return Dcs.DCSTasking.Task#Task
 function CONTROLLABLE:TaskCombo( DCSTasks )
   self:F2( { DCSTasks } )
@@ -829,7 +829,7 @@ function CONTROLLABLE:TaskLandAtVec2( Point, Duration )
   return DCSTask
 end
 
---- (AIR) Land the controllable at a @{Core.Zone#ZONE_RADIUS).
+--- (AIR) Land the controllable at a @{Zone#ZONE_RADIUS).
 -- @param #CONTROLLABLE self
 -- @param Core.Zone#ZONE Zone The zone where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
@@ -1638,11 +1638,11 @@ function CONTROLLABLE:TaskRouteToZone( Zone, Randomize, Speed, Formation )
   return nil
 end
 
---- (AIR) Return the Controllable to an @{Wrapper.Airbase#AIRBASE}
+--- (AIR) Return the Controllable to an @{Airbase#AIRBASE}
 -- A speed can be given in km/h.
 -- A given formation can be given.
 -- @param #CONTROLLABLE self
--- @param Wrapper.Airbase#AIRBASE ReturnAirbase The @{Wrapper.Airbase#AIRBASE} to return to.
+-- @param Wrapper.Airbase#AIRBASE ReturnAirbase The @{Airbase#AIRBASE} to return to.
 -- @param #number Speed (optional) The speed.
 -- @return #string The route
 function CONTROLLABLE:RouteReturnToAirbase( ReturnAirbase, Speed )
@@ -1762,7 +1762,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 @{Core.Database#DATABASE} class.
+--- Return the route of a controllable by using the @{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.
@@ -2187,7 +2187,7 @@ function CONTROLLABLE:OptionROTVertical()
 end
 
 --- Retrieve the controllable mission and allow to place function hooks within the mission waypoint plan.
--- Use the method @{Wrapper.Controllable#CONTROLLABLE:WayPointFunction} to define the hook functions for specific waypoints.
+-- Use the method @{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

Moose Development/Moose/Wrapper/Group.lua

@@ -1,8 +1,8 @@
 --- This module contains the GROUP class.
 -- 
--- 1) @{Wrapper.Group#GROUP} class, extends @{Wrapper.Controllable#CONTROLLABLE}
+-- 1) @{Group#GROUP} class, extends @{Controllable#CONTROLLABLE}
 -- =============================================================
--- The @{Wrapper.Group#GROUP} class is a wrapper class to handle the DCS Group objects:
+-- The @{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.
@@ -36,7 +36,7 @@
 -- 
 -- Group templates contain complete mission descriptions. Sometimes you want to copy a complete mission from a group and assign it to another:
 -- 
---   * @{Wrapper.Controllable#CONTROLLABLE.TaskMission}: (AIR + GROUND) Return a mission task from a mission template.
+--   * @{Controllable#CONTROLLABLE.TaskMission}: (AIR + GROUND) Return a mission task from a mission template.
 --
 -- ## 1.3) GROUP Command methods
 --
@@ -55,7 +55,7 @@
 --   * @{#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 @{Core.Zone#ZONE_BASE}. So, these methods are polymorphic to the zones tested on.
+-- The zone can be of any @{Zone} class derived from @{Zone#ZONE_BASE}. So, these methods are polymorphic to the zones tested on.
 -- 
 -- ## 1.6) GROUP AI methods
 -- 
@@ -156,7 +156,7 @@ function GROUP:GetDCSObject()
   return nil
 end
 
---- Returns the @{Dcs.DCSTypes#Position3} position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.
+--- Returns the @{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.  
@@ -297,7 +297,6 @@ function GROUP:GetUnit( UnitNumber )
 
   if DCSGroup then
     local UnitFound = UNIT:Find( DCSGroup:getUnit( UnitNumber ) )
-    self:T3( UnitFound.UnitName )
     self:T2( UnitFound )
     return UnitFound
   end
@@ -450,7 +449,7 @@ do -- Is Zone methods
 --- Returns true if all units of the group are within a @{Zone}.
 -- @param #GROUP self
 -- @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}
+-- @return #boolean Returns true if the Group is completely within the @{Zone#ZONE_BASE}
 function GROUP:IsCompletelyInZone( Zone )
   self:F2( { self.GroupName, Zone } )
   
@@ -469,7 +468,7 @@ end
 --- Returns true if some units of the group are within a @{Zone}.
 -- @param #GROUP self
 -- @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}
+-- @return #boolean Returns true if the Group is completely within the @{Zone#ZONE_BASE}
 function GROUP:IsPartlyInZone( Zone )
   self:F2( { self.GroupName, Zone } )
   
@@ -486,7 +485,7 @@ end
 --- Returns true if none of the group units of the group are within a @{Zone}.
 -- @param #GROUP self
 -- @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}
+-- @return #boolean Returns true if the Group is completely within the @{Zone#ZONE_BASE}
 function GROUP:IsNotInZone( Zone )
   self:F2( { self.GroupName, Zone } )
   
@@ -703,7 +702,7 @@ end
 -- SPAWNING
 
 --- Respawn the @{GROUP} using a (tweaked) template of the Group.
--- The template must be retrieved with the @{Wrapper.Group#GROUP.GetTemplate}() function.
+-- The template must be retrieved with the @{Group#GROUP.GetTemplate}() function.
 -- The template contains all the definitions as declared within the mission file.
 -- To understand templates, do the following: 
 -- 
@@ -805,7 +804,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 @{Core.Database#DATABASE} class.
+--- Return the route of a group by using the @{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 @{Wrapper.Object#OBJECT}
+-- 1) @{#IDENTIFIABLE} class, extends @{Object#OBJECT}
 -- ===============================================================
 -- The @{#IDENTIFIABLE} class is a wrapper class to handle the DCS Identifiable objects:
 --

Moose Development/Moose/Wrapper/Object.lua

@@ -1,8 +1,8 @@
 --- This module contains the OBJECT class.
 -- 
--- 1) @{Wrapper.Object#OBJECT} class, extends @{Core.Base#BASE}
+-- 1) @{Object#OBJECT} class, extends @{Base#BASE}
 -- ===========================================================
--- The @{Wrapper.Object#OBJECT} class is a wrapper class to handle the DCS Object objects:
+-- The @{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:
 --
---  * @{Wrapper.Object#OBJECT.New}(): Create a OBJECT instance.
+--  * @{Object#OBJECT.New}(): Create a OBJECT instance.
 --
 -- 1.2) OBJECT methods:
 -- --------------------------
 -- The following methods can be used to identify an Object object:
 -- 
---    * @{Wrapper.Object#OBJECT.GetID}(): Returns the ID of the Object object.
+--    * @{Object#OBJECT.GetID}(): Returns the ID of the Object object.
 -- 
 -- ===
 -- 

Moose Development/Moose/Wrapper/Positionable.lua

@@ -1,8 +1,8 @@
 --- This module contains the POSITIONABLE class.
 -- 
--- 1) @{Wrapper.Positionable#POSITIONABLE} class, extends @{Wrapper.Identifiable#IDENTIFIABLE}
+-- 1) @{Positionable#POSITIONABLE} class, extends @{Identifiable#IDENTIFIABLE}
 -- ===========================================================
--- The @{Wrapper.Positionable#POSITIONABLE} class is a wrapper class to handle the POSITIONABLE objects:
+-- The @{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:
 --
---  * @{Wrapper.Positionable#POSITIONABLE.New}(): Create a POSITIONABLE instance.
+--  * @{Positionable#POSITIONABLE.New}(): Create a POSITIONABLE instance.
 --
 -- 1.2) POSITIONABLE methods:
 -- --------------------------
 -- The following methods can be used to identify an measurable object:
 -- 
---    * @{Wrapper.Positionable#POSITIONABLE.GetID}(): Returns the ID of the measurable object.
---    * @{Wrapper.Positionable#POSITIONABLE.GetName}(): Returns the name of the measurable object.
+--    * @{Positionable#POSITIONABLE.GetID}(): Returns the ID of the measurable object.
+--    * @{Positionable#POSITIONABLE.GetName}(): Returns the name of the measurable object.
 -- 
 -- ===
 -- 
@@ -49,7 +49,7 @@ function POSITIONABLE:New( PositionableName )
   return self
 end
 
---- Returns the @{Dcs.DCSTypes#Position3} position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.
+--- Returns the @{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.  
@@ -67,7 +67,7 @@ function POSITIONABLE:GetPositionVec3()
   return nil
 end
 
---- Returns the @{Dcs.DCSTypes#Vec2} vector indicating the point in 2D of the POSITIONABLE within the mission.
+--- Returns the @{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.  
@@ -133,7 +133,7 @@ function POSITIONABLE:GetPointVec3()
 end
 
 
---- Returns a random @{Dcs.DCSTypes#Vec3} vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.
+--- Returns a random @{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.  
@@ -157,7 +157,7 @@ function POSITIONABLE:GetRandomVec3( Radius )
   return nil
 end
 
---- Returns the @{Dcs.DCSTypes#Vec3} vector indicating the 3D vector of the POSITIONABLE within the mission.
+--- Returns the @{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.  

Moose Development/Moose/Wrapper/Static.lua

@@ -1,10 +1,10 @@
 --- This module contains the STATIC class.
 -- 
--- 1) @{Wrapper.Static#STATIC} class, extends @{Wrapper.Positionable#POSITIONABLE}
+-- 1) @{Static#STATIC} class, extends @{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 @{Wrapper.Static#STATIC} class is a wrapper class to handle the DCS Static objects:
+-- The @{Static#STATIC} class is a wrapper class to handle the DCS Static objects:
 -- 
 --  * Wraps the DCS Static objects.
 --  * Support all DCS Static APIs.

Moose Development/Moose/Wrapper/Unit.lua

@@ -1,6 +1,6 @@
 --- This module contains the UNIT class.
 -- 
--- 1) @{#UNIT} class, extends @{Wrapper.Controllable#CONTROLLABLE}
+-- 1) @{#UNIT} class, extends @{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 @{Dcs.DCSWrapper.Unit#Unit.getName}()
+-- the first letter of the method is also capitalized. So, by example, the DCS Unit method @{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 @{Core.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 @{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.
@@ -584,7 +584,7 @@ end
 --- Returns true if the unit is within a @{Zone}.
 -- @param #UNIT self
 -- @param Core.Zone#ZONE_BASE Zone The zone to test.
--- @return #boolean Returns true if the unit is within the @{Core.Zone#ZONE_BASE}
+-- @return #boolean Returns true if the unit is within the @{Zone#ZONE_BASE}
 function UNIT:IsInZone( Zone )
   self:F2( { self.UnitName, Zone } )
 
@@ -601,7 +601,7 @@ end
 --- Returns true if the unit is not within a @{Zone}.
 -- @param #UNIT self
 -- @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}
+-- @return #boolean Returns true if the unit is not within the @{Zone#ZONE_BASE}
 function UNIT:IsNotInZone( Zone )
   self:F2( { self.UnitName, Zone } )