From 5486a12c77fbc1969ba8f1c8183cface30aa2ae1 Mon Sep 17 00:00:00 2001
From: FlightControl <sven.van.de.velde@telenet.be>
Date: Tue, 6 Dec 2016 10:41:41 +0100
Subject: [PATCH] Restructuring

---
 Moose Development/Moose/Core/Set.lua               | 14 +++++++-------
 Moose Development/Moose/Fsm/Fsm.lua                | 13 ++++++-------
 Moose Development/Moose/Fsm/FsmTAccount.lua        |  6 +++---
 Moose Development/Moose/Fsm/FsmTAssign.lua         | 14 +++++++-------
 Moose Development/Moose/Fsm/FsmTRoute.lua          | 12 ++++++------
 Moose Development/Moose/Fsm/FsmTSmoke.lua          | 12 ++++++------
 Moose Development/Moose/Fsm/Patrol.lua             |  2 +-
 Moose Development/Moose/Fsm/Process.lua            |  2 +-
 Moose Development/Moose/Fsm/Process_JTAC.lua       |  2 +-
 Moose Development/Moose/Fsm/Process_Pickup.lua     |  2 +-
 Moose Development/Moose/Functional/AIBalancer.lua  |  2 +-
 Moose Development/Moose/Functional/Spawn.lua       |  2 +-
 Moose Development/Moose/Tasking/Mission.lua        |  4 ++--
 Moose Development/Moose/Tasking/Task.lua           | 13 +++++++------
 Moose Development/Moose/Tasking/Task_A2G.lua       |  2 +-
 .../Moose/Tasking/Task_AIBalancer.lua              |  2 +-
 Moose Development/Moose/Tasking/Task_Pickup.lua    |  2 +-
 Moose Development/Moose/Tasking/Task_SEAD.lua      |  2 +-
 18 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index 5226f88f1..ebe26cc70 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -944,7 +944,7 @@ function SET_GROUP:ForEachGroupCompletelyInZone( ZoneObject, IteratorFunction, .
   self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.Set,
-    --- @param Zone#ZONE_BASE ZoneObject
+    --- @param Core.Zone#ZONE_BASE ZoneObject
     -- @param Wrapper.Group#GROUP GroupObject
     function( ZoneObject, GroupObject )
       if GroupObject:IsCompletelyInZone( ZoneObject ) then
@@ -966,7 +966,7 @@ function SET_GROUP:ForEachGroupPartlyInZone( ZoneObject, IteratorFunction, ... )
   self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.Set,
-    --- @param Zone#ZONE_BASE ZoneObject
+    --- @param Core.Zone#ZONE_BASE ZoneObject
     -- @param Wrapper.Group#GROUP GroupObject
     function( ZoneObject, GroupObject )
       if GroupObject:IsPartlyInZone( ZoneObject ) then
@@ -988,7 +988,7 @@ function SET_GROUP:ForEachGroupNotInZone( ZoneObject, IteratorFunction, ... )
   self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.Set,
-    --- @param Zone#ZONE_BASE ZoneObject
+    --- @param Core.Zone#ZONE_BASE ZoneObject
     -- @param Wrapper.Group#GROUP GroupObject
     function( ZoneObject, GroupObject )
       if GroupObject:IsNotInZone( ZoneObject ) then
@@ -1370,7 +1370,7 @@ function SET_UNIT:ForEachUnitCompletelyInZone( ZoneObject, IteratorFunction, ...
   self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.Set,
-    --- @param Zone#ZONE_BASE ZoneObject
+    --- @param Core.Zone#ZONE_BASE ZoneObject
     -- @param Wrapper.Unit#UNIT UnitObject
     function( ZoneObject, UnitObject )
       if UnitObject:IsCompletelyInZone( ZoneObject ) then
@@ -1392,7 +1392,7 @@ function SET_UNIT:ForEachUnitNotInZone( ZoneObject, IteratorFunction, ... )
   self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.Set,
-    --- @param Zone#ZONE_BASE ZoneObject
+    --- @param Core.Zone#ZONE_BASE ZoneObject
     -- @param Wrapper.Unit#UNIT UnitObject
     function( ZoneObject, UnitObject )
       if UnitObject:IsNotInZone( ZoneObject ) then
@@ -1919,7 +1919,7 @@ function SET_CLIENT:ForEachClientInZone( ZoneObject, IteratorFunction, ... )
   self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.Set,
-    --- @param Zone#ZONE_BASE ZoneObject
+    --- @param Core.Zone#ZONE_BASE ZoneObject
     -- @param Wrapper.Client#CLIENT ClientObject
     function( ZoneObject, ClientObject )
       if ClientObject:IsInZone( ZoneObject ) then
@@ -1941,7 +1941,7 @@ function SET_CLIENT:ForEachClientNotInZone( ZoneObject, IteratorFunction, ... )
   self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.Set,
-    --- @param Zone#ZONE_BASE ZoneObject
+    --- @param Core.Zone#ZONE_BASE ZoneObject
     -- @param Wrapper.Client#CLIENT ClientObject
     function( ZoneObject, ClientObject )
       if ClientObject:IsNotInZone( ZoneObject ) then
diff --git a/Moose Development/Moose/Fsm/Fsm.lua b/Moose Development/Moose/Fsm/Fsm.lua
index a278e5131..e10964d03 100644
--- a/Moose Development/Moose/Fsm/Fsm.lua	
+++ b/Moose Development/Moose/Fsm/Fsm.lua	
@@ -79,7 +79,7 @@ end
 
 
 --- Set the default @{Process} template with key ProcessName providing the ProcessClass and the process object when it is assigned to a @{Controllable} by the task.
--- @return Process#PROCESS
+-- @return Fsm.Fsm#FSM_PROCESS
 function FSM:AddProcess( From, Event, Process, ReturnEvents )
 
   local sub = {}
@@ -349,7 +349,7 @@ end
 --- STATEMACHINE_CONTROLLABLE class
 -- @type STATEMACHINE_CONTROLLABLE
 -- @field Wrapper.Controllable#CONTROLLABLE Controllable
--- @extends Core.StateMachine#FSM
+-- @extends Fsm.Fsm#FSM
 STATEMACHINE_CONTROLLABLE = {
   ClassName = "STATEMACHINE_CONTROLLABLE",
 }
@@ -408,9 +408,8 @@ end
 
 --- FSM_PROCESS class
 -- @type FSM_PROCESS
--- @field Process#PROCESS Process
 -- @field Tasking.Task#TASK_BASE Task
--- @extends Core.StateMachine#STATEMACHINE_CONTROLLABLE
+-- @extends Fsm.Fsm#STATEMACHINE_CONTROLLABLE
 FSM_PROCESS = {
   ClassName = "FSM_PROCESS",
 }
@@ -554,7 +553,7 @@ end
 --- FSM_TASK class
 -- @type FSM_TASK
 -- @field Tasking.Task#TASK_BASE Task
--- @extends Core.StateMachine#FSM
+-- @extends Fsm.Fsm#FSM
 FSM_TASK = {
   ClassName = "FSM_TASK",
 }
@@ -567,7 +566,7 @@ FSM_TASK = {
 -- @return #FSM_TASK
 function FSM_TASK:New( FSMT )
 
-  local self = BASE:Inherit( self, STATEMACHINE_CONTROLLABLE:New( FSMT ) ) -- Core.StateMachine#FSM_TASK
+  local self = BASE:Inherit( self, STATEMACHINE_CONTROLLABLE:New( FSMT ) ) -- Fsm.Fsm#FSM_TASK
 
   self["onstatechange"] = self.OnStateChange
 
@@ -675,7 +674,7 @@ function FSM_TEMPLATE:GetTransitions()
 end
 
 --- Set the default @{Process} template with key ProcessName providing the ProcessClass and the process object when it is assigned to a @{Controllable} by the task.
--- @return Process#PROCESS
+-- @return Fsm.Fsm#FSM_TEMPLATE The FSM Process Template.
 function FSM_TEMPLATE:AddProcess( From, Event, ProcessTemplate, ReturnEvents )
 
   self:E( { ProcessTemplate = ProcessTemplate } )
diff --git a/Moose Development/Moose/Fsm/FsmTAccount.lua b/Moose Development/Moose/Fsm/FsmTAccount.lua
index ec9685c20..39b40c13d 100644
--- a/Moose Development/Moose/Fsm/FsmTAccount.lua	
+++ b/Moose Development/Moose/Fsm/FsmTAccount.lua	
@@ -2,7 +2,7 @@
 -- 
 -- ===
 -- 
--- # @{#FSMT_ACCOUNT} FSM class, extends @{Process#PROCESS}
+-- # @{#FSMT_ACCOUNT} FSM class, extends @{Fsm.Fsm#FSM_TEMPLATE}
 -- 
 -- ## FSMT_ACCOUNT state machine:
 -- 
@@ -77,7 +77,7 @@ do -- FSMT_ACCOUNT
   --- FSMT_ACCOUNT class
   -- @type FSMT_ACCOUNT
   -- @field Set#SET_UNIT TargetSetUnit
-  -- @extends Core.StateMachine#FSM_TEMPLATE
+  -- @extends Fsm.Fsm#FSM_TEMPLATE
   FSMT_ACCOUNT = { 
     ClassName = "FSMT_ACCOUNT",
     TargetSetUnit = nil,
@@ -89,7 +89,7 @@ do -- FSMT_ACCOUNT
   function FSMT_ACCOUNT:New()
 
     -- Inherits from BASE
-    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_ACCOUNT" ) ) -- Core.StateMachine#FSM_TEMPLATE
+    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_ACCOUNT" ) ) -- Fsm.Fsm#FSM_TEMPLATE
   
     self:AddTransition( "Assigned", "Start", "Waiting")
     self:AddTransition( "*", "Wait", "Waiting")
diff --git a/Moose Development/Moose/Fsm/FsmTAssign.lua b/Moose Development/Moose/Fsm/FsmTAssign.lua
index 8b2943000..056d1a278 100644
--- a/Moose Development/Moose/Fsm/FsmTAssign.lua	
+++ b/Moose Development/Moose/Fsm/FsmTAssign.lua	
@@ -2,7 +2,7 @@
 -- 
 -- ===
 -- 
--- # @{#FSMT_ASSIGN} FSM class, extends @{Process#PROCESS}
+-- # @{#FSMT_ASSIGN} FSM template class, extends @{Fsm.Fsm#FSM_TEMPLATE}
 -- 
 -- ## FSMT_ASSIGN state machine:
 -- 
@@ -86,8 +86,8 @@ do -- FSMT_ASSIGN
   -- @type FSMT_ASSIGN
   -- @field Tasking.Task#TASK_BASE Task
   -- @field Wrapper.Unit#UNIT ProcessUnit
-  -- @field Zone#ZONE_BASE TargetZone
-  -- @extends Core.StateMachine#FSM_TEMPLATE
+  -- @field Core.Zone#ZONE_BASE TargetZone
+  -- @extends Fsm.Fsm#FSM_TEMPLATE
   FSMT_ASSIGN = { 
     ClassName = "FSMT_ASSIGN",
   }
@@ -99,7 +99,7 @@ do -- FSMT_ASSIGN
   function FSMT_ASSIGN:New()
 
     -- Inherits from BASE
-    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_ASSIGN" ) ) -- Core.StateMachine#FSM_TEMPLATE
+    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_ASSIGN" ) ) -- Fsm.Fsm#FSM_TEMPLATE
 
     self:AddTransition( "UnAssigned", "Start", "Waiting" )
     self:AddTransition( "Waiting",  "Assign", "Assigned" )
@@ -125,8 +125,8 @@ do -- FSMT_ASSIGN_ACCEPT
   -- @type FSMT_ASSIGN_ACCEPT
   -- @field Tasking.Task#TASK_BASE Task
   -- @field Wrapper.Unit#UNIT ProcessUnit
-  -- @field Zone#ZONE_BASE TargetZone
-  -- @extends Fsm.Process#PROCESS
+  -- @field Core.Zone#ZONE_BASE TargetZone
+  -- @extends #FSMT_ASSIGN
   FSMT_ASSIGN_ACCEPT = { 
     ClassName = "FSMT_ASSIGN_ACCEPT",
   }
@@ -185,7 +185,7 @@ do -- FSMT_ASSIGN_MENU_ACCEPT
   -- @type FSMT_ASSIGN_MENU_ACCEPT
   -- @field Tasking.Task#TASK_BASE Task
   -- @field Wrapper.Unit#UNIT ProcessUnit
-  -- @field Zone#ZONE_BASE TargetZone
+  -- @field Core.Zone#ZONE_BASE TargetZone
   -- @extends #FSMT_ASSIGN
   FSMT_ASSIGN_MENU_ACCEPT = { 
     ClassName = "FSMT_ASSIGN_MENU_ACCEPT",
diff --git a/Moose Development/Moose/Fsm/FsmTRoute.lua b/Moose Development/Moose/Fsm/FsmTRoute.lua
index ac9ab319e..e0e5b19bf 100644
--- a/Moose Development/Moose/Fsm/FsmTRoute.lua	
+++ b/Moose Development/Moose/Fsm/FsmTRoute.lua	
@@ -2,7 +2,7 @@
 -- 
 -- ===
 -- 
--- # @{#FSMT_ROUTE} FSM class, extends @{Process#PROCESS}
+-- # @{#FSMT_ROUTE} FSM class, extends @{Fsm.Fsm#FSM_TEMPLATE}
 -- 
 -- ## FSMT_ROUTE state machine:
 -- 
@@ -81,8 +81,8 @@ do -- FSMT_ROUTE
   -- @type FSMT_ROUTE
   -- @field Tasking.Task#TASK TASK
   -- @field Wrapper.Unit#UNIT ProcessUnit
-  -- @field Zone#ZONE_BASE TargetZone
-  -- @extends Core.StateMachine#FSM_TEMPLATE
+  -- @field Core.Zone#ZONE_BASE TargetZone
+  -- @extends Fsm.Fsm#FSM_TEMPLATE
   FSMT_ROUTE = { 
     ClassName = "FSMT_ROUTE",
   }
@@ -94,7 +94,7 @@ do -- FSMT_ROUTE
   function FSMT_ROUTE:New()
 
     -- Inherits from BASE
-    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_ROUTE" ) ) -- Core.StateMachine#FSM_TEMPLATE
+    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_ROUTE" ) ) -- Fsm.Fsm#FSM_TEMPLATE
  
     self:AddTransition( "None", "Start", "Routing" )
     self:AddTransition( "*", "Report", "Reporting" )
@@ -182,7 +182,7 @@ do -- FSMT_ROUTE_ZONE
   -- @type FSMT_ROUTE_ZONE
   -- @field Tasking.Task#TASK TASK
   -- @field Wrapper.Unit#UNIT ProcessUnit
-  -- @field Zone#ZONE_BASE TargetZone
+  -- @field Core.Zone#ZONE_BASE TargetZone
   -- @extends #FSMT_ROUTE
   FSMT_ROUTE_ZONE = { 
     ClassName = "FSMT_ROUTE_ZONE",
@@ -191,7 +191,7 @@ do -- FSMT_ROUTE_ZONE
 
   --- Creates a new routing state machine. The task will route a controllable to a ZONE until the controllable is within that ZONE.
   -- @param #FSMT_ROUTE_ZONE self
-  -- @param Zone#ZONE_BASE TargetZone
+  -- @param Core.Zone#ZONE_BASE TargetZone
   function FSMT_ROUTE_ZONE:New( TargetZone )
     local self = BASE:Inherit( self, FSMT_ROUTE:New() ) -- #FSMT_ROUTE_ZONE
 
diff --git a/Moose Development/Moose/Fsm/FsmTSmoke.lua b/Moose Development/Moose/Fsm/FsmTSmoke.lua
index f89e22c1f..35671e0dd 100644
--- a/Moose Development/Moose/Fsm/FsmTSmoke.lua	
+++ b/Moose Development/Moose/Fsm/FsmTSmoke.lua	
@@ -2,7 +2,7 @@
 -- 
 -- ===
 -- 
--- # @{#FSMT_SMOKE} FSM class, extends @{Process#PROCESS}
+-- # @{#FSMT_SMOKE} FSM class, extends @{Fsm.Fsm#FSM_TEMPLATE}
 -- 
 -- ## FSMT_SMOKE state machine:
 -- 
@@ -70,7 +70,7 @@ do -- FSMT_SMOKE
 
   --- FSMT_SMOKE class
   -- @type FSMT_SMOKE
-  -- @extends Core.StateMachine#FSM_TEMPLATE
+  -- @extends Fsm.Fsm#FSM_TEMPLATE
   FSMT_SMOKE = { 
     ClassName = "FSMT_SMOKE",
   }
@@ -81,7 +81,7 @@ do -- FSMT_SMOKE
   function FSMT_SMOKE:New()
 
     -- Inherits from BASE
-    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_SMOKE" ) ) -- Core.StateMachine#FSM_TEMPLATE
+    local self = BASE:Inherit( self, FSM_TEMPLATE:New( "FSMT_SMOKE" ) ) -- Fsm.Fsm#FSM_TEMPLATE
 
     self:AddTransition( "None", "Start", "AwaitSmoke" )
     self:AddTransition( "AwaitSmoke", "Next", "Smoking" )
@@ -133,7 +133,7 @@ do -- FSMT_SMOKE_TARGETS_ZONE
   --- FSMT_SMOKE_TARGETS_ZONE class
   -- @type FSMT_SMOKE_TARGETS_ZONE
   -- @field Set#SET_UNIT TargetSetUnit
-  -- @field Zone#ZONE_BASE TargetZone
+  -- @field Core.Zone#ZONE_BASE TargetZone
   -- @extends #FSMT_SMOKE
   FSMT_SMOKE_TARGETS_ZONE = { 
     ClassName = "FSMT_SMOKE_TARGETS_ZONE",
@@ -149,7 +149,7 @@ do -- FSMT_SMOKE_TARGETS_ZONE
   --- Creates a new target smoking state machine. The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator.
   -- @param #FSMT_SMOKE_TARGETS_ZONE self
   -- @param Set#SET_UNIT TargetSetUnit
-  -- @param Zone#ZONE_BASE TargetZone
+  -- @param Core.Zone#ZONE_BASE TargetZone
   function FSMT_SMOKE_TARGETS_ZONE:New( TargetSetUnit, TargetZone )
     local self = BASE:Inherit( self, FSMT_SMOKE:New() ) -- #FSMT_SMOKE
 
@@ -161,7 +161,7 @@ do -- FSMT_SMOKE_TARGETS_ZONE
   --- Creates a new target smoking state machine. The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator.
   -- @param #FSMT_SMOKE_TARGETS_ZONE self
   -- @param Set#SET_UNIT TargetSetUnit
-  -- @param Zone#ZONE_BASE TargetZone
+  -- @param Core.Zone#ZONE_BASE TargetZone
   -- @return #FSMT_SMOKE_TARGETS_ZONE self
   function FSMT_SMOKE_TARGETS_ZONE:Init( TargetSetUnit, TargetZone )
     
diff --git a/Moose Development/Moose/Fsm/Patrol.lua b/Moose Development/Moose/Fsm/Patrol.lua
index c30dd8d4b..47cf0440c 100644
--- a/Moose Development/Moose/Fsm/Patrol.lua	
+++ b/Moose Development/Moose/Fsm/Patrol.lua	
@@ -236,7 +236,7 @@ end
 function _NewPatrolRoute( AIControllable )
 
   AIControllable:T( "NewPatrolRoute" )
-  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolZone#PATROLZONE
+  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolCore.Zone#PATROLZONE
   PatrolZone:__Route( 1 )
 end
 
diff --git a/Moose Development/Moose/Fsm/Process.lua b/Moose Development/Moose/Fsm/Process.lua
index 1c0826164..09d18e0c2 100644
--- a/Moose Development/Moose/Fsm/Process.lua	
+++ b/Moose Development/Moose/Fsm/Process.lua	
@@ -6,7 +6,7 @@
 -- @field Wrapper.Group#GROUP ProcessGroup
 -- @field Core.Menu#MENU_GROUP MissionMenu
 -- @field #string ProcessName
--- @extends Core.StateMachine#STATEMACHINE_CONTROLLABLE
+-- @extends Fsm.Fsm#STATEMACHINE_CONTROLLABLE
 PROCESS = {
   ClassName = "PROCESS",
   NextEvent = nil,
diff --git a/Moose Development/Moose/Fsm/Process_JTAC.lua b/Moose Development/Moose/Fsm/Process_JTAC.lua
index 13cd61bb6..0bf6afbcc 100644
--- a/Moose Development/Moose/Fsm/Process_JTAC.lua	
+++ b/Moose Development/Moose/Fsm/Process_JTAC.lua	
@@ -4,7 +4,7 @@
 -- @type PROCESS_JTAC
 -- @field Wrapper.Unit#UNIT ProcessUnit
 -- @field Core.Set#SET_UNIT TargetSetUnit
--- @extends Process#PROCESS
+-- @extends Fsm.Fsm#FSM_TEMPLATE
 PROCESS_JTAC = { 
   ClassName = "PROCESS_JTAC",
   Fsm = {},
diff --git a/Moose Development/Moose/Fsm/Process_Pickup.lua b/Moose Development/Moose/Fsm/Process_Pickup.lua
index 2ab7d4198..5adfd74c2 100644
--- a/Moose Development/Moose/Fsm/Process_Pickup.lua	
+++ b/Moose Development/Moose/Fsm/Process_Pickup.lua	
@@ -4,7 +4,7 @@
 -- @type PROCESS_PICKUP
 -- @field Wrapper.Unit#UNIT ProcessUnit
 -- @field Core.Set#SET_UNIT TargetSetUnit
--- @extends Process#PROCESS
+-- @extends Fsm.Fsm#FSM_TEMPLATE
 PROCESS_PICKUP = { 
   ClassName = "PROCESS_PICKUP",
   Fsm = {},
diff --git a/Moose Development/Moose/Functional/AIBalancer.lua b/Moose Development/Moose/Functional/AIBalancer.lua
index 764fc5e89..8e54bd38f 100644
--- a/Moose Development/Moose/Functional/AIBalancer.lua	
+++ b/Moose Development/Moose/Functional/AIBalancer.lua	
@@ -222,7 +222,7 @@ function AIBALANCER:onenterMonitoring( SetGroup )
                 end
               end,
               
-              --- @param Zone#ZONE_RADIUS RangeZone
+              --- @param Core.Zone#ZONE_RADIUS RangeZone
               -- @param Wrapper.Group#GROUP AIGroup
               function( RangeZone, AIGroup, PlayerInRange )
                 if PlayerInRange.Value == false then
diff --git a/Moose Development/Moose/Functional/Spawn.lua b/Moose Development/Moose/Functional/Spawn.lua
index 47deb7775..f7ebbc07d 100644
--- a/Moose Development/Moose/Functional/Spawn.lua	
+++ b/Moose Development/Moose/Functional/Spawn.lua	
@@ -1290,7 +1290,7 @@ function SPAWN:_RandomizeZones( SpawnIndex )
   self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
 
   if self.SpawnRandomizeZones then
-    local SpawnZone = nil -- Zone#ZONE_BASE
+    local SpawnZone = nil -- Core.Zone#ZONE_BASE
     while not SpawnZone do
       self:T( { SpawnZoneTableCount = #self.SpawnZoneTable, self.SpawnZoneTable } )
       local ZoneID = math.random( #self.SpawnZoneTable )
diff --git a/Moose Development/Moose/Tasking/Mission.lua b/Moose Development/Moose/Tasking/Mission.lua
index dcd6e8703..2e3cb2bd2 100644
--- a/Moose Development/Moose/Tasking/Mission.lua	
+++ b/Moose Development/Moose/Tasking/Mission.lua	
@@ -7,7 +7,7 @@
 -- @field #MISSION.Clients _Clients
 -- @field Core.Menu#MENU_COALITION MissionMenu
 -- @field #string MissionBriefing
--- @extends Core.StateMachine#FSM
+-- @extends Fsm.Fsm#FSM
 MISSION = {
 	ClassName = "MISSION",
 	Name = "",
@@ -40,7 +40,7 @@ MISSION = {
 -- @return #MISSION self
 function MISSION:New( CommandCenter, MissionName, MissionPriority, MissionBriefing, MissionCoalition )
 
-  local self = BASE:Inherit( self, FSM:New() ) -- Core.StateMachine#FSM
+  local self = BASE:Inherit( self, FSM:New() ) -- Fsm.Fsm#FSM
 
   self:SetStartState( "Idle" )
   
diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua
index d10b93a68..028668952 100644
--- a/Moose Development/Moose/Tasking/Task.lua	
+++ b/Moose Development/Moose/Tasking/Task.lua	
@@ -54,8 +54,8 @@
 -- @field Core.Scheduler#SCHEDULER TaskScheduler
 -- @field Tasking.Mission#MISSION Mission
 -- @field Core.Set#SET_GROUP SetGroup The Set of Groups assigned to the Task
--- @field Core.StateMachine#FSM_TEMPLATE FsmTemplate
--- @extends Core.StateMachine#FSM_TASK
+-- @field Fsm.Fsm#FSM_TEMPLATE FsmTemplate
+-- @extends Fsm.Fsm#FSM_TASK
 TASK_BASE = {
   ClassName = "TASK_BASE",
   TaskScheduler = nil,
@@ -77,7 +77,7 @@ TASK_BASE = {
 -- @return #TASK_BASE self
 function TASK_BASE:New( Mission, SetGroupAssign, TaskName, TaskType )
 
-  local self = BASE:Inherit( self, FSM_TASK:New() ) -- Core.StateMachine#FSM_TASK
+  local self = BASE:Inherit( self, FSM_TASK:New() ) -- Fsm.Fsm#FSM_TASK
 
   self:SetStartState( "Planned" )
   self:AddTransition( "Planned", "Assign", "Assigned" )
@@ -185,7 +185,7 @@ function TASK_BASE:AssignToUnit( TaskUnit )
   self:F( TaskUnit:GetName() )
   
   -- Assign a new FsmUnit to TaskUnit.
-  local FsmUnit = self:SetStateMachine( TaskUnit, FSM_PROCESS:New( self:GetFsmTemplate(), TaskUnit, self ) ) -- Core.StateMachine#FSM_PROCESS
+  local FsmUnit = self:SetStateMachine( TaskUnit, FSM_PROCESS:New( self:GetFsmTemplate(), TaskUnit, self ) ) -- Fsm.Fsm#FSM_PROCESS
   self:E({"Address FsmUnit", tostring( FsmUnit ) } )
   
   -- Set the events
@@ -392,7 +392,7 @@ end
 --- Get the default or currently assigned @{Process} template with key ProcessName.
 -- @param #TASK_BASE self
 -- @param #string ProcessName
--- @return Process#PROCESS
+-- @return Fsm.Fsm#FSM_TEMPLATE
 function TASK_BASE:GetProcessTemplate( ProcessName )
 
   local ProcessTemplate = self.ProcessClasses[ProcessName]
@@ -402,6 +402,7 @@ end
 
 
 
+-- TODO: Obscolete?
 --- Fail processes from @{Task} with key @{Unit}
 -- @param #TASK_BASE self
 -- @param #string TaskUnitName
@@ -409,7 +410,7 @@ end
 function TASK_BASE:FailProcesses( TaskUnitName )
 
   for ProcessID, ProcessData in pairs( self.Processes[TaskUnitName] ) do
-    local Process = ProcessData -- Process#PROCESS
+    local Process = ProcessData 
     Process.Fsm:Fail()
   end
 end
diff --git a/Moose Development/Moose/Tasking/Task_A2G.lua b/Moose Development/Moose/Tasking/Task_A2G.lua
index 3d47ba3d5..169324351 100644
--- a/Moose Development/Moose/Tasking/Task_A2G.lua	
+++ b/Moose Development/Moose/Tasking/Task_A2G.lua	
@@ -35,7 +35,7 @@ do -- TASK_A2G
   -- @param #string TaskName The name of the Task.
   -- @param #string TaskType BAI or CAS
   -- @param Set#SET_UNIT UnitSetTargets
-  -- @param Zone#ZONE_BASE TargetZone
+  -- @param Core.Zone#ZONE_BASE TargetZone
   -- @return #TASK_A2G self
   function TASK_A2G:New( Mission, SetGroup, TaskName, TaskType, TargetSetUnit, TargetZone, FACUnit )
     local self = BASE:Inherit( self, TASK_BASE:New( Mission, SetGroup, TaskName, TaskType ) )
diff --git a/Moose Development/Moose/Tasking/Task_AIBalancer.lua b/Moose Development/Moose/Tasking/Task_AIBalancer.lua
index 0c61ca734..f78d0504c 100644
--- a/Moose Development/Moose/Tasking/Task_AIBalancer.lua	
+++ b/Moose Development/Moose/Tasking/Task_AIBalancer.lua	
@@ -212,7 +212,7 @@ function AIBALANCER:_ClientAliveMonitorScheduler()
                 end
               end,
               
-              --- @param Zone#ZONE_RADIUS RangeZone
+              --- @param Core.Zone#ZONE_RADIUS RangeZone
               -- @param Wrapper.Group#GROUP AIGroup
               function( RangeZone, AIGroup, PlayerInRange )
                 local AIGroupTemplate = AIGroup:GetTemplate()
diff --git a/Moose Development/Moose/Tasking/Task_Pickup.lua b/Moose Development/Moose/Tasking/Task_Pickup.lua
index c05bfd445..c93cdfd18 100644
--- a/Moose Development/Moose/Tasking/Task_Pickup.lua	
+++ b/Moose Development/Moose/Tasking/Task_Pickup.lua	
@@ -35,7 +35,7 @@ do -- TASK_PICKUP
   -- @param #string TaskName The name of the Task.
   -- @param #string TaskType BAI or CAS
   -- @param Set#SET_UNIT UnitSetTargets
-  -- @param Zone#ZONE_BASE TargetZone
+  -- @param Core.Zone#ZONE_BASE TargetZone
   -- @return #TASK_PICKUP self
   function TASK_PICKUP:New( Mission, AssignedSetGroup, TaskName, TaskType )
     local self = BASE:Inherit( self, TASK_BASE:New( Mission, AssignedSetGroup, TaskName, TaskType, "PICKUP" ) )
diff --git a/Moose Development/Moose/Tasking/Task_SEAD.lua b/Moose Development/Moose/Tasking/Task_SEAD.lua
index ed5aaa1ae..3164905de 100644
--- a/Moose Development/Moose/Tasking/Task_SEAD.lua	
+++ b/Moose Development/Moose/Tasking/Task_SEAD.lua	
@@ -36,7 +36,7 @@ do -- TASK_SEAD
   -- @param Set#SET_GROUP SetGroup The set of groups for which the Task can be assigned.
   -- @param #string TaskName The name of the Task.
   -- @param Set#SET_UNIT UnitSetTargets
-  -- @param Zone#ZONE_BASE TargetZone
+  -- @param Core.Zone#ZONE_BASE TargetZone
   -- @return #TASK_SEAD self
   function TASK_SEAD:New( Mission, SetGroup, TaskName, TargetSetUnit, TargetZone )
     local self = BASE:Inherit( self, TASK_BASE:New( Mission, SetGroup, TaskName, "SEAD" ) ) -- Tasking.Task_SEAD#TASK_SEAD