diff --git a/.gitignore b/.gitignore index 135102f04..6f83de739 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ _gsdata_/ .gitattributes .gitignore Moose Test Missions/MOOSE_Test_Template.miz +Moose.lua diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua index f6eb2dc97..b6a1d46e6 100644 --- a/Moose Development/Moose/Functional/Detection.lua +++ b/Moose Development/Moose/Functional/Detection.lua @@ -1192,6 +1192,7 @@ do -- DETECTION_BASE end DetectedItem.Set = Set or SET_UNIT:New():FilterDeads():FilterCrashes() + DetectedItem.Index = DetectedItemIndex DetectedItem.ItemID = ItemPrefix .. "." .. self.DetectedItemMax DetectedItem.ID = self.DetectedItemMax DetectedItem.Removed = false diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index dab8863f0..b26ccd50e 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -683,7 +683,7 @@ end -- @param #number MenuTime -- @return #TASK self function TASK:SetPlannedMenuForGroup( TaskGroup, MenuTime ) - self:E( TaskGroup:GetName() ) + self:F( TaskGroup:GetName() ) local Mission = self:GetMission() local MissionName = Mission:GetName() diff --git a/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua index 44df328a6..4d77cee7b 100644 --- a/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua @@ -226,6 +226,7 @@ do -- TASK_A2G_DISPATCHER DetectedSet:Flush() local DetectedItemID = DetectedItem.ID + local DetectedItemIndex = DetectedItem.Index local DetectedItemChanged = DetectedItem.Changed local Task = self.Tasks[DetectedItemID] @@ -259,7 +260,7 @@ do -- TASK_A2G_DISPATCHER Task:SetTargetZone( DetectedZone ) Task:SetDispatcher( self ) Task:SetInfo( "ThreatLevel", DetectedSet:CalculateThreatLevelA2G() ) - Task:SetInfo( "Detection", Detection:DetectedItemReportSummary( DetectedItemID ) ) + Task:SetInfo( "Detection", Detection:DetectedItemReportSummary( DetectedItemIndex ) ) Task:SetInfo( "Changes", Detection:GetChangeText( DetectedItem ) ) Mission:AddTask( Task ) else diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index b99c96760..4c01adab4 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170518_1003' ) +env.info( 'Moose Generation Timestamp: 20170518_1415' ) local base = _G