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

Wingmen now report new targets

Browse Source
This commit is contained in:
Ambroise Garel 2025-07-25 18:41:00 +02:00
parent c2ed114217
commit 5d556ceb83
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Script/The Universal Mission/Wingmen.lua
View File

@ -6,11 +6,10 @@
TUM.wingmen = {} TUM.wingmen = {}
do do
local CONTACT_REPORT_INTERVAL = 8 -- onClockTick is called four times by minute, so multiply this by 15 seconds (CONTACT_REPORT_INTERVAL = 8 means "every 2 minutes")
local DEFAULT_PAYLOAD = "attack" -- Default payload local DEFAULT_PAYLOAD = "attack" -- Default payload
local knownGroupsID = {} local knownGroupsID = {}
local nextContactReportTick = CONTACT_REPORT_INTERVAL local newGroupsID = {}
local wingmenGroupID = nil local wingmenGroupID = nil
local wingmenUnitID = {} local wingmenUnitID = {}
@ -92,7 +91,7 @@ do
-- Reinitialize list of known contacts and contact report interval -- Reinitialize list of known contacts and contact report interval
knownGroupsID = {} knownGroupsID = {}
nextContactReportTick = CONTACT_REPORT_INTERVAL newGroupsID = {}
TUM.log("Spawned AI wingmen") TUM.log("Spawned AI wingmen")
@ -100,9 +99,7 @@ do
TUM.radio.playForAll("pilotWingmanRejoin", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true) TUM.radio.playForAll("pilotWingmanRejoin", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true)
end end
function TUM.wingmen.getContacts(groupCategory, newContactsOnly) function TUM.wingmen.getContacts(groupCategory)
newContactsOnly = newContactsOnly or false
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.mission.getStatus() == TUM.mission.status.NONE then return {} end if TUM.mission.getStatus() == TUM.mission.status.NONE then return {} end
local wingmenGroup = TUM.wingmen.getGroup() local wingmenGroup = TUM.wingmen.getGroup()
@ -148,10 +145,9 @@ do
local distanceToGroup = DCSEx.math.getDistance2D(gPos, searchPoint) local distanceToGroup = DCSEx.math.getDistance2D(gPos, searchPoint)
if distanceToGroup <= detectionRange then -- Check if wingman group is in detection range if distanceToGroup <= detectionRange then -- Check if wingman group is in detection range
local newGroup = false if not DCSEx.table.contains(knownGroupsID, gID) then
if not DCSEx.table.contains(knownGroupsID) then
table.insert(knownGroupsID, gID) table.insert(knownGroupsID, gID)
newGroup = true table.insert(newGroupsID, gID)
end end
local groupInfo = { local groupInfo = {
@ -168,13 +164,11 @@ do
groupInfo.type = Library.objectNames.getGenericGroup(g) groupInfo.type = Library.objectNames.getGenericGroup(g)
end end
else else
-- If above 2/3 max detection distance, return imprecise name ("vehicle" instead of "AAA"/"tank"/etc) --groupInfo.type = Library.objectNames.getGenericGroup(g, distanceToGroup > 2 * detectionRange / 3) -- If above 2/3 max detection distance, return imprecise name ("vehicle" instead of "AAA"/"tank"/etc)
groupInfo.type = Library.objectNames.getGenericGroup(g, distanceToGroup > 2 * detectionRange / 3) groupInfo.type = Library.objectNames.getGenericGroup(g)
end end
if not newContactsOnly or newGroup then table.insert(detectedTargets, groupInfo)
table.insert(detectedTargets, groupInfo)
end
end end
end end
end end
@ -182,20 +176,23 @@ do
return detectedTargets return detectedTargets
end end
function TUM.wingmen.getContactsAsReportString(groupCategory, newContactsOnly, giveRelativePosition) function TUM.wingmen.getContactsAsReportString(groupCategory, giveRelativePosition, newContactsOnly)
if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return nil end -- No wingmen in multiplayer
giveRelativePosition = giveRelativePosition or false giveRelativePosition = giveRelativePosition or false
local contacts = TUM.wingmen.getContacts(groupCategory, newContactsOnly) newContactsOnly = newContactsOnly or false
if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return nil end -- No wingmen in multiplayer
local contacts = TUM.wingmen.getContacts(groupCategory)
if not contacts or #contacts == 0 then return nil end if not contacts or #contacts == 0 then return nil end
local refPoint = DCSEx.world.getGroupCenter(TUM.wingmen.getGroup()) local refPoint = DCSEx.world.getGroupCenter(TUM.wingmen.getGroup())
local reportText = "" local reportText = ""
for _,t in ipairs(contacts) do for _,t in ipairs(contacts) do
reportText = reportText.."\n - "..tostring(t.size).."x "..t.type if not newContactsOnly or DCSEx.table.contains(newGroupsID, t.id) then
if refPoint and giveRelativePosition then reportText = reportText.."\n - "..tostring(t.size).."x "..t.type
reportText = reportText..", "..DCSEx.dcs.getBRAA(t.point2, refPoint, false, false, false) if refPoint and giveRelativePosition then
reportText = reportText..", "..DCSEx.dcs.getBRAA(t.point2, refPoint, false, false, false)
end
end end
end end
return reportText return reportText
@ -259,18 +256,15 @@ do
if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return false end -- No wingmen in multiplayer if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return false end -- No wingmen in multiplayer
if TUM.mission.getStatus() == TUM.mission.status.NONE then return false end if TUM.mission.getStatus() == TUM.mission.status.NONE then return false end
-- If new contacts are detected, report them immediately, no need to wait for next report tick TUM.wingmen.getContacts() -- Check for new contacts, just in case
-- local newContactsReportString = TUM.wingmen.getContactsAsReportString(nil, true, true) if #newGroupsID > 0 then -- New contacts found, alert the player!
-- if newContactsReportString then local newContactsReportString = TUM.wingmen.getContactsAsReportString(nil, true, true)
-- TUM.radio.playForAll("pilotWingmanReportContactsNew", { TUM.wingmen.getFirstWingmanNumber(), newContactsReportString }, TUM.wingmen.getFirstWingmanCallsign(), false) TUM.radio.playForAll("pilotWingmanReportContactsNew", { TUM.wingmen.getFirstWingmanNumber(), newContactsReportString }, TUM.wingmen.getFirstWingmanCallsign(), false)
-- return true newGroupsID = {}
-- end return true
end
nextContactReportTick = nextContactReportTick - 1 return false
if nextContactReportTick > 0 then return false end
nextContactReportTick = CONTACT_REPORT_INTERVAL
return TUM.wingmenTasking.commandReportContacts(nil, true, false)
end end
------------------------------------- -------------------------------------

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

@ -127,7 +127,7 @@ do
noReportIfNoContacts = noReportIfNoContacts or false noReportIfNoContacts = noReportIfNoContacts or false
delayRadioAnswer = delayRadioAnswer or false delayRadioAnswer = delayRadioAnswer or false
local reportString = TUM.wingmen.getContactsAsReportString(groupCategory, false, true) local reportString = TUM.wingmen.getContactsAsReportString(groupCategory, true)
if not reportString then if not reportString then
if noReportIfNoContacts then return false end if noReportIfNoContacts then return false end