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

Fixes issue #525
Merge remote-tracking branch 'origin/master-release-prep' into master-release-prep
2025-08-15 10:47:21 +00:00 · 2017-05-18 09:30:16 +02:00 · 2017-05-18 09:28:41 +02:00 · 2017-05-18 09:27:21 +02:00 · 2017-05-18 09:25:46 +02:00 · 2017-05-18 09:24:19 +02:00
2 changed files with 9 additions and 5 deletions
--- a/Development/Moose/Tasking/Task_A2G_Dispatcher.lua
+++ b/Development/Moose/Tasking/Task_A2G_Dispatcher.lua
@@ -277,9 +277,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_0928' )

 --- Various routines
 -- @module routines
@@ -41899,9 +41899,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
Author	SHA1	Message	Date
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