From a2f35d816ceddaa0b327b14b0a230b4d960638bb Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 10 Nov 2019 00:37:31 +0100 Subject: [PATCH] FC --- Moose Development/Moose/Core/Database.lua | 2 +- Moose Development/Moose/Ops/FlightControl.lua | 38 ++++++++++++++++--- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua index d0673c5ff..b742ee2c6 100644 --- a/Moose Development/Moose/Core/Database.lua +++ b/Moose Development/Moose/Core/Database.lua @@ -1246,7 +1246,7 @@ end -- @param #DATABASE self -- @param Ops.FlightGroup#FLIGHTGROUP flightgroup function DATABASE:AddFlightGroup(flightgroup) - self:F2( { flightgroup } ) + self:I({NewFlightGroup=flightgroup.groupname}) self.FLIGHTGROUPS[flightgroup.groupname]=flightgroup end diff --git a/Moose Development/Moose/Ops/FlightControl.lua b/Moose Development/Moose/Ops/FlightControl.lua index 86581df2b..4fdd7d390 100644 --- a/Moose Development/Moose/Ops/FlightControl.lua +++ b/Moose Development/Moose/Ops/FlightControl.lua @@ -36,7 +36,9 @@ -- @field #table playermenu Player Menu. -- @extends Core.Fsm#FSM ---- Be surprised! +--- **Ground Control**: Airliner X, Good news, you are clear to taxi to the active. +-- **Pilot**: Roger, What’s the bad news? +-- **Ground Control**: No bad news at the moment, but you probably want to get gone before I find any. -- -- === -- @@ -925,21 +927,45 @@ end -- @param #FLIGHTCONTROL self -- @param Ops.FlightGroup#FLIGHTGROUP flight Flight group. function FLIGHTCONTROL:_CreatePlayerMenu(flight) - + local group=flight.group + local groupname=flight.groupname local gid=group:GetID() + self:I(self.lid..string.format("Creating player menu for flight group %s (ID=%d)", tostring(flight.groupname), gid)) + if not self.playermenu[gid] then self.playermenu[gid]={} end local playermenu=self.playermenu[gid] --#FLIGHTCONTROL.PlayerMenu + + playermenu.root = MENU_GROUP:New(group, "ATC") + playermenu.MyStatus = MENU_GROUP_COMMAND:New(group, "My Status", playermenu.root, self._PlayerMyStatus, self, groupname) + playermenu.RequestTaxi= MENU_GROUP_COMMAND:New(group, "Request Taxi", playermenu.root, self._PlayerRequestTaxi, self, groupname) + +end + + +--- Create player menu. +-- @param #FLIGHTCONTROL self +-- @param #string groupname Name of the flight group. +function FLIGHTCONTROL:_PlayerMyStatus(groupname) + + -- Get flight group. + local flight=_DATABASE:GetFlightGroup(groupname) - group:SmokeRed() - - playermenu.root=MENU_GROUP:New(group, "ATC") - playermenu.RequestTaxi=MENU_GROUP_COMMAND:New(group, "Request Taxi", playermenu.root, self._PlayerRequestTaxi, flight.groupname) + if flight then + + local text=string.format("My Status:\n") + text=text..string.format("Flight status: %s", tostring(flight:GetState())) + MESSAGE:New(text, 5):ToAll() + + else + MESSAGE:New(string.format("Cannot find flight group %s.", tostring(groupname)), 5):ToAll() + end + end --- Create player menu.