FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for A2G tasking, reduce trace, and put in key trace lines to follow the tasking.

Browse Source
This commit is contained in:
FlightControl_Master
2017-12-03 08:06:35 +01:00
parent 76ea635b63
commit a2fa2c4fa2
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Moose Development/Moose/Tasking/Task.lua
View File

@@ -426,11 +426,11 @@ do -- Group Assignment
local TaskGroupName = TaskGroup:GetName()
if self.AssignedGroups[TaskGroupName] then
self:T( { "Task is assigned to:", TaskGroup:GetName() } )
--self:T( { "Task is assigned to:", TaskGroup:GetName() } )
return true
end
self:T( { "Task is not assigned to:", TaskGroup:GetName() } )
--self:T( { "Task is not assigned to:", TaskGroup:GetName() } )
return false
end
@@ -751,7 +751,7 @@ function TASK:SetPlannedMenuForGroup( TaskGroup, MenuTime )
local ReportTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Report Task Status" ), TaskTypeMenu, self.MenuTaskStatus, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" )
if not Mission:IsGroupAssigned( TaskGroup ) then
self:F( { "Replacing Join Task menu" } )
--self:F( { "Replacing Join Task menu" } )
local JoinTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Join Task" ), TaskTypeMenu, self.MenuAssignToGroup, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" )
local MarkTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Mark Task on Map" ), TaskTypeMenu, self.MenuMarkToGroup, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" )
end
@@ -1239,7 +1239,6 @@ end
-- @param #string To
function TASK:onenterAssigned( From, Event, To, PlayerUnit, PlayerName )
--- This test is required, because the state transition will be fired also when the state does not change in case of an event.
if From ~= "Assigned" then
self:E( { From, Event, To, PlayerUnit:GetName(), PlayerName } )
@@ -1261,6 +1260,10 @@ function TASK:onenterAssigned( From, Event, To, PlayerUnit, PlayerName )
self:__Goal( -10, PlayerUnit, PlayerName ) -- Polymorphic
self:SetMenu()
self:E( { "--> Task Assigned", TaskName = self:GetName(), Mission = self:GetMission():GetName() } )
self:E( { "--> Task Player Names", PlayerNames = self:GetPlayerNames() } )
end
end
@@ -1272,7 +1275,8 @@ end
-- @param #string To
function TASK:onenterSuccess( From, Event, To )
self:E( "Task Success" )
self:E( { "<-> Task Replanned", TaskName = self:GetName(), Mission = self:GetMission():GetName() } )
self:E( { "<-> Task Player Names", PlayerNames = self:GetPlayerNames() } )
self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " is successful! Good job!" )
self:UnAssignFromGroups()
@@ -1289,7 +1293,8 @@ end
-- @param #string To
function TASK:onenterAborted( From, Event, To )
self:E( "Task Aborted" )
self:E( { "<-- Task Aborted", TaskName = self:GetName(), Mission = self:GetMission():GetName() } )
self:E( { "<-- Task Player Names", PlayerNames = self:GetPlayerNames() } )
if From ~= "Aborted" then
self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " has been aborted! Task may be replanned." )
@@ -1306,7 +1311,8 @@ end
-- @param #string To
function TASK:onenterCancelled( From, Event, To )
self:E( "Task Cancelled" )
self:E( { "<-- Task Cancelled", TaskName = self:GetName(), Mission = self:GetMission():GetName() } )
self:E( { "<-- Player Names", PlayerNames = self:GetPlayerNames() } )
if From ~= "Cancelled" then
self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " has been cancelled! The tactical situation has changed." )
@@ -1323,7 +1329,8 @@ end
-- @param #string To
function TASK:onafterReplan( From, Event, To )
self:E( "Task Replanned" )
self:E( { "Task Replanned", TaskName = self:GetName(), Mission = self:GetMission():GetName() } )
self:E( { "Task Player Names", PlayerNames = self:GetPlayerNames() } )
self:GetMission():GetCommandCenter():MessageToCoalition( "Replanning Task " .. self:GetName() .. "." )
@@ -1338,7 +1345,8 @@ end
-- @param #string To
function TASK:onenterFailed( From, Event, To )
self:E( "Task Failed" )
self:E( { "Task Failed", TaskName = self:GetName(), Mission = self:GetMission():GetName() } )
self:E( { "Task Player Names", PlayerNames = self:GetPlayerNames() } )
self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " has failed!" )