FLIGHTCONTROL

- Improved Taxi comms

Moose Development/Moose/Core/Astar.lua

@@ -631,7 +631,7 @@ function ASTAR.Pathline(nodeA, nodeB, distmax)
     local seg=segA --Core.Pathline#PATHLINE.Segment
     
     if dist<distmax and (nodeA.pathpoint.uid==seg.p1.uid or nodeA.pathpoint.uid==seg.p2.uid) then
-      env.info(string.format("FF NodeB=%d [pathline=%s] is close to NodeA=%d [pathline=%s] ==> valid neighbour", nodeB.id, nodeB.pathline.name, nodeA.id, nodeA.pathline.name))
+      --env.info(string.format("FF NodeB=%d [pathline=%s] is close to NodeA=%d [pathline=%s] ==> valid neighbour", nodeB.id, nodeB.pathline.name, nodeA.id, nodeA.pathline.name))
       return true
     end
 
@@ -641,7 +641,7 @@ function ASTAR.Pathline(nodeA, nodeB, distmax)
     local seg=segB --Core.Pathline#PATHLINE.Segment
 
     if dist<distmax and (nodeB.pathpoint.uid==seg.p1.uid or nodeB.pathpoint.uid==seg.p2.uid) then
-      env.info(string.format("FF NodeA=%d [pathline=%s] is close to NodeB=%d [pathline=%s] ==> valid neighbour", nodeA.id, nodeA.pathline.name, nodeB.id, nodeB.pathline.name))
+      --env.info(string.format("FF NodeA=%d [pathline=%s] is close to NodeB=%d [pathline=%s] ==> valid neighbour", nodeA.id, nodeA.pathline.name, nodeB.id, nodeB.pathline.name))
       return true
     end    
     
@@ -675,8 +675,8 @@ end
 -- @return #number Distance between the two nodes.
 function ASTAR.Dist2D(nodeA, nodeB)
   local dist=nodeA.coordinate:Get2DDistance(nodeB.coordinate)
-  local text=string.format("FF Cost Dist2D NodeA=%d-->NodeB=%d = %.1f", nodeA.id, nodeB.id, dist)
+  --local text=string.format("FF Cost Dist2D NodeA=%d-->NodeB=%d = %.1f", nodeA.id, nodeB.id, dist)
-  env.info(text)
+  --env.info(text)
   return dist
 end
 

Moose Development/Moose/Ops/FlightControl.lua

@@ -384,8 +384,8 @@ FLIGHTCONTROL.version="0.7.3"
 --- Create a new FLIGHTCONTROL class object for an associated airbase.
 -- @param #FLIGHTCONTROL self
 -- @param #string AirbaseName Name of the airbase.
--- @param #number Frequency Radio frequency in MHz. Default 143.00 MHz. Can also be given as a `#table` of multiple frequencies.
+-- @param #number Frequency Tower radio frequency in MHz. Default 143.00 MHz. Can also be given as a `#table` of multiple frequencies.
--- @param #number Modulation Radio modulation: 0=AM (default), 1=FM. See `radio.modulation.AM` and `radio.modulation.FM` enumerators. Can also be given as a `#table` of multiple modulations.
+-- @param #number Modulation Tower radio modulation: 0=AM (default), 1=FM. See `radio.modulation.AM` and `radio.modulation.FM` enumerators. Can also be given as a `#table` of multiple modulations.
 -- @param #string PathToSRS Path to the directory, where SRS is located.
 -- @param #number Port Port of SRS Server, defaults to 5002
 -- @param #string GoogleKey Path to the Google JSON-Key.
@@ -1395,9 +1395,9 @@ function FLIGHTCONTROL:_CheckQueues()
       
     if isholding then
 
-      --------------------
+      --------------
-      -- Holding flight --
+      -- Arrivals --
-      --------------------
+      --------------
 
       -- No other flight is taking off and number of landing flights is below threshold.      
       if self:_CheckFlightLanding(flight) then
@@ -1451,9 +1451,9 @@ function FLIGHTCONTROL:_CheckQueues()
     
     else
     
-      --------------------
+      ----------------
-      -- Takeoff flight --
+      -- Departures --
-      --------------------
+      ----------------
      
       -- No other flight is taking off or landing.
       if self:_CheckFlightTakeoff(flight) then
@@ -1464,8 +1464,33 @@ function FLIGHTCONTROL:_CheckQueues()
         -- Runway.
         local runway=self:GetActiveRunwayText(true)
         
+        local rwy=self:GetActiveRunwayTakeoff()
+        
+        local coord=flight:GetCoordinate()
+        local taxipath, taxiways=self.airbase:FindTaxiwaysFromAtoB(coord, rwy.position)
+        
+        taxipath:Draw(true)
+      
         -- Message.
