From d603a3d8a1263a8af4c9bf69703c34e1c836cf7f Mon Sep 17 00:00:00 2001 From: Ambroise Garel <47314805+akaAgar@users.noreply.github.com> Date: Tue, 29 Jul 2025 16:26:52 +0200 Subject: [PATCH] Added TUM.mission.getPlayerCallsign() --- Script/The Universal Mission/Mission.lua | 8 ++++++- Script/The Universal Mission/MissionMenu.lua | 22 ++++++++++--------- Script/The Universal Mission/SupportAWACS.lua | 4 ++-- Script/The Universal Mission/SupportJTAC.lua | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Script/The Universal Mission/Mission.lua b/Script/The Universal Mission/Mission.lua index 7be86a4..22d3ceb 100644 --- a/Script/The Universal Mission/Mission.lua +++ b/Script/The Universal Mission/Mission.lua @@ -106,6 +106,12 @@ do objectivesReminderIntervalLeft = OBJECTIVES_REMINDER_INTERVAL end + function TUM.mission.getPlayerCallsign() + local player = world.getPlayer() + if player then return player:getCallsign() end + return "Flight" + end + function TUM.mission.getSummaryString(onlyShowIncomplete, doublePercentage) onlyShowIncomplete = onlyShowIncomplete or false if missionStatus == TUM.mission.status.NONE then return "" end @@ -119,7 +125,7 @@ do if not o.completed or not onlyShowIncomplete then local bulletCharacter = "⬤" if validObjCount == 1 then bulletCharacter = "❶" - elseif validObjCount == 2 then bulletCharacter = "⬤" + elseif validObjCount == 2 then bulletCharacter = "❷" elseif validObjCount == 3 then bulletCharacter = "❸" elseif validObjCount == 4 then bulletCharacter = "❹" elseif validObjCount == 5 then bulletCharacter = "❺" diff --git a/Script/The Universal Mission/MissionMenu.lua b/Script/The Universal Mission/MissionMenu.lua index 23e3967..fc65d99 100644 --- a/Script/The Universal Mission/MissionMenu.lua +++ b/Script/The Universal Mission/MissionMenu.lua @@ -11,26 +11,28 @@ do end local function doCommandMissionStatus() - TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerCommandMissionStatus", nil, "Flight", false) + TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerCommandMissionStatus", nil, TUM.mission.getPlayerCallsign(), false) TUM.mission.playMissionSummaryRadioMessage(false, true) end - -- local function doCommandNearestAirbase(index) - -- local obj = TUM.objectives.getObjective(index) - -- if not obj then return end - - -- TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerATCRequireNearestAirbase", { obj.name }, "Flight", false) - -- TUM.atc.requestNavAssistanceToAirbase(false) - -- end + local function doCommandNearestAirbase() + TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerATCRequireNearestAirbase", nil, TUM.mission.getPlayerCallsign(), false) + TUM.atc.requestNavAssistanceToAirbase(false) + end local function doCommandObjectiveLocation(index) local obj = TUM.objectives.getObjective(index) if not obj then return end - TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerCommandRequireObjectives", { obj.name }, "Flight", false) + TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerCommandRequireObjectives", { obj.name }, TUM.mission.getPlayerCallsign(), false) TUM.atc.requestNavAssistanceToObjective(index, true) end + local function doCommandWeatherUpdate() + TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerATCWeatherUpdate", nil, TUM.mission.getPlayerCallsign(), false) + TUM.atc.requestWeatherUpdate(false) + end + function TUM.missionMenu.create() missionCommands.removeItem() -- Clear the menu missionCommands.addCommand("☱ Mission status", nil, doCommandMissionStatus, nil) @@ -49,7 +51,7 @@ do missionCommands.addCommand("Nav to objective "..objNameAndDescription, navigationMenuRoot, doCommandObjectiveLocation, i) end end - + -- missionCommands.addCommand("Weather update", navigationMenuRoot, doCommandWeatherUpdate, nil) TUM.wingmenMenu.create() TUM.supportAWACS.createMenu() diff --git a/Script/The Universal Mission/SupportAWACS.lua b/Script/The Universal Mission/SupportAWACS.lua index d697ea0..eeaf683 100644 --- a/Script/The Universal Mission/SupportAWACS.lua +++ b/Script/The Universal Mission/SupportAWACS.lua @@ -68,12 +68,12 @@ do end local function doCommandPicture() - TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerAwacsPicture", { awacsCallsign }, "Flight", false) + TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerAwacsPicture", { awacsCallsign }, TUM.mission.getPlayerCallsign(), false) doAwacsPicture(false, true) end local function doCommandBogeyDope() - TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerAwacsBogeyDope", { awacsCallsign }, "Flight", false) + TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerAwacsBogeyDope", { awacsCallsign }, TUM.mission.getPlayerCallsign(), false) doAwacsPicture(true, true) end diff --git a/Script/The Universal Mission/SupportJTAC.lua b/Script/The Universal Mission/SupportJTAC.lua index 14741b8..d4e70a0 100644 --- a/Script/The Universal Mission/SupportJTAC.lua +++ b/Script/The Universal Mission/SupportJTAC.lua @@ -47,7 +47,7 @@ do local smokeColorName = "red" if smokeColor == trigger.smokeColor.Orange then smokeColorName = "orange" end - TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerJTACSmoke", { jtacName[index], obj.name }, "Flight", false) + TUM.radio.playForCoalition(TUM.settings.getPlayerCoalition(), "playerJTACSmoke", { jtacName[index], obj.name }, TUM.mission.getPlayerCallsign(), false) if not lastSmoke[index] then lastSmoke[index] = -3600 end if lastSmoke[index] + SMOKE_DURATION > timer.getAbsTime() then