FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Applevangelist 2024-03-09 17:24:58 +01:00
commit 032e73d382
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Moose Development/Moose/Ops/OpsGroup.lua
View File

@ -508,7 +508,7 @@ OPSGROUP.CargoStatus={
--- OpsGroup version. --- OpsGroup version.
-- @field #string version -- @field #string version
OPSGROUP.version="1.0.0" OPSGROUP.version="1.0.1"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list -- TODO list
@ -554,11 +554,16 @@ function OPSGROUP:New(group)
-- Check if group exists. -- Check if group exists.
if self.group then if self.group then
if not self:IsExist() then if not self:IsExist() then
self:T(self.lid.."ERROR: GROUP does not exist! Returning nil") self:E(self.lid.."ERROR: GROUP does not exist! Returning nil")
return nil return nil
end end
end end
if UTILS.IsInstanceOf(group,"OPSGROUP") then
self:E(self.lid.."ERROR: GROUP is already an OPSGROUP: "..tostring(self.groupname).."!")
return group
end
-- Set the template. -- Set the template.
self:_SetTemplate() self:_SetTemplate()
@ -592,32 +597,33 @@ function OPSGROUP:New(group)
if units then if units then
local masterunit=units[1] --Wrapper.Unit#UNIT local masterunit=units[1] --Wrapper.Unit#UNIT
-- Get Descriptors. if unit then
self.descriptors=masterunit:GetDesc() -- Get Descriptors.
self.descriptors=masterunit:GetDesc()
-- Set type name. -- Set type name.
self.actype=masterunit:GetTypeName() self.actype=masterunit:GetTypeName()
-- Is this a submarine. -- Is this a submarine.
self.isSubmarine=masterunit:HasAttribute("Submarines") self.isSubmarine=masterunit:HasAttribute("Submarines")
-- Has this a datalink? -- Has this a datalink?
self.isEPLRS=masterunit:HasAttribute("Datalink") self.isEPLRS=masterunit:HasAttribute("Datalink")
if self:IsFlightgroup() then if self:IsFlightgroup() then
self.rangemax=self.descriptors.range and self.descriptors.range*1000 or 500*1000 self.rangemax=self.descriptors.range and self.descriptors.range*1000 or 500*1000
self.ceiling=self.descriptors.Hmax self.ceiling=self.descriptors.Hmax
self.tankertype=select(2, masterunit:IsTanker()) self.tankertype=select(2, masterunit:IsTanker())
self.refueltype=select(2, masterunit:IsRefuelable()) self.refueltype=select(2, masterunit:IsRefuelable())
--env.info("DCS Unit BOOM_AND_RECEPTACLE="..tostring(Unit.RefuelingSystem.BOOM_AND_RECEPTACLE)) --env.info("DCS Unit BOOM_AND_RECEPTACLE="..tostring(Unit.RefuelingSystem.BOOM_AND_RECEPTACLE))
--env.info("DCS Unit PROBE_AND_DROGUE="..tostring(Unit.RefuelingSystem.PROBE_AND_DROGUE)) --env.info("DCS Unit PROBE_AND_DROGUE="..tostring(Unit.RefuelingSystem.PROBE_AND_DROGUE))
end
end end
end end
-- Init set of detected units. -- Init set of detected units.