weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the reporting side of A2G tasking

Browse Source
This commit is contained in:
FlightControl 2017-05-26 08:43:30 +02:00
parent 6d43ab371e
commit 356f4a041f
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/Core/Database.lua
View File

@ -119,18 +119,18 @@ function DATABASE:New()
local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) } local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) }
for CoalitionId, CoalitionData in pairs( CoalitionsData ) do for CoalitionId, CoalitionData in pairs( CoalitionsData ) do
self:E( { "CoalitionData:", CoalitionData } ) --self:E( { "CoalitionData:", CoalitionData } )
for UnitId, UnitData in pairs( CoalitionData ) do for UnitId, UnitData in pairs( CoalitionData ) do
if UnitData and UnitData:isExist() then if UnitData and UnitData:isExist() then
local UnitName = UnitData:getName() local UnitName = UnitData:getName()
local PlayerName = UnitData:getPlayerName() local PlayerName = UnitData:getPlayerName()
local PlayerUnit = UNIT:Find( UnitData ) 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 PlayerName and PlayerName ~= "" then
if self.PLAYERS[PlayerName] == nil or self.PLAYERS[PlayerName] ~= UnitName 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 ) self:AddPlayer( UnitName, PlayerName )
--_EVENTDISPATCHER:CreateEventPlayerEnterUnit( PlayerUnit ) --_EVENTDISPATCHER:CreateEventPlayerEnterUnit( PlayerUnit )
local Settings = SETTINGS:Set( PlayerName ) local Settings = SETTINGS:Set( PlayerName )

10
Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua
View File

@ -189,7 +189,7 @@ do -- TASK_A2G_DISPATCHER
if Task then if Task then
if Task:IsStatePlanned() and DetectedItemChanged == true then if Task:IsStatePlanned() and DetectedItemChanged == true then
self:E( "Removing Tasking: " .. Task:GetTaskName() ) --self:E( "Removing Tasking: " .. Task:GetTaskName() )
Mission:RemoveTask( Task ) Mission:RemoveTask( Task )
self.Tasks[TaskIndex] = nil self.Tasks[TaskIndex] = nil
end end
@ -238,7 +238,7 @@ do -- TASK_A2G_DISPATCHER
local DetectedItem = DetectedItem -- Functional.Detection#DETECTION_BASE.DetectedItem local DetectedItem = DetectedItem -- Functional.Detection#DETECTION_BASE.DetectedItem
local DetectedSet = DetectedItem.Set -- Core.Set#SET_UNIT local DetectedSet = DetectedItem.Set -- Core.Set#SET_UNIT
local DetectedZone = DetectedItem.Zone 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() DetectedSet:Flush()
local DetectedItemID = DetectedItem.ID local DetectedItemID = DetectedItem.ID
@ -275,17 +275,15 @@ do -- TASK_A2G_DISPATCHER
self.Tasks[TaskIndex] = Task self.Tasks[TaskIndex] = Task
Task:SetTargetZone( DetectedZone ) Task:SetTargetZone( DetectedZone )
Task:SetDispatcher( self ) Task:SetDispatcher( self )
Task:SetInfo( "ThreatLevel", DetectedSet:CalculateThreatLevelA2G() )
Task:SetInfo( "Detection", Detection:DetectedItemReportSummary( TaskIndex ) )
Task:SetInfo( "Changes", Detection:GetChangeText( DetectedItem ) )
Mission:AddTask( Task ) Mission:AddTask( Task )
TaskReport:Add( Task:GetName() )
else else
self:E("This should not happen") self:E("This should not happen")
end end
end end
TaskReport:Add( Task:GetName() )
-- OK, so the tasking has been done, now delete the changes reported for the area. -- OK, so the tasking has been done, now delete the changes reported for the area.
Detection:AcceptChanges( DetectedItem ) Detection:AcceptChanges( DetectedItem )