From d2625303e97c3bdc1898226ba172907ae4956c1c Mon Sep 17 00:00:00 2001 From: Ambroise Garel <47314805+akaAgar@users.noreply.github.com> Date: Sat, 26 Jul 2025 19:49:50 +0200 Subject: [PATCH] Removed "go to map marker" wingman option for balance reasons --- Script/Library/RadioMessages.lua | 38 +++++++++---------- Script/The Universal Mission/WingmenMenu.lua | 19 +++++----- .../The Universal Mission/WingmenTasking.lua | 4 +- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Script/Library/RadioMessages.lua b/Script/Library/RadioMessages.lua index f01b27c..cb20d94 100644 --- a/Script/Library/RadioMessages.lua +++ b/Script/Library/RadioMessages.lua @@ -105,18 +105,18 @@ Library.radioMessages = { "$1, on target, commencing attack on $2.", "$1, weapons hot, engaging $2.", }, - pilotWingmanGoToMarker = { - "$1, copy. Pushing to waypoint now.", - "$1, on route to the coords, maintaining current alt.", - "$1, proceeding as briefed, on my way.", - "$1, moving to grid as planned.", - "$1, heading to the point." - }, - pilotWingmanGoToMarkerNoMarker = { - "$1, negative on coords, say again?", - "$1, copy, but I don't have the point. Confirm?", - "$1, can't push, no steerpoint." - }, + -- pilotWingmanGoToMarker = { + -- "$1, copy. Pushing to waypoint now.", + -- "$1, on route to the coords, maintaining current alt.", + -- "$1, proceeding as briefed, on my way.", + -- "$1, moving to grid as planned.", + -- "$1, heading to the point." + -- }, + -- pilotWingmanGoToMarkerNoMarker = { + -- "$1, negative on coords, say again?", + -- "$1, copy, but I don't have the point. Confirm?", + -- "$1, can't push, no steerpoint." + -- }, pilotWingmanOrbit = { "$1. Wilco, holding here.", "$1. Copy, orbiting now.", @@ -310,13 +310,13 @@ Library.radioMessages = { "Flight, strike $1 in your sector.", "Flight, take the lead on enemy $1.", }, -- "$1" should be "ships" in audio version - playerWingmanGoToMarker = { - "Flight, proceed to waypoint.", - "Flight, push to the hold point now.", - "Flight, push to station and hold.", - "Flight, set up in the assigned area.", - "Flight, move to designated steerpoint." - }, + -- playerWingmanGoToMarker = { + -- "Flight, proceed to waypoint.", + -- "Flight, push to the hold point now.", + -- "Flight, push to station and hold.", + -- "Flight, set up in the assigned area.", + -- "Flight, move to designated steerpoint." + -- }, playerWingmanOrbit = { "Flight, orbit your position.", "Flight, set up an orbit.", diff --git a/Script/The Universal Mission/WingmenMenu.lua b/Script/The Universal Mission/WingmenMenu.lua index 99db528..9c91b85 100644 --- a/Script/The Universal Mission/WingmenMenu.lua +++ b/Script/The Universal Mission/WingmenMenu.lua @@ -25,13 +25,13 @@ do TUM.wingmenTasking.commandEngage(args.category, args.attributes, true) end - local function radioCommandGoToMapMarker() - local player = world:getPlayer() - if not player then return end - TUM.radio.playForAll("playerWingmanGoToMarker", nil, player:getCallsign(), false) + -- local function radioCommandGoToMapMarker() + -- local player = world:getPlayer() + -- if not player then return end + -- TUM.radio.playForAll("playerWingmanGoToMarker", nil, player:getCallsign(), false) - TUM.wingmenTasking.commandGoToMapMarker(TUM.wingmenTasking.DEFAULT_MARKER_TEXT, true) - end + -- TUM.wingmenTasking.commandGoToMapMarker(TUM.wingmenTasking.DEFAULT_MARKER_TEXT, true) + -- end local function radioCommandOrbit() local player = world:getPlayer() @@ -67,7 +67,6 @@ do function TUM.wingmenMenu.create() if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return end -- No wingmen in multiplayer - -- TODO: if WINGMEN_COUNT == 0 then return end local rootPath = missionCommands.addSubMenu("✈ Flight") missionCommands.addCommand("Cover me!", rootPath, radioCommandCoverMe, nil) @@ -113,10 +112,10 @@ do missionCommands.addCommand("Cargo ships", engageSubPath, radioCommandEngage, { attributes = { "Unarmed ships" }, category = Group.Category.SHIP, radioMessageSuffix = "Ships", radioTargetName = "cargo ships" }) ------------------------------------------------------ + -- missionCommands.addCommand("Go to map marker "..TUM.wingmenTasking.DEFAULT_MARKER_TEXT:upper(), rootPath, radioCommandGoToMapMarker, nil) missionCommands.addCommand("Report contacts", rootPath, radioCommandReportContacts, nil) - missionCommands.addCommand("Status", rootPath, radioCommandReportStatus, nil) - missionCommands.addCommand("Go to map marker "..TUM.wingmenTasking.DEFAULT_MARKER_TEXT:upper(), rootPath, radioCommandGoToMapMarker, nil) - missionCommands.addCommand("Hold", rootPath, radioCommandOrbit, nil) + missionCommands.addCommand("Hold position", rootPath, radioCommandOrbit, nil) missionCommands.addCommand("Rejoin", rootPath, radioCommandRejoin, nil) + missionCommands.addCommand("Status", rootPath, radioCommandReportStatus, nil) end end diff --git a/Script/The Universal Mission/WingmenTasking.lua b/Script/The Universal Mission/WingmenTasking.lua index 5f8f216..2611537 100644 --- a/Script/The Universal Mission/WingmenTasking.lua +++ b/Script/The Universal Mission/WingmenTasking.lua @@ -140,13 +140,13 @@ do allowWeaponUse(wingmenCtrl, false) if not mapMarker then - TUM.radio.playForAll("pilotWingmanGoToMarkerNoMarker", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true) + -- TUM.radio.playForAll("pilotWingmanGoToMarkerNoMarker", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true) return end currentTargetedGroupID = nil wingmenCtrl:setTask(getOrbitTaskTable(DCSEx.math.vec3ToVec2(mapMarker.pos))) - TUM.radio.playForAll("pilotWingmanGoToMarker", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true) + -- TUM.radio.playForAll("pilotWingmanGoToMarker", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true) end function TUM.wingmenTasking.commandOrbit(delayRadioAnswer)