mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
ab4bf1f0a8
@ -5802,11 +5802,9 @@ function AUFTRAG:GetDCSMissionTask()
|
|||||||
-- SEAD Mission --
|
-- SEAD Mission --
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
--[[
|
-- Add enroute task SEAD. Disabled that here because the group enganges everything on its route.
|
||||||
local DCStask=CONTROLLABLE.EnRouteTaskEngageTargets(nil, nil ,{"Air Defence"} , 0)
|
--local DCStask=CONTROLLABLE.EnRouteTaskSEAD(nil, self.TargetType)
|
||||||
table.insert(self.enrouteTasks, DCStask)
|
--table.insert(self.enrouteTasks, DCStask)
|
||||||
DCStask.key="SEAD"
|
|
||||||
]]
|
|
||||||
|
|
||||||
self:_GetDCSAttackTask(self.engageTarget, DCStasks)
|
self:_GetDCSAttackTask(self.engageTarget, DCStasks)
|
||||||
|
|
||||||
|
|||||||
@ -2949,6 +2949,9 @@ function LEGION:AssignAssetsForEscort(Cohorts, Assets, NescortMin, NescortMax, M
|
|||||||
-- For a SEAD mission, we also adjust the mission task.
|
-- For a SEAD mission, we also adjust the mission task.
|
||||||
if MissionType==AUFTRAG.Type.SEAD then
|
if MissionType==AUFTRAG.Type.SEAD then
|
||||||
escort.missionTask=ENUMS.MissionTask.SEAD
|
escort.missionTask=ENUMS.MissionTask.SEAD
|
||||||
|
-- Add enroute task SEAD.
|
||||||
|
local DCStask=CONTROLLABLE.EnRouteTaskSEAD(nil)
|
||||||
|
table.insert(escort.enrouteTasks, DCStask)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Reserve assts and add to mission.
|
-- Reserve assts and add to mission.
|
||||||
|
|||||||
@ -155,6 +155,18 @@
|
|||||||
-- -- Text-to speech with default voice after 30 seconds.
|
-- -- Text-to speech with default voice after 30 seconds.
|
||||||
-- msrs:PlaySoundText(text, 30)
|
-- msrs:PlaySoundText(text, 30)
|
||||||
--
|
--
|
||||||
|
-- Basic example of using another class (ATIS) with SRS and the DCS-gRPC backend (DCS-gRPC not previously started):
|
||||||
|
--
|
||||||
|
-- -- Start DCS-gRPC
|
||||||
|
-- GRPC.load()
|
||||||
|
-- -- Select the alternate DCS-gRPC backend for new MSRS instances
|
||||||
|
-- MSRS.SetDefaultBackendGRPC()
|
||||||
|
-- -- Create new ATIS as usual
|
||||||
|
-- atis=ATIS:New("Nellis", 251, radio.modulation.AM)
|
||||||
|
-- -- ATIS:SetSRS() expects a string for the SRS path even though it is not needed with DCS-gRPC
|
||||||
|
-- atis:SetSRS('')
|
||||||
|
-- -- Start ATIS
|
||||||
|
-- atis:Start()
|
||||||
--
|
--
|
||||||
-- @field #MSRS
|
-- @field #MSRS
|
||||||
MSRS = {
|
MSRS = {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user