weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '153-add-ability-to-take-control-of-existing-units-from-me'

Browse Source
This commit is contained in:
Pax1601
2023-06-13 17:07:21 +02:00
parent 27b56deb45 4f2debeb4f
commit 6c24533393
20 changed files with 370 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/OlympusCommand.lua
View File

@@ -98,13 +98,14 @@ function Olympus.buildEnrouteTask(options)
end
-- Builds a valid task depending on the provided options
function Olympus.buildTask(options)
function Olympus.buildTask(groupName, options)
local task = nil
local group = Group.getByName(groupName)
if (Olympus.isArray(options)) then
local tasks = {}
for idx, subOptions in pairs(options) do
tasks[idx] = Olympus.buildTask(subOptions) or Olympus.buildEnrouteTask(subOptions)
tasks[idx] = Olympus.buildTask(groupName, subOptions) or Olympus.buildEnrouteTask(subOptions)
end
task = {
id = 'ComboTask',
@@ -139,6 +140,25 @@ function Olympus.buildTask(options)
pattern = options['pattern'] or "Circle"
}
}
if options['altitude'] then
if options ['altitudeType'] then
if options ['altitudeType'] == "AGL" then
local groundHeight = 0
if group then
local groupPos = mist.getLeadPos(group)
groundHeight = land.getHeight({x = groupPos.x, y = groupPos.z})
end
task['params']['altitude'] = groundHeight + options['altitude']
else
task['params']['altitude'] = options['altitude']
end
else
task['params']['altitude'] = options['altitude']
end
end
if options['speed'] then
task['params']['speed'] = options['speed']
end
elseif options['id'] == 'Bombing' and options['lat'] and options['lng'] then
local point = coord.LLtoLO(options['lat'], options['lng'], 0)
task = {
@@ -524,7 +544,7 @@ function Olympus.setTask(groupName, taskOptions)
Olympus.debug("Olympus.setTask " .. groupName .. " " .. Olympus.serializeTable(taskOptions), 2)
local group = Group.getByName(groupName)
if group then
local task = Olympus.buildTask(taskOptions);
local task = Olympus.buildTask(groupName, taskOptions);
Olympus.debug("Olympus.setTask " .. Olympus.serializeTable(task), 20)
if task then
group:getController():setTask(task)
@@ -664,7 +684,7 @@ function Olympus.setMissionData(arg, time)
for index, unit in pairs(group:getUnits()) do
local unitController = unit:getController()
local table = {}
table["targets"] = {}
table["contacts"] = {}
for i, target in ipairs(controllerTargets) do
for det, enum in pairs(Controller.Detection) do
@@ -673,7 +693,7 @@ function Olympus.setMissionData(arg, time)
if detected then
target["detectionMethod"] = det
table["targets"][#table["targets"] + 1] = target
table["contacts"][#table["contacts"] + 1] = target
end
end
end