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

Added TUM.wingmen.getContactsAsReportString function

Browse Source
This commit is contained in:
Ambroise Garel 2025-07-25 15:51:29 +02:00
parent e39e1d529d
commit 86bb698167
3 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Script/Script.lua
View File

@ -141,14 +141,14 @@ do
if TUM.mission.onClockTick() then return nextTickTime end
elseif clockTick % 4 == 1 then
if TUM.airForce.onClockTick(TUM.settings.getPlayerCoalition()) then return nextTickTime end
if TUM.wingmen.onClockTick() then return nextTickTime end
elseif clockTick % 4 == 2 then
if TUM.supportAWACS.onClockTick() then return nextTickTime end
else
if TUM.airForce.onClockTick(TUM.settings.getEnemyCoalition()) then return nextTickTime end
if TUM.wingmen.onClockTick() then return nextTickTime end
end
if TUM.wingmen.onClockTick() then return nextTickTime end
return nextTickTime
end

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

@ -6,13 +6,11 @@
TUM.wingmen = {}
do
local CONTACT_REPORT_INTERVAL = 4 -- onClockTick is called twice by minute, so multiply this by 30 seconds (CONTACT_REPORT_INTERVAL = 4 means "every 2 minutes")
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 WINGMEN_COUNT = 2 -- TODO: load from setting
local knownContacts = {}
local newContacts = {}
local nextContactReport = CONTACT_REPORT_INTERVAL
local nextContactReportTick = CONTACT_REPORT_INTERVAL
local wingmenGroupID = nil
local wingmenUnitID = {}
@ -68,14 +66,13 @@ do
end
-- Select proper payload for mission
local groupInfo = DCSEx.unitGroupMaker.create(
TUM.settings.getPlayerCoalition(),
playerCategory,
DCSEx.math.randomPointInCircle(DCSEx.math.vec3ToVec2(player:getPoint()), 500, 250),
{ playerTypeName, playerTypeName },
{
altitude = player:getPoint().y + 762.0, -- spawn at player altitude + 2500ft
altitude = math.min(player:getPoint().y + 1524, 3048), -- spawn at player altitude + 5,000ft, up to a max of 10,000ft (to avoid crashes into nearby hills)
callsign = wingmanCallsign,
callsignOffset = 1,
payload = getWingmanPayloadForMission(),
@ -93,9 +90,9 @@ do
wingmenGroupID = groupInfo.groupID
wingmenUnitID = DCSEx.table.deepCopy(groupInfo.unitsID)
-- Reinitialize list of known contacts and contact report interval
knownContacts = {}
newContacts = {}
nextContactReport = CONTACT_REPORT_INTERVAL
nextContactReportTick = CONTACT_REPORT_INTERVAL
TUM.log("Spawned AI wingmen")
@ -103,20 +100,15 @@ do
TUM.radio.playForAll("pilotWingmanRejoin", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true)
end
function TUM.wingmen.getContacts(groupCategory)
function TUM.wingmen.getContacts(groupCategory, newContactsOnly)
newContactsOnly = newContactsOnly or false
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 #wingmenUnitID == 0 then return {} end
local wingmenGroup = TUM.wingmen.getGroup()
if not wingmenGroup then return {} end
-- Build a list of all wingmen coordinates, from which the search will take place
local searchPoints = {}
for i=1,#wingmenUnitID do
local u = DCSEx.world.getUnitByID(wingmenUnitID[i])
if u then
table.insert(searchPoints, DCSEx.math.vec3ToVec2(u:getPoint()))
end
end
if #searchPoints == 0 then return {} end
local searchPoint = DCSEx.world.getGroupCenter(wingmenGroup)
-- Take into account better sensors (radars, TGPs...) in later periods
local detectionRangeMultiplier = 1.0
@ -126,12 +118,11 @@ do
detectionRangeMultiplier = 1.25
end
local knownGroups = {}
local detectedTargets = {}
local allGroups = coalition.getGroups(TUM.settings.getEnemyCoalition(), groupCategory)
for _,g in ipairs(allGroups) do
local gID = g:getID()
if g:isExist() and g:getSize() > 0 and not DCSEx.table.contains(knownGroups, gID) then
if g:isExist() and g:getSize() > 0 then
local gPos = DCSEx.world.getGroupCenter(g)
local gCateg = Group.getCategory(g)
@ -160,19 +151,16 @@ do
-- Check if at least one wingman is in detection range
local inRange = false
for _,p in ipairs(searchPoints) do
if DCSEx.math.getDistance2D(gPos, p) <= detectionRange then
inRange = true
break
end
if DCSEx.math.getDistance2D(gPos, searchPoint) <= detectionRange then
inRange = true
break
end
if inRange then
table.insert(knownGroups, gID)
local newGroup = false
if not DCSEx.table.contains(knownContacts) then
table.insert(knownContacts, gID)
table.insert(newContacts, gID)
newGroup = true
end
local groupInfo = {
@ -200,7 +188,9 @@ do
groupInfo.type = "trains"
end
table.insert(detectedTargets, groupInfo)
if not newContactsOnly or newGroup then
table.insert(detectedTargets, groupInfo)
end
end
end
end
@ -208,6 +198,27 @@ do
return detectedTargets
end
function TUM.wingmen.getContactsAsReportString(groupCategory, newContactsOnly, giveRelativePositionToPlayer)
giveRelativePositionToPlayer = giveRelativePositionToPlayer or false
local contacts = TUM.wingmen.getContacts(groupCategory, newContactsOnly)
if not contacts or #contacts == 0 then return nil end
local player = world:getPlayer()
local refPoint = nil
if player then
refPoint = DCSEx.math.vec3ToVec2(player:getPoint())
end
local reportText = ""
for _,t in ipairs(contacts) do
reportText = reportText.."\n - "..tostring(t.size).."x "..t.type
if refPoint and giveRelativePositionToPlayer then
reportText = reportText..", "..DCSEx.dcs.getBRAA(t.point2, refPoint, false, false, false).." from you"
end
end
return reportText
end
function TUM.wingmen.getController()
local wingmenGroup = TUM.wingmen.getGroup()
if not wingmenGroup then return nil end
@ -237,7 +248,8 @@ do
if not wingmenGroupID then return nil end
local wingmenGroup = DCSEx.world.getGroupByID(wingmenGroupID)
if not wingmenGroup then return nil end
if #wingmenGroup:getUnits() == 0 then return nil end
-- if #wingmenGroup:getUnits() <= 0 then return nil end
if wingmenGroup:getSize() <= 0 then return nil end
return wingmenGroup
end
@ -252,6 +264,11 @@ do
wingmenUnitID = {}
end
function TUM.wingmen.updateContacts()
if TUM.settings.getValue(TUM.settings.id.MULTIPLAYER) then return nil end -- No wingmen in multiplayer
if not wingmenGroupID then return end
end
----------------------------------------------------------
-- Called on every mission update tick (every 10-20 seconds)
-- @return True if something was done this tick, false otherwise
@ -260,9 +277,16 @@ do
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
nextContactReport = nextContactReport - 1
if nextContactReport > 0 then return false end
nextContactReport = CONTACT_REPORT_INTERVAL
-- If new contacts are detected, report them immediately, no need to wait for next report tick
local newContactsReportString = TUM.wingmen.getContactsAsReportString(nil, true, true)
if newContactsReportString then
TUM.radio.playForAll("pilotWingmanReportContactsNew", { TUM.wingmen.getFirstWingmanNumber(), newContactsReportString }, TUM.wingmen.getFirstWingmanCallsign(), false)
return true
end
nextContactReportTick = nextContactReportTick - 1
if nextContactReportTick > 0 then return false end
nextContactReportTick = CONTACT_REPORT_INTERVAL
return TUM.wingmenTasking.commandReportContacts(nil, true, false)
end

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

@ -127,18 +127,14 @@ do
delayRadioAnswer = delayRadioAnswer or false
noReportIfNoContacts = noReportIfNoContacts or false
local detectedTargets = TUM.wingmen.getContacts(groupCategory)
local reportString = TUM.wingmen.getContactsAsReportString(groupCategory, false, true)
if not detectedTargets or #detectedTargets == 0 then
if not reportString then
if noReportIfNoContacts then return false end
TUM.radio.playForAll("pilotWingmanReportContactsNoJoy", { TUM.wingmen.getFirstWingmanNumber() }, TUM.wingmen.getFirstWingmanCallsign(), true)
return true
else
local reportText = ""
for _,t in ipairs(detectedTargets) do
reportText = reportText.."\n - "..tostring(t.size).."x "..t.type..", "..DCSEx.dcs.getBRAA(t.point2, DCSEx.math.vec3ToVec2(world:getPlayer():getPoint()), false, false, false).." from you"
end
TUM.radio.playForAll("pilotWingmanReportContacts", { TUM.wingmen.getFirstWingmanNumber(), reportText }, TUM.wingmen.getFirstWingmanCallsign(), delayRadioAnswer)
TUM.radio.playForAll("pilotWingmanReportContacts", { TUM.wingmen.getFirstWingmanNumber(), reportString }, TUM.wingmen.getFirstWingmanCallsign(), delayRadioAnswer)
return true
end
end