weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-09 10:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

FG/FC/ATIS v0.6.3

Browse Source
This commit is contained in:
Frank
2020-01-20 23:25:43 +01:00
parent ebc080b452
commit e509eb3d35
3 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/FlightGroup.lua
+18 -5
View File
@@ -233,7 +233,7 @@ FLIGHTGROUP.TaskType={
--- FLIGHTGROUP class version.
-- @field #string version
FLIGHTGROUP.version="0.2.1"
FLIGHTGROUP.version="0.2.2"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list
@@ -514,7 +514,18 @@ end
-- @return #FLIGHTGROUP self
function FLIGHTGROUP:SetFlightControl(flightcontrol)
self:I(self.sid..string.format("Setting FLIGHTCONTROL to airbase %s", flightcontrol.airbasename))
-- Remove flight from previous FC.
if self.flightcontrol and self.flightcontrol.airbasename~=flightcontrol.airbasename then
self.flightcontrol:_RemoveFlight(self)
end
-- Set FC.
self.flightcontrol=flightcontrol
-- Add flight to all flights.
table.insert(flightcontrol.flights, self)
-- Update flight's F10 menu.
if self.ai==false then
self:_UpdateMenu()
end
return self
end
@@ -1518,14 +1529,14 @@ function FLIGHTGROUP:onbeforeUpdateRoute(From, Event, To, n)
if self.group and self.group:IsAlive() and self:IsAirborne() then
-- Alive & Airborne ==> Update route possible.
env.info("FF update route allowed")
self:I(self.sid.."FF update route allowed")
return true
elseif self:IsDead() then
-- Group is dead! No more updates.
return false
else
-- Not airborne yet. Try again in 1 sec.
env.info("FF update route denied ==> checking back in 1 sec")
self:I(self.sid.."FF update route denied ==> checking back in 1 sec")
self:__UpdateRoute(-1, n)
return false
end
@@ -1541,7 +1552,7 @@ end
function FLIGHTGROUP:onafterUpdateRoute(From, Event, To, n)
MESSAGE:New("Updating route", 10):ToAll()
env.info("FF updating route")
self:I(self.sid.."FF updating route")
-- TODO: what happens if currentwp=#waypoints
n=n or self.currentwp+1
@@ -1594,7 +1605,7 @@ function FLIGHTGROUP:onafterUpdateRoute(From, Event, To, n)
-- Debug info.
local hb=self.homebase and self.homebase:GetName() or "unknown"
local db=self.destination and self.destination:GetName() or "unknown"
self:I(self.sid..string.format("Updating route for WP>=%d (%d/%d) homebase=%s destination=%s", n, #wp, #self.waypoints, hb, db))
self:I(self.sid..string.format("Updating route for WP>=%d/%d (%d) homebase=%s destination=%s", n, #wp, #self.waypoints, hb, db))
if #wp>0 then
@@ -3660,6 +3671,8 @@ function FLIGHTGROUP:_UpdateMenu()
--playermenu:RemoveSubMenus() --Core.Menu#MENU_GROUP
self.menu.atc.root=self.menu.atc.root or MENU
-- If there is a designated FC, we put it first.
local N=8
if self.flightcontrol then