diff --git a/Moose Development/Moose/Core/Menu.lua b/Moose Development/Moose/Core/Menu.lua index 460412973..e27a268da 100644 --- a/Moose Development/Moose/Core/Menu.lua +++ b/Moose Development/Moose/Core/Menu.lua @@ -853,8 +853,8 @@ do self.MenuText = MenuText self.ParentMenu = ParentMenu - self.MenuGroup._Menu = self.MenuGroup._Menu or {} - local MenuPath = self.MenuGroup._Menu + self.MenuGroup._MenuPath = self.MenuGroup._MenuPath or {} + local MenuPath = self.MenuGroup._MenuPath self:E(self.MenuParentPath) self:E( ParentMenu ) diff --git a/Moose Development/Moose/Tasking/Mission.lua b/Moose Development/Moose/Tasking/Mission.lua index dab1479e1..0af1475f8 100644 --- a/Moose Development/Moose/Tasking/Mission.lua +++ b/Moose Development/Moose/Tasking/Mission.lua @@ -163,8 +163,16 @@ end -- @param Group#GROUP TaskGroup -- @return Menu#MENU_COALITION self function MISSION:GetMissionMenu( TaskGroup ) + + local CommandCenter = self:GetCommandCenter() + local CommandCenterMenu = CommandCenter.CommandCenterMenu + + local MissionName = self:GetName() + local TaskGroupName = TaskGroup:GetName() - return self.MenuMission[TaskGroupName] + local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu ) + + return MissionMenu end diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index b1d3ad81a..cb0e1455a 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -325,13 +325,9 @@ function TASK_BASE:SetPlannedMenuForGroup( TaskGroup, MenuText ) self:E( TaskGroup:GetName() ) local Mission = self:GetMission() - local CommandCenter = Mission:GetCommandCenter() - local CommandCenterMenu = CommandCenter.CommandCenterMenu + local MissionMenu = Mission:GetMissionMenu( TaskGroup ) - local MissionName = Mission:GetName() local TaskType = self:GetType() - - local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu ) local TaskTypeMenu = MENU_GROUP:New( TaskGroup, TaskType, MissionMenu ) local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, MenuText, TaskTypeMenu, self.MenuAssignToGroup, { self = self, TaskGroup = TaskGroup } ) @@ -346,14 +342,10 @@ function TASK_BASE:SetAssignedMenuForGroup( TaskGroup ) self:E( TaskGroup:GetName() ) local Mission = self:GetMission() - local CommandCenter = Mission:GetCommandCenter() - local CommandCenterMenu = CommandCenter.CommandCenterMenu + local MissionMenu = Mission:GetMissionMenu( TaskGroup ) - local MissionName = Mission:GetName() - - local TaskGroupName = TaskGroup:GetName() - local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu ) self:E( { MissionMenu = MissionMenu } ) + local TaskTypeMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Task Status", MissionMenu, self.MenuTaskStatus, { self = self, TaskGroup = TaskGroup } ) local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Abort Task", MissionMenu, self.MenuTaskAbort, { self = self, TaskGroup = TaskGroup } ) diff --git a/Moose Training/Presentations/Tasking/DCS World - MOOSE - Tasking.pptx b/Moose Training/Presentations/Tasking/DCS World - MOOSE - Tasking.pptx index 1336f963c..8851df1c5 100644 Binary files a/Moose Training/Presentations/Tasking/DCS World - MOOSE - Tasking.pptx and b/Moose Training/Presentations/Tasking/DCS World - MOOSE - Tasking.pptx differ