From 2218fdd0b2bc9748d0cc123465dd32d3eb46177f Mon Sep 17 00:00:00 2001 From: FlightControl Date: Tue, 5 Jul 2016 06:24:57 +0200 Subject: [PATCH] Updates --- Moose Development/Moose/Mission.lua | 43 ++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/Moose Development/Moose/Mission.lua b/Moose Development/Moose/Mission.lua index f64e529fd..de27f15f4 100644 --- a/Moose Development/Moose/Mission.lua +++ b/Moose Development/Moose/Mission.lua @@ -6,6 +6,7 @@ -- @type MISSION -- @extends Base#BASE -- @field #MISSION.Clients _Clients +-- @field Menu#MENU_COALITION MissionMenu -- @field #string MissionBriefing MISSION = { ClassName = "MISSION", @@ -60,19 +61,12 @@ function MISSION:New( MissionName, MissionPriority, MissionBriefing, MissionCoal self = MISSION:Meta() self:T({ MissionName, MissionPriority, MissionBriefing, MissionCoalition }) - local Valid = true - - Valid = routines.ValidateString( MissionName, "MissionName", Valid ) - Valid = routines.ValidateString( MissionPriority, "MissionPriority", Valid ) - Valid = routines.ValidateString( MissionBriefing, "MissionBriefing", Valid ) - Valid = routines.ValidateString( MissionCoalition, "MissionCoalition", Valid ) - - if Valid then - self.Name = MissionName - self.MissionPriority = MissionPriority - self.MissionBriefing = MissionBriefing - self.MissionCoalition = MissionCoalition - end + self.Name = MissionName + self.MissionPriority = MissionPriority + self.MissionBriefing = MissionBriefing + self.MissionCoalition = MissionCoalition + + self:SetMissionMenu() return self end @@ -99,6 +93,29 @@ function MISSION:GetScoring() return self.Scoring end +--- Sets the mission menu for the coalition. +-- @param #MISSION self +-- @return #MISSION self +function MISSION:SetMissionMenu() + self.MissionMenu = MENU_COALITION:New( self.MissionCoalition, self.Name ) +end + +--- Gets the mission menu for the coalition. +-- @param #MISSION self +-- @return Menu#MENU_COALITION self +function MISSION:GetMissionMenu() + return self.MissionMenu +end + + +--- Clears the mission menu for the coalition. +-- @param #MISSION self +-- @return #MISSION self +function MISSION:ClearMissionMenu() + self.MissionMenu:Remove() + self.MissionMenu = nil +end + --- Returns if a Mission has completed. -- @return bool function MISSION:IsCompleted()