Finish this feature.

2025-10-29 16:58:06 +00:00 · 2018-04-13 09:56:00 +02:00
parent 3389c908d7
commit 25ae0c3d15
7 changed files with 228 additions and 52 deletions
--- a/Development/Moose/Tasking/CommandCenter.lua
+++ b/Development/Moose/Tasking/CommandCenter.lua
@@ -91,6 +91,8 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
  self.CommandCenterPositionable = CommandCenterPositionable  
  self.CommandCenterName = CommandCenterName or CommandCenterPositionable:GetName()
  self.CommandCenterCoalition = CommandCenterPositionable:GetCoalition()
+  
+  self.AutoAssignTasks = false
 	
 	self.Missions = {}

@@ -350,13 +352,23 @@ end
 -- @return Core.Menu#MENU_COALITION
 function COMMANDCENTER:GetMenu( TaskGroup )

+  local MenuTime = timer.getTime()
+
  self.CommandCenterMenus = self.CommandCenterMenus or {}
-  if not self.CommandCenterMenus[TaskGroup] then
-    local CommandCenterText = self:GetText()
-    local CommandCenterMenu = MENU_GROUP:New( TaskGroup, CommandCenterText )
-    self.CommandCenterMenus[TaskGroup] = CommandCenterMenu
-    local AssignTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Assign Task", CommandCenterMenu, self.AssignRandomTask, self, TaskGroup )
+  local CommandCenterMenu
+  
+  local CommandCenterText = self:GetText()
+  CommandCenterMenu = MENU_GROUP:New( TaskGroup, CommandCenterText ):SetTime(MenuTime)
+  self.CommandCenterMenus[TaskGroup] = CommandCenterMenu
+
+  if self.AutoAssignTasks == false then
+    local AutoAssignTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Assign Task On", CommandCenterMenu, self.SetAutoAssignTasks, self, true ):SetTime(MenuTime):SetTag("AutoTask")
+    local AssignTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Assign Task", CommandCenterMenu, self.AssignRandomTask, self, TaskGroup ):SetTime(MenuTime):SetTag("AutoTask")
+  else
+    local AutoAssignTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Assign Task Off", CommandCenterMenu, self.SetAutoAssignTasks, self, false ):SetTime(MenuTime):SetTag("AutoTask")
  end
+  CommandCenterMenu:Remove( MenuTime, "AutoTask" )
+    
  return self.CommandCenterMenus[TaskGroup]
 end

@@ -385,6 +397,86 @@ function COMMANDCENTER:AssignRandomTask( TaskGroup )
 end


+--- Automatically assigns tasks to all TaskGroups.
+-- @param #COMMANDCENTER self
+-- @param #boolean AutoAssign true for ON and false or nil for OFF.
+-- @return #COMMANDCENTER
+function COMMANDCENTER:SetAutoAssignTasks( AutoAssign )
+
+  self.AutoAssignTasks = AutoAssign or false
+  
+  local GroupSet = self:AddGroups()
+
+  for GroupID, TaskGroup in pairs( GroupSet:GetSet() ) do
+    local TaskGroup = TaskGroup -- Wrapper.Group#GROUP
+    self:GetMenu( TaskGroup )
+  end
+
+  if self.AutoAssignTasks == true then
+    self:ScheduleRepeat( 10, 30, 0, nil, self.AssignTasks, self )
+  else
+    self:ScheduleStop( self.AssignTasks )
+  end
+
+end
+
+
+--- Automatically assigns tasks to all TaskGroups.
+-- @param #COMMANDCENTER self
+function COMMANDCENTER:AssignTasks()
+
+  local GroupSet = self:AddGroups()
+
+  for GroupID, TaskGroup in pairs( GroupSet:GetSet() ) do
+    local TaskGroup = TaskGroup -- Wrapper.Group#GROUP
+    
+    if self:IsGroupAssigned( TaskGroup ) then
+    else
+      -- Only groups with planes or helicopters will receive automatic tasks.
+      -- TODO Workaround DCS-BUG-3 - https://github.com/FlightControl-Master/MOOSE/issues/696
+      if TaskGroup:IsAir() then
+        self:AssignRandomTask( TaskGroup )
+      end
+    end
+  end
+end
+
+
+--- Get all the Groups active within the command center.
+-- @param #COMMANDCENTER self
+-- @return Core.Set#SET_GROUP
+function COMMANDCENTER:AddGroups()
+
+  local GroupSet = SET_GROUP:New()
+  
+  for MissionID, Mission in pairs( self.Missions ) do
+    local Mission = Mission -- Tasking.Mission#MISSION
+    GroupSet = Mission:AddGroups( GroupSet )
+  end
+  
+  return GroupSet
+end
+
+
+--- Checks of the TaskGroup has a Task.
+-- @param #COMMANDCENTER self
+-- @return #boolean
+function COMMANDCENTER:IsGroupAssigned( TaskGroup )
+
+  local Assigned = false
+  
+  for MissionID, Mission in pairs( self.Missions ) do
+    local Mission = Mission -- Tasking.Mission#MISSION
+    if Mission:IsGroupAssigned( TaskGroup ) then
+      Assigned = true
+      break
+    end
+  end
+  
+  return Assigned
+end
+
+
 --- Checks of the COMMANDCENTER has a GROUP.
 -- @param #COMMANDCENTER self
 -- @param Wrapper.Group#GROUP
