mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
#fixes
This commit is contained in:
parent
23740d12eb
commit
b3e9a2b64d
@ -1975,7 +1975,8 @@ do -- DETECTION_BASE
|
||||
end
|
||||
|
||||
do -- DETECTION_UNITS
|
||||
|
||||
|
||||
---
|
||||
-- @type DETECTION_UNITS
|
||||
-- @field DCS#Distance DetectionRange The range till which targets are detected.
|
||||
-- @extends Functional.Detection#DETECTION_BASE
|
||||
|
||||
@ -369,6 +369,7 @@ MANTIS.SamData = {
|
||||
["SA-20A"] = { Range=150, Blindspot=5, Height=27, Type="Long" , Radar="S-300PMU1"},
|
||||
["SA-20B"] = { Range=200, Blindspot=4, Height=27, Type="Long" , Radar="S-300PMU2"},
|
||||
["HQ-2"] = { Range=50, Blindspot=6, Height=35, Type="Medium", Radar="HQ_2_Guideline_LN" },
|
||||
["SHORAD"] = { Range=3, Blindspot=0, Height=3, Type="Short", Radar="Igla" }
|
||||
}
|
||||
|
||||
--- SAM data HDS
|
||||
@ -578,7 +579,7 @@ do
|
||||
|
||||
-- TODO Version
|
||||
-- @field #string version
|
||||
self.version="0.8.9"
|
||||
self.version="0.8.10"
|
||||
self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
|
||||
|
||||
--- FSM Functions ---
|
||||
@ -1319,7 +1320,7 @@ do
|
||||
elseif sma then
|
||||
SAMData = self.SamDataSMA
|
||||
end
|
||||
--self:I("Looking to auto-match for "..grpname)
|
||||
--self:T("Looking to auto-match for "..grpname)
|
||||
for _,_unit in pairs(units) do
|
||||
local unit = _unit -- Wrapper.Unit#UNIT
|
||||
local type = string.lower(unit:GetTypeName())
|
||||
|
||||
@ -1767,9 +1767,9 @@ function SCORING:SecondsToClock( sSeconds )
|
||||
-- return nil;
|
||||
return "00:00:00";
|
||||
else
|
||||
nHours = string.format( "%02.f", math.floor( nSeconds / 3600 ) );
|
||||
nMins = string.format( "%02.f", math.floor( nSeconds / 60 - (nHours * 60) ) );
|
||||
nSecs = string.format( "%02.f", math.floor( nSeconds - nHours * 3600 - nMins * 60 ) );
|
||||
local nHours = string.format( "%02.f", math.floor( nSeconds / 3600 ) );
|
||||
local nMins = string.format( "%02.f", math.floor( nSeconds / 60 - (nHours * 60) ) );
|
||||
local nSecs = string.format( "%02.f", math.floor( nSeconds - nHours * 3600 - nMins * 60 ) );
|
||||
return nHours .. ":" .. nMins .. ":" .. nSecs
|
||||
end
|
||||
end
|
||||
|
||||
@ -499,7 +499,7 @@ do
|
||||
-- @field #AWACS
|
||||
AWACS = {
|
||||
ClassName = "AWACS", -- #string
|
||||
version = "0.2.54", -- #string
|
||||
version = "0.2.55", -- #string
|
||||
lid = "", -- #string
|
||||
coalition = coalition.side.BLUE, -- #number
|
||||
coalitiontxt = "blue", -- #string
|
||||
@ -783,8 +783,8 @@ AWACS.Messages = {
|
||||
-- @field #string AwacsStateMission
|
||||
-- @field #string AwacsStateFG
|
||||
-- @field #boolean AwacsShiftChange
|
||||
-- @field #string EscortsStateMission
|
||||
-- @field #string EscortsStateFG
|
||||
-- @field #table EscortsStateMission
|
||||
-- @field #table EscortsStateFG
|
||||
-- @field #boolean EscortsShiftChange
|
||||
-- @field #number AICAPMax
|
||||
-- @field #number AICAPCurrent
|
||||
@ -1162,8 +1162,8 @@ function AWACS:New(Name,AirWing,Coalition,AirbaseName,AwacsOrbit,OpsZone,Station
|
||||
MonitoringData.AwacsStateFG = "unknown"
|
||||
MonitoringData.AwacsStateMission = "unknown"
|
||||
MonitoringData.EscortsShiftChange = false
|
||||
MonitoringData.EscortsStateFG= "unknown"
|
||||
MonitoringData.EscortsStateMission = "unknown"
|
||||
MonitoringData.EscortsStateFG = {}
|
||||
MonitoringData.EscortsStateMission = {}
|
||||
self.MonitoringOn = false -- #boolean
|
||||
self.MonitoringData = MonitoringData
|
||||
|
||||
|
||||
@ -299,7 +299,7 @@ end
|
||||
-- @param #table tbl Input table.
|
||||
UTILS.OneLineSerialize = function( tbl ) -- serialization of a table all on a single line, no comments, made to replace old get_table_string function
|
||||
|
||||
lookup_table = {}
|
||||
local lookup_table = {}
|
||||
|
||||
local function _Serialize( tbl )
|
||||
|
||||
|
||||
@ -1501,18 +1501,16 @@ function AIRBASE:FindFreeParkingSpotForAircraft(group, terminaltype, scanradius,
|
||||
|
||||
-- Get the aircraft size, i.e. it's longest side of x,z.
|
||||
local aircraft = nil -- fix local problem below
|
||||
local _aircraftsize, ax,ay,az
|
||||
-- SU27 dimensions as default
|
||||
local _aircraftsize = 23
|
||||
local ax = 23 -- l
|
||||
local ay = 7 -- h
|
||||
local az = 17 -- w
|
||||
if group and group.ClassName == "GROUP" then
|
||||
aircraft=group:GetUnit(1)
|
||||
if aircraft then
|
||||
_aircraftsize, ax,ay,az=aircraft:GetObjectSize()
|
||||
end
|
||||
else
|
||||
-- SU27 dimensions
|
||||
_aircraftsize = 23
|
||||
ax = 23 -- length
|
||||
ay = 7 -- height
|
||||
az = 17 -- width
|
||||
end
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
-- @module Wrapper.Unit
|
||||
-- @image Wrapper_Unit.JPG
|
||||
|
||||
|
||||
---
|
||||
-- @type UNIT
|
||||
-- @field #string ClassName Name of the class.
|
||||
-- @field #string UnitName Name of the unit.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user