Fixed bugs with "cover me!" and "task done, rejoining" messages

This commit is contained in:
Ambroise Garel 2025-07-28 10:38:36 +02:00
parent 669dd72189
commit 1ccf74d6db
2 changed files with 4 additions and 5 deletions

View File

@ -15,11 +15,11 @@ do
TUM.wingmenTasking.commandChangeAltitude(args.altitudeFraction, true) TUM.wingmenTasking.commandChangeAltitude(args.altitudeFraction, true)
end end
local function radioCommandCoverMe(args) local function radioCommandCoverMe()
local player = world:getPlayer() local player = world:getPlayer()
if not player then return end if not player then return end
TUM.radio.playForAll("playerWingmanCoverMe"..args.radioMessageSuffix, nil, player:getCallsign(), false) TUM.radio.playForAll("playerWingmanCoverMe", nil, player:getCallsign(), false)
TUM.wingmenTasking.commandEngage(Group.Category.AIRPLANE, { "Fighters", "Interceptors", "Multirole fighters" } , true) TUM.wingmenTasking.commandEngage(Group.Category.AIRPLANE, { "Fighters", "Interceptors", "Multirole fighters" } , true)
end end
@ -77,12 +77,11 @@ do
function TUM.wingmenMenu.create() function TUM.wingmenMenu.create()
if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return end -- No wingmen in multiplayer if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return end -- No wingmen in multiplayer
if TUM.settings.getValue(TUM.settings.id.WINGMEN) <= 1 then return end -- No wingmen if TUM.settings.getValue(TUM.settings.id.WINGMEN) <= 1 then return end -- No wingmen
local isWW2 = (TUM.settings.getValue(TUM.settings) == DCSEx.enums.timePeriod.WORLD_WAR_2) -- Some options are different when time period is WW2
local rootPath = missionCommands.addSubMenu("✈ Flight") local rootPath = missionCommands.addSubMenu("✈ Flight")
missionCommands.addCommand("Cover me!", rootPath, radioCommandCoverMe, nil) missionCommands.addCommand("Cover me!", rootPath, radioCommandCoverMe, nil)
local isWW2 = (TUM.settings.getValue(TUM.settings) == DCSEx.enums.timePeriod.WORLD_WAR_2)
------------------------------------------------------ ------------------------------------------------------
-- "Engage targets" submenu -- "Engage targets" submenu
------------------------------------------------------ ------------------------------------------------------

View File

@ -393,7 +393,7 @@ do
-- No tasking? Rejoin leader -- No tasking? Rejoin leader
local wingmenCtrl = TUM.wingmen:getController() local wingmenCtrl = TUM.wingmen:getController()
if wingmenCtrl and not wingmenCtrl:hasTask() then if wingmenCtrl and not wingmenCtrl:hasTask() then
TUM.wingmenTasking.commandRejoin(nil, false) TUM.wingmenTasking.commandRejoin(nil, false, false, true)
return return
end end