--- a/Development/Moose/Tasking/Mission.lua
+++ b/Development/Moose/Tasking/Mission.lua
@@ -377,24 +377,30 @@ function MISSION:GetScoring()
  return self.Scoring
 end

--- Get the groups for which TASKS are given in the mission
+--- Gets the groups for which TASKS are given in the mission
 -- @param #MISSION self
+-- @param Core.Set#SET_GROUP GroupSet
 -- @return Core.Set#SET_GROUP
 function MISSION:GetGroups()
  
-  local SetGroup = SET_GROUP:New()
+  return self:AddGroups()
+  
+end
+
+--- Adds the groups for which TASKS are given in the mission
+-- @param #MISSION self
+-- @param Core.Set#SET_GROUP GroupSet
+-- @return Core.Set#SET_GROUP
+function MISSION:AddGroups( GroupSet )
+  
+  GroupSet = GroupSet or SET_GROUP:New()
  
  for TaskID, Task in pairs( self:GetTasks() ) do
    local Task = Task -- Tasking.Task#TASK
-    local GroupSet = Task:GetGroups()
-    GroupSet:ForEachGroup(
-      function( TaskGroup )
-        SetGroup:Add( TaskGroup, TaskGroup )
-      end
-    )
+    GroupSet = Task:AddGroups( GroupSet )
  end
  
-  return SetGroup
+  return GroupSet
  
 end

--- a/Development/Moose/Tasking/Task.lua
+++ b/Development/Moose/Tasking/Task.lua
@@ -215,6 +215,7 @@ function TASK:New( Mission, SetGroupAssign, TaskName, TaskType, TaskBriefing )
  
  self:AddTransition( "*", "PlayerCrashed", "*" )
  self:AddTransition( "*", "PlayerAborted", "*" )
+  self:AddTransition( "*", "PlayerRejected", "*" )
  self:AddTransition( "*", "PlayerDead", "*" )
  self:AddTransition( { "Failed", "Aborted", "Cancelled" }, "Replan", "Planned" )
  self:AddTransition( "*", "TimeOut", "Cancelled" )
@@ -300,34 +301,61 @@ function TASK:JoinUnit( PlayerUnit, PlayerGroup )
  return PlayerUnitAdded
 end

--- Abort a PlayerUnit from a Task.
-- If the Unit was not part of the Task, false is returned.
-- If the Unit is part of the Task, true is returned.
+--- A group rejecting a planned task.
 -- @param #TASK self
-- @param Wrapper.Unit#UNIT PlayerUnit The CLIENT or UNIT of the Player aborting the Task.
+-- @param Wrapper.Group#GROUP PlayerGroup The group rejecting the task.
 -- @return #TASK
-function TASK:AbortGroup( PlayerGroup )
-  self:F( { PlayerGroup = PlayerGroup } )
+function TASK:RejectGroup( PlayerGroup )
  
  local PlayerGroups = self:GetGroups()

  -- Is the PlayerGroup part of the PlayerGroups?  
  if PlayerGroups:IsIncludeObject( PlayerGroup ) then
  
-    -- Check if the PlayerGroup is already assigned to the Task. If yes, the PlayerGroup is aborted from the Task.
+    -- Check if the PlayerGroup is already assigned or is planned to be assigned to the Task. 
+    -- If yes, the PlayerGroup is aborted from the Task.
    -- If the PlayerUnit was the last unit of the PlayerGroup, the menu needs to be removed from the Group.
-    if self:IsStateAssigned() then
+    if self:IsStatePlanned() then
+
+      local IsGroupAssigned = self:IsGroupAssigned( PlayerGroup )
+      if IsGroupAssigned then
+        local PlayerName = PlayerGroup:GetUnit(1):GetPlayerName()
+        self:GetMission():GetCommandCenter():MessageToGroup( "Task " .. self:GetName() .. " has been rejected! We will select another task.", PlayerGroup )
+        self:UnAssignFromGroup( PlayerGroup )
+
+        self:PlayerRejected( PlayerGroup:GetUnit(1) )
+      end
+      
+    end
+  end
+  
+  return self
+end
+
+
+--- A group aborting the task.
+-- @param #TASK self
+-- @param Wrapper.Group#GROUP PlayerGroup The group aborting the task.
+-- @return #TASK
+function TASK:AbortGroup( PlayerGroup )
+  
+  local PlayerGroups = self:GetGroups()
+
+  -- Is the PlayerGroup part of the PlayerGroups?  
+  if PlayerGroups:IsIncludeObject( PlayerGroup ) then
+  
+    -- Check if the PlayerGroup is already assigned or is planned to be assigned to the Task. 
+    -- If yes, the PlayerGroup is aborted from the Task.
+    -- If the PlayerUnit was the last unit of the PlayerGroup, the menu needs to be removed from the Group.
+    if self:IsStateAssigned() then
+
      local IsGroupAssigned = self:IsGroupAssigned( PlayerGroup )
