From 356f4a041f40cb52373f6e3228d54da10ceb8e45 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Fri, 26 May 2017 08:43:30 +0200 Subject: [PATCH] Cleaned up the reporting side of A2G tasking --- Moose Development/Moose/Core/Database.lua | 6 +++--- .../Moose/Tasking/Task_A2G_Dispatcher.lua | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua index 985f80f62..fed13c2a4 100644 --- a/Moose Development/Moose/Core/Database.lua +++ b/Moose Development/Moose/Core/Database.lua @@ -119,18 +119,18 @@ function DATABASE:New() local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) } for CoalitionId, CoalitionData in pairs( CoalitionsData ) do - self:E( { "CoalitionData:", CoalitionData } ) + --self:E( { "CoalitionData:", CoalitionData } ) for UnitId, UnitData in pairs( CoalitionData ) do if UnitData and UnitData:isExist() then local UnitName = UnitData:getName() local PlayerName = UnitData:getPlayerName() local PlayerUnit = UNIT:Find( UnitData ) - self:T( { "UnitData:", UnitData, UnitName, PlayerName, PlayerUnit } ) + --self:T( { "UnitData:", UnitData, UnitName, PlayerName, PlayerUnit } ) if PlayerName and PlayerName ~= "" then if self.PLAYERS[PlayerName] == nil or self.PLAYERS[PlayerName] ~= UnitName then - self:E( { "Add player for unit:", UnitName, PlayerName } ) + --self:E( { "Add player for unit:", UnitName, PlayerName } ) self:AddPlayer( UnitName, PlayerName ) --_EVENTDISPATCHER:CreateEventPlayerEnterUnit( PlayerUnit ) local Settings = SETTINGS:Set( PlayerName ) diff --git a/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua index 488c7a256..4153b95f3 100644 --- a/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua @@ -189,7 +189,7 @@ do -- TASK_A2G_DISPATCHER if Task then if Task:IsStatePlanned() and DetectedItemChanged == true then - self:E( "Removing Tasking: " .. Task:GetTaskName() ) + --self:E( "Removing Tasking: " .. Task:GetTaskName() ) Mission:RemoveTask( Task ) self.Tasks[TaskIndex] = nil end @@ -238,7 +238,7 @@ do -- TASK_A2G_DISPATCHER local DetectedItem = DetectedItem -- Functional.Detection#DETECTION_BASE.DetectedItem local DetectedSet = DetectedItem.Set -- Core.Set#SET_UNIT local DetectedZone = DetectedItem.Zone - self:E( { "Targets in DetectedItem", DetectedItem.ItemID, DetectedSet:Count(), tostring( DetectedItem ) } ) + --self:E( { "Targets in DetectedItem", DetectedItem.ItemID, DetectedSet:Count(), tostring( DetectedItem ) } ) DetectedSet:Flush() local DetectedItemID = DetectedItem.ID @@ -275,17 +275,15 @@ do -- TASK_A2G_DISPATCHER self.Tasks[TaskIndex] = Task Task:SetTargetZone( DetectedZone ) Task:SetDispatcher( self ) - Task:SetInfo( "ThreatLevel", DetectedSet:CalculateThreatLevelA2G() ) - Task:SetInfo( "Detection", Detection:DetectedItemReportSummary( TaskIndex ) ) - Task:SetInfo( "Changes", Detection:GetChangeText( DetectedItem ) ) Mission:AddTask( Task ) + + TaskReport:Add( Task:GetName() ) else self:E("This should not happen") end end - TaskReport:Add( Task:GetName() ) -- OK, so the tasking has been done, now delete the changes reported for the area. Detection:AcceptChanges( DetectedItem )