weyne/the-universal-mission-for-dcs-world
1
0
Fork 0
mirror of https://github.com/akaAgar/the-universal-mission-for-dcs-world.git synced 2025-11-25 19:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed "go to map marker" wingman option for balance reasons

Browse Source
This commit is contained in:
Ambroise Garel 2025-07-26 19:49:50 +02:00
parent eca14ba80d
commit d2625303e9
3 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Script/Library/RadioMessages.lua
View File

@ -105,18 +105,18 @@ Library.radioMessages = {
"$1, on target, commencing attack on $2.", "$1, on target, commencing attack on $2.",
"$1, weapons hot, engaging $2.", "$1, weapons hot, engaging $2.",
}, },
pilotWingmanGoToMarker = { -- pilotWingmanGoToMarker = {
"$1, copy. Pushing to waypoint now.", -- "$1, copy. Pushing to waypoint now.",
"$1, on route to the coords, maintaining current alt.", -- "$1, on route to the coords, maintaining current alt.",
"$1, proceeding as briefed, on my way.", -- "$1, proceeding as briefed, on my way.",
"$1, moving to grid as planned.", -- "$1, moving to grid as planned.",
"$1, heading to the point." -- "$1, heading to the point."
}, -- },
pilotWingmanGoToMarkerNoMarker = { -- pilotWingmanGoToMarkerNoMarker = {
"$1, negative on coords, say again?", -- "$1, negative on coords, say again?",
"$1, copy, but I don't have the point. Confirm?", -- "$1, copy, but I don't have the point. Confirm?",
"$1, can't push, no steerpoint." -- "$1, can't push, no steerpoint."
}, -- },
pilotWingmanOrbit = { pilotWingmanOrbit = {
"$1. Wilco, holding here.", "$1. Wilco, holding here.",
"$1. Copy, orbiting now.", "$1. Copy, orbiting now.",
@ -310,13 +310,13 @@ Library.radioMessages = {
"Flight, strike $1 in your sector.", "Flight, strike $1 in your sector.",
"Flight, take the lead on enemy $1.", "Flight, take the lead on enemy $1.",
}, -- "$1" should be "ships" in audio version }, -- "$1" should be "ships" in audio version
playerWingmanGoToMarker = { -- playerWingmanGoToMarker = {
"Flight, proceed to waypoint.", -- "Flight, proceed to waypoint.",
"Flight, push to the hold point now.", -- "Flight, push to the hold point now.",
"Flight, push to station and hold.", -- "Flight, push to station and hold.",
"Flight, set up in the assigned area.", -- "Flight, set up in the assigned area.",
"Flight, move to designated steerpoint." -- "Flight, move to designated steerpoint."
}, -- },
playerWingmanOrbit = { playerWingmanOrbit = {
"Flight, orbit your position.", "Flight, orbit your position.",
"Flight, set up an orbit.", "Flight, set up an orbit.",

19
Script/The Universal Mission/WingmenMenu.lua
View File

@ -25,13 +25,13 @@ do
TUM.wingmenTasking.commandEngage(args.category, args.attributes, true) TUM.wingmenTasking.commandEngage(args.category, args.attributes, true)
end end
local function radioCommandGoToMapMarker() -- local function radioCommandGoToMapMarker()
local player = world:getPlayer() -- local player = world:getPlayer()
if not player then return end -- if not player then return end
TUM.radio.playForAll("playerWingmanGoToMarker", nil, player:getCallsign(), false) -- TUM.radio.playForAll("playerWingmanGoToMarker", nil, player:getCallsign(), false)
TUM.wingmenTasking.commandGoToMapMarker(TUM.wingmenTasking.DEFAULT_MARKER_TEXT, true) -- TUM.wingmenTasking.commandGoToMapMarker(TUM.wingmenTasking.DEFAULT_MARKER_TEXT, true)
end -- end
local function radioCommandOrbit() local function radioCommandOrbit()
local player = world:getPlayer() local player = world:getPlayer()
@ -67,7 +67,6 @@ 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
-- TODO: if WINGMEN_COUNT == 0 then return end
local rootPath = missionCommands.addSubMenu("✈ Flight") local rootPath = missionCommands.addSubMenu("✈ Flight")
missionCommands.addCommand("Cover me!", rootPath, radioCommandCoverMe, nil) 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("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("Report contacts", rootPath, radioCommandReportContacts, nil)
missionCommands.addCommand("Status", rootPath, radioCommandReportStatus, nil) missionCommands.addCommand("Hold position", rootPath, radioCommandOrbit, nil)
missionCommands.addCommand("Go to map marker "..TUM.wingmenTasking.DEFAULT_MARKER_TEXT:upper(), rootPath, radioCommandGoToMapMarker, nil)
missionCommands.addCommand("Hold", rootPath, radioCommandOrbit, nil)
missionCommands.addCommand("Rejoin", rootPath, radioCommandRejoin, nil) missionCommands.addCommand("Rejoin", rootPath, radioCommandRejoin, nil)
missionCommands.addCommand("Status", rootPath, radioCommandReportStatus, nil)
end end
end end

4
Script/The Universal Mission/WingmenTasking.lua
View File

@ -140,13 +140,13 @@ do
allowWeaponUse(wingmenCtrl, false) allowWeaponUse(wingmenCtrl, false)
if not mapMarker then 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 return
end end
currentTargetedGroupID = nil currentTargetedGroupID = nil
wingmenCtrl:setTask(getOrbitTaskTable(DCSEx.math.vec3ToVec2(mapMarker.pos))) 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 end
function TUM.wingmenTasking.commandOrbit(delayRadioAnswer) function TUM.wingmenTasking.commandOrbit(delayRadioAnswer)