Merge pull request #532 from FlightControl-Master/master-release-prep

Fix DETECTION_AREAS
Fix DetectedItemCount for DETECTION_AREAS
2025-08-15 10:47:21 +00:00 · 2017-05-18 21:04:26 +02:00 · 2017-05-18 20:59:36 +02:00 · 2017-05-18 20:59:03 +02:00 · 2017-05-18 14:16:03 +02:00 · 2017-05-18 14:14:39 +02:00
6 changed files with 18 additions and 43324 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -221,3 +221,4 @@ _gsdata_/
 .gitattributes
 .gitignore
 Moose Test Missions/MOOSE_Test_Template.miz
+Moose.lua
--- a/Development/Moose/Functional/Detection.lua
+++ b/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 or self.DetectedItemCount
    DetectedItem.ItemID = ItemPrefix .. "." .. self.DetectedItemMax
    DetectedItem.ID = self.DetectedItemMax
    DetectedItem.Removed = false
--- a/Development/Moose/Tasking/Task.lua
+++ b/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()
--- a/Development/Moose/Tasking/Task_A2G_Dispatcher.lua
+++ b/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
@@ -277,9 +278,11 @@ do -- TASK_A2G_DISPATCHER
      -- TODO set menus using the HQ coordinator
      Mission:GetCommandCenter():SetMenu()
      
+      local TaskText = TaskReport:Text(", ")
+      
      for TaskGroupID, TaskGroup in pairs( self.SetGroup:GetSet() ) do
-        if not Mission:IsGroupAssigned(TaskGroup) then
-          Mission:GetCommandCenter():MessageToGroup( string.format( "Mission *%s* has tasks %s. Subscribe to a task using the Mission *Overlord* radio menu.", Mission:GetName(), TaskReport:Text(", ") ), TaskGroup )
+        if ( not Mission:IsGroupAssigned(TaskGroup) ) and TaskText ~= "" then
+          Mission:GetCommandCenter():MessageToGroup( string.format( "%s has tasks %s. Subscribe to a task using the radio menu.", Mission:GetName(), TaskText ), TaskGroup )
        end
      end
      
--- a/Setup/Moose.lua
+++ b/Setup/Moose.lua
@@ -1,5 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' )
-env.info( 'Moose Generation Timestamp: 20170517_0612' )
+env.info( 'Moose Generation Timestamp: 20170518_2056' )

 --- Various routines
 -- @module routines
@@ -31188,6 +31188,7 @@ do -- DETECTION_BASE
    end
    
    DetectedItem.Set = Set or SET_UNIT:New():FilterDeads():FilterCrashes()
+    DetectedItem.Index = DetectedItemIndex or self.DetectedItemCount
    DetectedItem.ItemID = ItemPrefix .. "." .. self.DetectedItemMax
    DetectedItem.ID = self.DetectedItemMax
    DetectedItem.Removed = false
@@ -40679,7 +40680,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()
@@ -41848,6 +41849,7 @@ do -- TASK_A2G_DISPATCHER
        DetectedSet:Flush()
        
        local DetectedItemID = DetectedItem.ID
+        local DetectedItemIndex = DetectedItem.Index
        local DetectedItemChanged = DetectedItem.Changed
        
        local Task = self.Tasks[DetectedItemID]
@@ -41881,7 +41883,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
@@ -41899,9 +41901,11 @@ do -- TASK_A2G_DISPATCHER
      -- TODO set menus using the HQ coordinator
      Mission:GetCommandCenter():SetMenu()
      
+      local TaskText = TaskReport:Text(", ")
+      
      for TaskGroupID, TaskGroup in pairs( self.SetGroup:GetSet() ) do
-        if not Mission:IsGroupAssigned(TaskGroup) then
-          Mission:GetCommandCenter():MessageToGroup( string.format( "Mission *%s* has tasks %s. Subscribe to a task using the Mission *Overlord* radio menu.", Mission:GetName(), TaskReport:Text(", ") ), TaskGroup )
+        if ( not Mission:IsGroupAssigned(TaskGroup) ) and TaskText ~= "" then
+          Mission:GetCommandCenter():MessageToGroup( string.format( "%s has tasks %s. Subscribe to a task using the radio menu.", Mission:GetName(), TaskText ), TaskGroup )
        end
      end
      
--- a/Moose.lua
+++ b/Moose.lua
Author	SHA1	Message	Date
Sven Van de Velde	e2a0aa5573	Merge pull request #532 from FlightControl-Master/master-release-prep Fix DETECTION_AREAS	2017-05-18 21:04:26 +02:00
FlightControl	a932f49554	Fix DetectedItemCount for DETECTION_AREAS	2017-05-18 20:59:36 +02:00
FlightControl	a57e24212e	Merge remote-tracking branch 'refs/remotes/origin/master-release-2.1' into master-release-prep	2017-05-18 20:59:03 +02:00
FlightControl	775a3b20ab	Dynamic	2017-05-18 14:16:03 +02:00
Sven Van de Velde	0d2e398e37	Merge pull request #529 from FlightControl-Master/master-release-prep Fixes #528	2017-05-18 14:14:39 +02:00
FlightControl	97179cc0b3	Merge remote-tracking branch 'refs/remotes/origin/master-release-2.1' into master-release-prep	2017-05-18 14:13:56 +02:00
FlightControl	b26d5e09e6	Remove the moose.lua file	2017-05-18 14:13:29 +02:00
FlightControl	091373f98f	Fixes #528 - DETECTION_UNITS uses a string as the index	2017-05-18 14:10:20 +02:00
FlightControl	694798947f	New version	2017-05-18 10:12:26 +02:00
FlightControl	87fb057e0e	Remove moose.lua	2017-05-18 10:08:24 +02:00
FlightControl	a644d3b8c8	Dynamic Moose.lua	2017-05-18 10:03:51 +02:00
Sven Van de Velde	7707293615	Merge pull request #527 from FlightControl-Master/master-release-prep Fixes issue #525	2017-05-18 09:30:16 +02:00
FlightControl	3da82f595a	Merge remote-tracking branch 'origin/master-release-prep' into master-release-prep # Conflicts: # Moose Mission Setup/Moose.lua	2017-05-18 09:28:41 +02:00
FlightControl	b5f8a5aad6	Static version	2017-05-18 09:27:21 +02:00
Sven Van de Velde	596e442b8a	Merge pull request #526 from FlightControl-Master/525-R21-Fix-messages-displayed-in-tasking 525 r21 fix messages displayed in tasking	2017-05-18 09:25:46 +02:00
FlightControl	c83cdfdeff	Update Moose.lua	2017-05-18 09:24:19 +02:00
FlightControl	6d1ab6bd98	Updated messages being displayed wrongly	2017-05-18 09:16:39 +02:00