-      self:F( { IsGroupAssigned = IsGroupAssigned } )
      if IsGroupAssigned then
        local PlayerName = PlayerGroup:GetUnit(1):GetPlayerName()
-        --self:MessageToGroups( PlayerName .. " aborted Task " .. self:GetName() )
        self:UnAssignFromGroup( PlayerGroup )
-        --self:Abort()

        -- Now check if the task needs to go to hold...
        -- It will go to hold, if there are no players in the mission...
-        
        PlayerGroups:Flush( self )
        local IsRemaining = false
        for GroupName, AssignedGroup in pairs( PlayerGroups:GetSet() or {} ) do
@@ -352,11 +380,10 @@ function TASK:AbortGroup( PlayerGroup )
  return self
 end

--- A PlayerUnit crashed in a Task. Abort the Player.
-- If the Unit was not part of the Task, false is returned.
-- If the Unit is part of the Task, true is returned.
+
+--- A group crashing and thus aborting from the task.
 -- @param #TASK self
-- @param Wrapper.Unit#UNIT PlayerUnit The CLIENT or UNIT of the Player aborting the Task.
+-- @param Wrapper.Group#GROUP PlayerGroup The group aborting the task.
 -- @return #TASK
 function TASK:CrashGroup( PlayerGroup )
  self:F( { PlayerGroup = PlayerGroup } )
@@ -418,9 +445,29 @@ end
 -- @param #TASK self
 -- @return Core.Set#SET_GROUP
 function TASK:GetGroups()
+
  return self.SetGroup
 end

+
+--- Gets the SET_GROUP assigned to the TASK.
+-- @param #TASK self
+-- @param Core.Set#SET_GROUP GroupSet
+-- @return Core.Set#SET_GROUP
+function TASK:AddGroups( GroupSet )
+
+  GroupSet = GroupSet or SET_GROUP:New()
+ 
+  self.SetGroup:ForEachGroup(
+    --- @param Wrapper.Group#GROUP GroupSet
+    function( GroupItem )
+      GroupSet:Add( GroupItem:GetName(), GroupItem)
+    end
+  )
+  
+  return GroupSet
+end
+
 do -- Group Assignment

  --- Returns if the @{Task} is assigned to the Group.
@@ -797,7 +844,9 @@ function TASK:SetAssignedMenuForGroup( TaskGroup, MenuTime )
    if TaskUnit then
      local MenuControl = self:GetTaskControlMenu( TaskUnit )
      local TaskControl = MENU_GROUP:New( TaskGroup, "Control Task", MenuControl ):SetTime( MenuTime ):SetTag( "Tasking" )
-      local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Abort Task" ), TaskControl, self.MenuTaskAbort, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" )
+      if self:IsStateAssigned() then
+        local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Abort Task" ), TaskControl, self.MenuTaskAbort, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" )
+      end
      local MarkMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Mark Task Location on Map" ), TaskControl, self.MenuMarkToGroup, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" )
      local TaskTypeMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Report Task Details" ), TaskControl, self.MenuTaskStatus, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" )
    end
@@ -1289,6 +1338,7 @@ function TASK:onenterAborted( From, Event, To )
  
 end

+
 --- FSM function for a TASK
 -- @param #TASK self
 -- @param #string From
@@ -1641,7 +1691,14 @@ do -- Task Control Menu
  
    TaskName = TaskName or ""
    
-    self.TaskControlMenu = MENU_GROUP:New( TaskUnit:GetGroup(), "Assigned Task " .. TaskUnit:GetPlayerName() .. " - " .. self:GetName() .. " " .. TaskName ):SetTime( self.TaskControlMenuTime )
+    local TaskGroup = TaskUnit:GetGroup()
+    local TaskPlayerCount = TaskGroup:GetPlayerCount()
+    
+    if TaskPlayerCount <= 1 then
+      self.TaskControlMenu = MENU_GROUP:New( TaskUnit:GetGroup(), "Task " .. self:GetName() .. " control" ):SetTime( self.TaskControlMenuTime )
+    else
+      self.TaskControlMenu = MENU_GROUP:New( TaskUnit:GetGroup(), "Task " .. self:GetName() .. " control for " .. TaskUnit:GetPlayerName() ):SetTime( self.TaskControlMenuTime )
+    end
    
    return self.TaskControlMenu
  end