Restructuring

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 } )

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")

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",

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
 

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 )
     

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
 

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,

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 = {},

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 = {},