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

Fix for #627

Browse Source
This commit is contained in:
FlightControl_Master
2017-07-25 08:20:38 +02:00
parent a2630670c0
commit 652ed8b178
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Functional/Designate.lua
View File

@@ -196,8 +196,9 @@ do -- DESIGNATE
-- @param Tasking.CommandCenter#COMMANDCENTER CC -- @param Tasking.CommandCenter#COMMANDCENTER CC
-- @param Functional.Detection#DETECTION_BASE Detection -- @param Functional.Detection#DETECTION_BASE Detection
-- @param Core.Set#SET_GROUP AttackSet The Attack collection of GROUP objects to designate and report for. -- @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 -- @return #DESIGNATE
function DESIGNATE:New( CC, Detection, AttackSet ) function DESIGNATE:New( CC, Detection, AttackSet, Mission )
local self = BASE:Inherit( self, FSM:New() ) -- #DESIGNATE local self = BASE:Inherit( self, FSM:New() ) -- #DESIGNATE
self:F( { Detection } ) self:F( { Detection } )
@@ -368,6 +369,7 @@ do -- DESIGNATE
self.LaseDuration = 60 self.LaseDuration = 60
self:SetFlashStatusMenu( false ) self:SetFlashStatusMenu( false )
self:SetMission( Mission )
self:SetDesignateMenu() self:SetDesignateMenu()
self:SetLaserCodes( 1688 ) -- set self.LaserCodes self:SetLaserCodes( 1688 ) -- set self.LaserCodes

4
Moose Development/Moose/Tasking/Mission.lua
View File

@@ -491,7 +491,7 @@ function MISSION:GetRootMenu( TaskGroup ) -- R2.2
local Menu = self.MissionMenu[TaskGroup] 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 return Menu.MainMenu
end end
@@ -512,7 +512,7 @@ function MISSION:GetMenu( TaskGroup ) -- R2.1 -- Changed Menu Structure
local Menu = self.MissionMenu[TaskGroup] 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.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 ) Menu.TaskReportsMenu = Menu.TaskReportsMenu or MENU_GROUP:New( TaskGroup, "Task Reports", Menu.MainMenu )

2
Moose Mission Setup/Moose.lua
View File

@@ -1,5 +1,5 @@
env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20170720_1318' ) env.info( 'Moose Generation Timestamp: 20170725_0806' )
local base = _G local base = _G