mirror of
https://github.com/akaAgar/the-universal-mission-for-dcs-world.git
synced 2026-08-23 01:41:17 +00:00
Fixed bugs and tweaked wording in attack tasking/report messages
This commit is contained in:
@@ -711,7 +711,7 @@ do
|
|||||||
-- Pick the unit name highest in priority
|
-- Pick the unit name highest in priority
|
||||||
local groupName = nil
|
local groupName = nil
|
||||||
for _,n in ipairs(GROUP_PRIORITY) do
|
for _,n in ipairs(GROUP_PRIORITY) do
|
||||||
if DCSEx.table.contains(unitNames) then
|
if DCSEx.table.contains(unitNames, n) then
|
||||||
groupName = n
|
groupName = n
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
@@ -719,7 +719,7 @@ do
|
|||||||
if not groupName then return "unknown" end
|
if not groupName then return "unknown" end
|
||||||
|
|
||||||
if groupName == "SAM search radar" or groupName == "SAM launcher" or groupName == "SAM tracking radar" then
|
if groupName == "SAM search radar" or groupName == "SAM launcher" or groupName == "SAM tracking radar" then
|
||||||
return "SAM vehicle"
|
return "SAM element"
|
||||||
end
|
end
|
||||||
|
|
||||||
return groupName
|
return groupName
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ do
|
|||||||
|
|
||||||
-- Ground -- (radioTargetName must be singular)
|
-- Ground -- (radioTargetName must be singular)
|
||||||
engageSubPath = missionCommands.addSubMenu("Ground", engagePath)
|
engageSubPath = missionCommands.addSubMenu("Ground", engagePath)
|
||||||
missionCommands.addCommand("Any vehicles", engageSubPath, radioCommandEngage, { attributes = {"Tanks", "Trucks", "Artillery", "IFV", "APC"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "ground" })
|
missionCommands.addCommand("Any ground vehicles", engageSubPath, radioCommandEngage, { attributes = {"Tanks", "Trucks", "Artillery", "IFV", "APC"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "ground" })
|
||||||
missionCommands.addCommand("Armor", engageSubPath, radioCommandEngage, { attributes = {"Tanks", "IFV", "APC"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "armor" })
|
missionCommands.addCommand("Armor", engageSubPath, radioCommandEngage, { attributes = {"Tanks", "IFV", "APC"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "armor" })
|
||||||
missionCommands.addCommand("Artillery", engageSubPath, radioCommandEngage, { attributes = {"Artillery"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "artillery" })
|
missionCommands.addCommand("Artillery", engageSubPath, radioCommandEngage, { attributes = {"Artillery"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "artillery" })
|
||||||
missionCommands.addCommand("Infantry", engageSubPath, radioCommandEngage, { attributes = {"Infantry"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "infantry" })
|
missionCommands.addCommand("Infantry", engageSubPath, radioCommandEngage, { attributes = {"Infantry"}, category = Group.Category.GROUND, radioMessageSuffix = "Ground", radioTargetName = "infantry" })
|
||||||
|
|||||||
@@ -191,17 +191,17 @@ do
|
|||||||
allowWeaponUse(wingmenCtrl, true)
|
allowWeaponUse(wingmenCtrl, true)
|
||||||
wingmenCtrl:setTask(taskTable)
|
wingmenCtrl:setTask(taskTable)
|
||||||
|
|
||||||
local targetBRAA = ""
|
local targetBRAA = "distance unknown"
|
||||||
local targetInfo = nil
|
local targetInfo = nil
|
||||||
local messageSuffix = nil
|
local messageSuffix = nil
|
||||||
if target:inAir() then
|
if target:inAir() then
|
||||||
messageSuffix = "Air"
|
messageSuffix = "Air"
|
||||||
targetInfo = Library.objectNames.getGeneric(target)
|
targetInfo = Library.objectNames.get(target) -- Library.objectNames.getGeneric(target)
|
||||||
targetBRAA = targetInfo..DCSEx.dcs.getBRAA(target:getPoint(), wingmenPosition, true)
|
targetBRAA = DCSEx.dcs.getBRAA(target:getPoint(), wingmenPosition, true)
|
||||||
else
|
else
|
||||||
messageSuffix = "Surface"
|
messageSuffix = "Surface"
|
||||||
targetInfo = Library.objectNames.getGeneric(target)
|
targetInfo = Library.objectNames.get(target) -- Library.objectNames.getGeneric(target)
|
||||||
targetBRAA = targetInfo..DCSEx.dcs.getBRAA(target:getPoint(), wingmenPosition, false)
|
targetBRAA = DCSEx.dcs.getBRAA(target:getPoint(), wingmenPosition, false)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Mark the last targeted point in debug mode
|
-- Mark the last targeted point in debug mode
|
||||||
|
|||||||
Reference in New Issue
Block a user