-        local text=string.format("%s, %s, taxi to runway %s, hold short", callsign, self.alias, runway)
+        local text=string.format("%s, %s, taxi to runway %s", callsign, self.alias, runway)
+        
+        local taxiroute=""
+        if taxipath and taxiways then
+          taxiroute=taxiroute.." via "
+          for _,_pathline in pairs(taxiways) do
+            local pathline=_pathline --Core.Pathline#PATHLINE
+            local name=UTILS.Split(pathline.name, " ")
+            local name=name[#name]
+            local tw=name
+            if string.len(name)==1 then
+              name=ENUMS.Phonetic[name]
+            end            
+            taxiroute=taxiroute..string.format("%s, ", name)
+          end
+        end
+        text=text..taxiroute
+        
+        text=text..string.format("hold short of runway %s.", runway)
         
         if self:GetFlightStatus(flight)==FLIGHTCONTROL.FlightStatus.READYTO then
           text=string.format("%s, %s, cleared for take-off, runway %s", callsign, self.alias, runway)
@@ -2166,6 +2191,10 @@ function FLIGHTCONTROL:_InitParkingSpots()
           -- Spawn parking guard.
           self:SpawnParkingGuard(unit)
           
+          
+          local group=unit:GetGroup()
+          FLIGHTGROUP:New(group)
+        
         else
         
           -- TODO
@@ -2524,6 +2553,11 @@ function FLIGHTCONTROL:_CreatePlayerMenu(flight, mainmenu)
       ---
       
       if status==FLIGHTCONTROL.FlightStatus.READYTX then
+        -- After requesting taxi.
+        MENU_GROUP_COMMAND:New(group, "Confirm Taxi",  rootmenu, self._PlayerConfirmTaxi, self, groupname)
+        MENU_GROUP_COMMAND:New(group, "Cancel Taxi",   rootmenu, self._PlayerAbortTaxi,   self, groupname)
+      elseif status==FLIGHTCONTROL.FlightStatus.TAXIOUT then
+        -- After Confirming Taxi
         MENU_GROUP_COMMAND:New(group, "Cancel Taxi",   rootmenu, self._PlayerAbortTaxi,   self, groupname)
       else
         MENU_GROUP_COMMAND:New(group, "Request Taxi",  rootmenu, self._PlayerRequestTaxi, self, groupname)        
@@ -3504,13 +3538,12 @@ function FLIGHTCONTROL:_PlayerRequestTaxi(groupname)
         
       -- Tell pilot to wait until cleared.
       local text=string.format("%s, %s, hold position until further notice.", callsign, self.alias)
+      
       self:TransmissionTower(text, flight, 10)
       
       -- Set flight status to "Ready to Taxi".
       self:SetFlightStatus(flight, FLIGHTCONTROL.FlightStatus.READYTX)     
       
-      self.airbase:FindTaxiwaysFromAtoB(StartCoord,EndCoord)
-      
     elseif flight:IsTaxiing() then
     
       -- Runway for takeoff.
@@ -3541,6 +3574,33 @@ function FLIGHTCONTROL:_PlayerRequestTaxi(groupname)
 
 end
 
+--- Player confirm taxi.
+-- @param #FLIGHTCONTROL self
+-- @param #string groupname Name of the flight group.
+function FLIGHTCONTROL:_PlayerConfirmTaxi(groupname)
+  
+  -- Get flight.
+  local flight=_DATABASE:GetOpsGroup(groupname) --Ops.FlightGroup#FLIGHTGROUP
+  
+  if flight then
+  
+    -- Get callsign.
+    local callsign=self:_GetCallsignName(flight)
+
+      -- Runway for takeoff.
+      local runway=self:GetActiveRunwayText(true)
+
+      -- Tell pilot to wait until cleared.
+      local text=string.format("Taxi to runway %s, %s", runway, callsign)
+      self:TransmissionPilot(text, flight)
+
+      -- Taxi out.    
+      self:SetFlightStatus(flight, FLIGHTCONTROL.FlightStatus.TAXIOUT)    
+  end
+  
+  
+end
+
 --- Player aborts taxi.
 -- @param #FLIGHTCONTROL self
 -- @param #string groupname Name of the flight group.
@@ -3609,11 +3669,20 @@ function FLIGHTCONTROL:_PlayerRequestTakeoff(groupname)
   
     if flight:IsTaxiing() then
     
+      -- TODO: Get closest runway
+      local runway=self:GetActiveRunwayTakeoff()
+      
+      local runwayName=self:GetActiveRunwayText(true)
+      
+      local distToRunway=flight:GetCoordinate():Get2DDistance(runway.position)
+
       -- Get callsign.
       local callsign=self:_GetCallsignName(flight)
       
+      if distToRunway < 100 then
+        
         -- Pilot request for taxi.
-      local text=string.format("%s, %s, ready for departure. Request takeoff.", self.alias, callsign)
+        local text=string.format("%s, %s, ready for departure, runway %s", self.alias, callsign, runwayName)
         self:TransmissionPilot(text, flight)    
       
         -- Get number of flights landing.
@@ -3622,27 +3691,6 @@ function FLIGHTCONTROL:_PlayerRequestTakeoff(groupname)
         -- Get number of flights taking off.
         local Ntakeoff=self:CountFlights(FLIGHTCONTROL.FlightStatus.TAKEOFF)
         
-      --[[
-      local text=""
-      if Nlanding==0 and Ntakeoff==0 then
-        text="No current traffic. You are cleared for takeoff."
-        self:SetFlightStatus(flight, FLIGHTCONTROL.FlightStatus.TAKEOFF)
-      elseif Nlanding>0 and Ntakeoff>0 then
-        text=string.format("Negative, we got %d flights inbound and %d outbound ahead of you. Hold position until futher notice.", Nlanding, Ntakeoff)
-        self:SetFlightStatus(flight, FLIGHTCONTROL.FlightStatus.READYTO)      
-      elseif Nlanding>0 then
-        if Nlanding==1 then
-          text=string.format("Negative, we got %d flight inbound before it's your turn. Wait until futher notice.", Nlanding)
-        else
-          text=string.format("Negative, we got %d flights inbound. Wait until futher notice.", Nlanding)
-        end
-        self:SetFlightStatus(flight, FLIGHTCONTROL.FlightStatus.READYTO)
-      elseif Ntakeoff>0 then
-        text=string.format("Negative, %d flights ahead of you are waiting for takeoff. Talk to you soon.", Ntakeoff)
-        self:SetFlightStatus(flight, FLIGHTCONTROL.FlightStatus.READYTO)
-      end
-      ]]
-      
         -- We only check for landing flights.
         local text=string.format("%s, %s, ", callsign, self.alias)
         if Nlanding==0 then
@@ -3656,13 +3704,17 @@ function FLIGHTCONTROL:_PlayerRequestTakeoff(groupname)
           if Nlanding==1 then
             text=text..string.format("negative, we got %d flight inbound before it's your turn. Hold position until futher notice.", Nlanding)
           else
-          text=text..string.format("negative, we got %d flights inbound. Hold positon until futher notice.", Nlanding)
+            text=text..string.format("negative, we got %d flights inbound. Hold position until futher notice.", Nlanding)
           end
         end      
         
         -- Message from tower.
         self:TransmissionTower(text, flight, 10)
         
+      else
+        local text=string.format("%s, you are too far from the active runway. Proceed to runway %s and repeat your request when you are at the holding position", callsign, runwayName)
+      end
+      
     else
       self:TextMessageToFlight(string.format("Negative, you must request TAXI before you can request TAKEOFF!"), flight)
     end

Moose Development/Moose/Ops/FlightGroup.lua

@@ -2279,7 +2279,12 @@ function FLIGHTGROUP:onafterTaxiing(From, Event, To)
       self.flightcontrol:SetFlightStatus(self, FLIGHTCONTROL.FlightStatus.TAKEOFF)
     else
       -- Human flights go to TAXI OUT queue. They will go to the ready for takeoff queue when they request it.
+      if self.controlstatus~=FLIGHTCONTROL.FlightStatus.TAXIOUT then
         self.flightcontrol:SetFlightStatus(self, FLIGHTCONTROL.FlightStatus.TAXIOUT)
+      else
+        -- Update menu. This happens now if we confirmed taxiing and later began to taxi. (in the FLIGHTCONTROL:SetFlightStatus function the menu is only updated, when the controlstatus changed)
+        self:_UpdateMenu(0.2)
+      end
     end
 
   end

Moose Development/Moose/Ops/OpsGroup.lua

@@ -564,6 +564,11 @@ function OPSGROUP:New(group)
 
   -- Set DCS group and controller.
   self.dcsgroup=self:GetDCSGroup()
+  
+  if not self.dcsgroup then
+    return
+  end
+  
   self.controller=self.dcsgroup:getController()
 
   -- Category.

Moose Development/Moose/Wrapper/Airbase.lua

@@ -1206,6 +1206,8 @@ end
 -- @return #boolean If `true`, silent mode is enabled.
 function AIRBASE:AddTaxiway(TaxiPathline, Name)
 
+  Name=Name or TaxiPathline:GetName()
+
   self.taxiways[Name]=TaxiPathline
 
 end
@@ -1251,7 +1253,7 @@ end
 --- Find the shortest path using taxiways to get from given parking spot to the starting point of a runway.
 -- Note that the taxi ways have to be manually added with the `AIRBASE:AddTaxiway()` function.
 -- @param #AIRBASE self
--- @param #AIRBASE.ParkingSpot ParkingSport Parking spot.
+-- @param #AIRBASE.ParkingSpot ParkingSpot Parking spot.
 -- @param #AIRBASE.Runway Runway The runway. If none is given, we take the active runway for takeoff.
 -- @return Core.Pathline#PATHLINE Shortest path on taxiways from `StartCoord` to `EndCoord`.
 -- @return #table Table of used taxi way pathlines.