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

Merge remote-tracking branch 'refs/remotes/origin/master' into 419-A2A-Tasking

Browse Source 
# Conflicts:
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl 2017-05-18 14:20:23 +02:00
commit 48595e1282
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -221,3 +221,4 @@ _gsdata_/
.gitattributes .gitattributes
.gitignore .gitignore
Moose Test Missions/MOOSE_Test_Template.miz Moose Test Missions/MOOSE_Test_Template.miz
Moose.lua

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

@ -683,7 +683,7 @@ end
-- @param #number MenuTime -- @param #number MenuTime
-- @return #TASK self -- @return #TASK self
function TASK:SetPlannedMenuForGroup( TaskGroup, MenuTime ) function TASK:SetPlannedMenuForGroup( TaskGroup, MenuTime )
self:E( TaskGroup:GetName() ) self:F( TaskGroup:GetName() )
local Mission = self:GetMission() local Mission = self:GetMission()
local MissionName = Mission:GetName() local MissionName = Mission:GetName()

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

@ -226,6 +226,7 @@ do -- TASK_A2G_DISPATCHER
DetectedSet:Flush() DetectedSet:Flush()
local DetectedItemID = DetectedItem.ID local DetectedItemID = DetectedItem.ID
local DetectedItemIndex = DetectedItem.Index
local DetectedItemChanged = DetectedItem.Changed local DetectedItemChanged = DetectedItem.Changed
local Task = self.Tasks[DetectedItemID] local Task = self.Tasks[DetectedItemID]
@ -259,7 +260,7 @@ do -- TASK_A2G_DISPATCHER
Task:SetTargetZone( DetectedZone ) Task:SetTargetZone( DetectedZone )
Task:SetDispatcher( self ) Task:SetDispatcher( self )
Task:SetInfo( "ThreatLevel", DetectedSet:CalculateThreatLevelA2G() ) Task:SetInfo( "ThreatLevel", DetectedSet:CalculateThreatLevelA2G() )
Task:SetInfo( "Detection", Detection:DetectedItemReportSummary( DetectedItemID ) ) Task:SetInfo( "Detection", Detection:DetectedItemReportSummary( DetectedItemIndex ) )
Task:SetInfo( "Changes", Detection:GetChangeText( DetectedItem ) ) Task:SetInfo( "Changes", Detection:GetChangeText( DetectedItem ) )
Mission:AddTask( Task ) Mission:AddTask( Task )
else else