Fixed DETECTION_DISPATCHER (I think)..

-- Need to test this in a group.
-- Revised messages adding @ signs, which represent to who the message
is targetted.

Moose Development/Moose/Tasking/CommandCenter.lua

@@ -64,7 +64,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
   self.CommandCenterName = CommandCenterName or CommandCenterPositionable:GetName()
   self.CommandCenterCoalition = CommandCenterPositionable:GetCoalition()
 	
-	self.Missions = setmetatable( {}, { __mode = "v" } )
+	self.Missions = {}
 
   self:EventOnBirth(
     --- @param #COMMANDCENTER self
@@ -142,7 +142,7 @@ end
 -- @return #string
 function COMMANDCENTER:GetName()
 
-  return self.HQName
+  return self.CommandCenterName
 end
 
 --- Gets the POSITIONABLE of the HQ command center.
@@ -188,7 +188,7 @@ end
 function COMMANDCENTER:SetMenu()
   self:F()
 
-  self.CommandCenterMenu = self.CommandCenterMenu or MENU_COALITION:New( self.CommandCenterCoalition, "HQ" )
+  self.CommandCenterMenu = self.CommandCenterMenu or MENU_COALITION:New( self.CommandCenterCoalition, "Command Center (" .. self:GetName() .. ")" )
 
   for MissionID, Mission in pairs( self:GetMissions() ) do
     local Mission = Mission -- Tasking.Mission#MISSION
@@ -223,9 +223,14 @@ end
 
 --- Send a CC message to a GROUP.
 -- @param #COMMANDCENTER self
-function COMMANDCENTER:MessageToGroup( Message, TaskGroup )
+-- @param #string Message
+-- @param Wrapper.Group#GROUP TaskGroup
+-- @param #sring Name (optional) The name of the Group used as a prefix for the message to the Group. If not provided, there will be nothing shown.
+function COMMANDCENTER:MessageToGroup( Message, TaskGroup, Name )
 
-    self:GetPositionable():MessageToGroup( Message , 20, TaskGroup )
+  local Prefix = Name and "@ Group (" .. Name .. "): " or ''
+  Message = Prefix .. Message 
+  self:GetPositionable():MessageToGroup( Message , 20, TaskGroup, self:GetName() )
 
 end
 

Moose Development/Moose/Tasking/DetectionManager.lua

@@ -382,7 +382,6 @@ do -- DETECTION_DISPATCHER
     if Task then
       if Task:IsStatePlanned() and DetectedArea.Changed == true then
         self:E( "Removing Tasking: " .. Task:GetTaskName() )
-        Mission:RemoveTaskMenu( Task )
         Task = Mission:RemoveTask( Task )
       end
     end
@@ -486,7 +485,7 @@ do -- DETECTION_DISPATCHER
     end
     
     -- TODO set menus using the HQ coordinator
-    Mission:SetMenu()
+    Mission:GetCommandCenter():SetMenu()
     
     if #AreaMsg > 0 then
       for TaskGroupID, TaskGroup in pairs( self.SetGroup:GetSet() ) do

Moose Development/Moose/Tasking/Task.lua

@@ -439,7 +439,8 @@ function TASK:MessageToGroups( Message )
   local CC = Mission:GetCommandCenter()
   
   for TaskGroupName, TaskGroup in pairs( self.SetGroup:GetSet() ) do
-    CC:MessageToGroup( Message, TaskGroup )
+    local TaskGroup = TaskGroup -- Wrapper.Group#GROUP
+    CC:MessageToGroup( Message, TaskGroup, TaskGroup:GetName() )
   end
 end
 
@@ -872,7 +873,7 @@ function TASK:onenterAssigned( Event, From, To )
 
   self:E("Task Assigned")
   
-  self:MessageToGroups( "Task " .. self:GetName() .. " has been assigned!" )
+  self:MessageToGroups( "Task " .. self:GetName() .. " has been assigned to your group." )
   self:GetMission():__Start()
 end
 

Moose Development/Moose/Tasking/Task_A2G.lua

@@ -45,19 +45,19 @@ do -- TASK_A2G
     self.TargetZone = TargetZone
     self.FACUnit = FACUnit
     
-    local Fsm = self:GetUnitProcess()
+    local A2GUnitProcess = self:GetUnitProcess()
 
-    Fsm:AddProcess   ( "Planned",    "Accept",   ACT_ASSIGN_ACCEPT:New( "Attack the Area" ), { Assigned = "Route", Rejected = "Eject" } )
-    Fsm:AddProcess   ( "Assigned",   "Route",    ACT_ROUTE_ZONE:New( self.TargetZone ), { Arrived = "Update" } )
-    Fsm:AddTransition( "Rejected",   "Eject",    "Planned" )
-    Fsm:AddTransition( "Arrived",    "Update",   "Updated" ) 
-    Fsm:AddProcess   ( "Updated",    "Account",  ACT_ACCOUNT_DEADS:New( self.TargetSetUnit, "Attack" ), { Accounted = "Success" } )
-    Fsm:AddProcess   ( "Updated",    "Smoke",    ACT_ASSIST_SMOKE_TARGETS_ZONE:New( self.TargetSetUnit, self.TargetZone ) )
+    A2GUnitProcess:AddProcess   ( "Planned",    "Accept",   ACT_ASSIGN_ACCEPT:New( "Attack the Area" ), { Assigned = "Route", Rejected = "Eject" } )
+    A2GUnitProcess:AddProcess   ( "Assigned",   "Route",    ACT_ROUTE_ZONE:New( self.TargetZone ), { Arrived = "Update" } )
+    A2GUnitProcess:AddTransition( "Rejected",   "Eject",    "Planned" )
+    A2GUnitProcess:AddTransition( "Arrived",    "Update",   "Updated" ) 
+    A2GUnitProcess:AddProcess   ( "Updated",    "Account",  ACT_ACCOUNT_DEADS:New( self.TargetSetUnit, "Attack" ), { Accounted = "Success" } )
+    A2GUnitProcess:AddProcess   ( "Updated",    "Smoke",    ACT_ASSIST_SMOKE_TARGETS_ZONE:New( self.TargetSetUnit, self.TargetZone ) )
     --Fsm:AddProcess ( "Updated",    "JTAC",     PROCESS_JTAC:New( self, TaskUnit, self.TargetSetUnit, self.FACUnit  ) )
-    Fsm:AddTransition( "Accounted",  "Success",  "Success" )
-    Fsm:AddTransition( "Failed",     "Fail",     "Failed" )
+    A2GUnitProcess:AddTransition( "Accounted",  "Success",  "Success" )
+    A2GUnitProcess:AddTransition( "Failed",     "Fail",     "Failed" )
     
-    function Fsm:onenterUpdated( TaskUnit )
+    function A2GUnitProcess:onenterUpdated( TaskUnit )
       self:E( { self } )
       self:Account()
       self:Smoke()