diff --git a/Moose Development/Moose/Functional/Designate.lua b/Moose Development/Moose/Functional/Designate.lua index 2a63ba4d5..57c4004b5 100644 --- a/Moose Development/Moose/Functional/Designate.lua +++ b/Moose Development/Moose/Functional/Designate.lua @@ -196,8 +196,9 @@ do -- DESIGNATE -- @param Tasking.CommandCenter#COMMANDCENTER CC -- @param Functional.Detection#DETECTION_BASE Detection -- @param Core.Set#SET_GROUP AttackSet The Attack collection of GROUP objects to designate and report for. + -- @param Tasking.Mission#MISSION Mission (Optional) The Mission where the menu needs to be attached. -- @return #DESIGNATE - function DESIGNATE:New( CC, Detection, AttackSet ) + function DESIGNATE:New( CC, Detection, AttackSet, Mission ) local self = BASE:Inherit( self, FSM:New() ) -- #DESIGNATE self:F( { Detection } ) @@ -368,6 +369,7 @@ do -- DESIGNATE self.LaseDuration = 60 self:SetFlashStatusMenu( false ) + self:SetMission( Mission ) self:SetDesignateMenu() self:SetLaserCodes( 1688 ) -- set self.LaserCodes diff --git a/Moose Development/Moose/Tasking/Mission.lua b/Moose Development/Moose/Tasking/Mission.lua index 07133d305..0e73d88d5 100644 --- a/Moose Development/Moose/Tasking/Mission.lua +++ b/Moose Development/Moose/Tasking/Mission.lua @@ -491,7 +491,7 @@ function MISSION:GetRootMenu( TaskGroup ) -- R2.2 local Menu = self.MissionMenu[TaskGroup] - Menu.MainMenu = Menu.MainMenu or MENU_GROUP:New( TaskGroup, self:GetName(), CommandCenterMenu ) + Menu.MainMenu = Menu.MainMenu or MENU_COALITION:New( self.MissionCoalition, self:GetName(), CommandCenterMenu ) return Menu.MainMenu end @@ -512,7 +512,7 @@ function MISSION:GetMenu( TaskGroup ) -- R2.1 -- Changed Menu Structure local Menu = self.MissionMenu[TaskGroup] - Menu.MainMenu = Menu.MainMenu or MENU_GROUP:New( TaskGroup, self:GetName(), CommandCenterMenu ) + Menu.MainMenu = Menu.MainMenu or MENU_COALITION:New( self.MissionCoalition, self:GetName(), CommandCenterMenu ) Menu.BriefingMenu = Menu.BriefingMenu or MENU_GROUP_COMMAND:New( TaskGroup, "Mission Briefing", Menu.MainMenu, self.MenuReportBriefing, self, TaskGroup ) Menu.TaskReportsMenu = Menu.TaskReportsMenu or MENU_GROUP:New( TaskGroup, "Task Reports", Menu.MainMenu ) diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 345faf4cb..994b284cc 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: 20170720_1318' ) +env.info( 'Moose Generation Timestamp: 20170725_0806' ) local base = _G