FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Applevangelist 2024-06-20 08:52:28 +02:00
commit b8f7cf44cc
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Moose Development/Moose/Ops/FlightControl.lua
View File

@ -332,7 +332,7 @@ FLIGHTCONTROL.FlightStatus={
--- FlightControl class version. --- FlightControl class version.
-- @field #string version -- @field #string version
FLIGHTCONTROL.version="0.7.6" FLIGHTCONTROL.version="0.7.7"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list -- TODO list
@ -420,6 +420,9 @@ function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port,
-- Init msrs queue. -- Init msrs queue.
self.msrsqueue=MSRSQUEUE:New(self.alias) self.msrsqueue=MSRSQUEUE:New(self.alias)
-- Set that transmission is only if alive players on the server.
self:SetTransmitOnlyWithPlayers(true)
-- Init msrs bases -- Init msrs bases
local path = PathToSRS or MSRS.path local path = PathToSRS or MSRS.path
local port = Port or MSRS.port or 5002 local port = Port or MSRS.port or 5002
@ -589,6 +592,16 @@ function FLIGHTCONTROL:SetRadioOnlyIfPlayers(Switch)
end end
--- Set whether to only transmit TTS messages if there are players on the server.
-- @param #FLIGHTCONTROL self
-- @param #boolean Switch If `true`, only send TTS messages if there are alive Players. If `false` or `nil`, transmission are done also if no players are on the server.
-- @return #FLIGHTCONTROL self
function FLIGHTCONTROL:SetTransmitOnlyWithPlayers(Switch)
self.msrsqueue:SetTransmitOnlyWithPlayers(Switch)
return self
end
--- Set subtitles to appear on SRS TTS messages. --- Set subtitles to appear on SRS TTS messages.
-- @param #FLIGHTCONTROL self -- @param #FLIGHTCONTROL self
-- @return #FLIGHTCONTROL self -- @return #FLIGHTCONTROL self

11
Moose Development/Moose/Ops/FlightGroup.lua
View File

@ -2804,6 +2804,11 @@ function FLIGHTGROUP:_CheckGroupDone(delay, waittime)
self:T(self.lid.."Engaging! Group NOT done...") self:T(self.lid.."Engaging! Group NOT done...")
return return
end end
-- Check if group is going for fuel.
if self:IsGoing4Fuel() then
self:T(self.lid.."Going for FUEL! Group NOT done...")
return
end
-- Number of tasks remaining. -- Number of tasks remaining.
local nTasks=self:CountRemainingTasks() local nTasks=self:CountRemainingTasks()
@ -3420,6 +3425,9 @@ function FLIGHTGROUP:onafterRefuel(From, Event, To, Coordinate)
self:Route({wp0, wp9}, 1) self:Route({wp0, wp9}, 1)
-- Set RTB on Bingo option. Currently DCS does not execute the refueling task if RTB_ON_BINGO is set to "NO RTB ON BINGO"
self.group:SetOption(AI.Option.Air.id.RTB_ON_BINGO, true)
end end
--- On after "Refueled" event. --- On after "Refueled" event.
@ -3433,6 +3441,9 @@ function FLIGHTGROUP:onafterRefueled(From, Event, To)
local text=string.format("Flight group finished refuelling") local text=string.format("Flight group finished refuelling")
self:T(self.lid..text) self:T(self.lid..text)
-- Set RTB on Bingo option to "NO RTB ON BINGO"
self.group:SetOption(AI.Option.Air.id.RTB_ON_BINGO, false)
-- Check if flight is done. -- Check if flight is done.
self:_CheckGroupDone(1) self:_CheckGroupDone(1)