mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
# Docu fixes
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
---@diagnostic disable: cast-local-type
|
||||
--- **Ops** - Automatic Terminal Information Service (ATIS).
|
||||
--
|
||||
-- ===
|
||||
@@ -2139,6 +2140,8 @@ function ATIS:onafterBroadcast( From, Event, To )
|
||||
end
|
||||
end
|
||||
alltext = alltext .. ";\n" .. subtitle
|
||||
|
||||
local _RUNACT
|
||||
|
||||
if not self.ATISforFARPs then
|
||||
-- Active runway.
|
||||
@@ -2148,7 +2151,7 @@ function ATIS:onafterBroadcast( From, Event, To )
|
||||
elseif rwyLandingLeft==false then
|
||||
subtitle=subtitle.." Right"
|
||||
end
|
||||
local _RUNACT = subtitle
|
||||
_RUNACT = subtitle
|
||||
if not self.useSRS then
|
||||
self:Transmission(ATIS.Sound.ActiveRunway, 1.0, subtitle)
|
||||
self.radioqueue:Number2Transmission(runwayLanding)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
---@diagnostic disable: undefined-global
|
||||
--- **Ops** - Auftrag (mission) for Ops.
|
||||
--
|
||||
-- ## Main Features:
|
||||
@@ -477,7 +478,7 @@ AUFTRAG.Type={
|
||||
RELOCATECOHORT="Relocate Cohort",
|
||||
AIRDEFENSE="Air Defence",
|
||||
EWR="Early Warning Radar",
|
||||
RECOVERYTANKER="Recovery Tanker",
|
||||
--RECOVERYTANKER="Recovery Tanker",
|
||||
REARMING="Rearming",
|
||||
CAPTUREZONE="Capture Zone",
|
||||
NOTHING="Nothing",
|
||||
|
||||
@@ -2027,9 +2027,9 @@ function AWACS:_StartEscorts(Shiftchange)
|
||||
self.CatchAllMissions[#self.CatchAllMissions+1] = escort
|
||||
|
||||
if Shiftchange then
|
||||
self.EscortMissionReplacement[i] = mission
|
||||
self.EscortMissionReplacement[i] = escort
|
||||
else
|
||||
self.EscortMission[i] = mission
|
||||
self.EscortMission[i] = escort
|
||||
end
|
||||
end
|
||||
|
||||
@@ -3597,10 +3597,13 @@ function AWACS:_SetClientMenus()
|
||||
local tasking = MENU_GROUP:New(cgrp,"Tasking",basemenu)
|
||||
local showtask = MENU_GROUP_COMMAND:New(cgrp,"Showtask",tasking,self._Showtask,self,cgrp)
|
||||
|
||||
local commit
|
||||
local unable
|
||||
local abort
|
||||
if self.PlayerCapAssignment then
|
||||
local commit = MENU_GROUP_COMMAND:New(cgrp,"Commit",tasking,self._Commit,self,cgrp)
|
||||
local unable = MENU_GROUP_COMMAND:New(cgrp,"Unable",tasking,self._Unable,self,cgrp)
|
||||
local abort = MENU_GROUP_COMMAND:New(cgrp,"Abort",tasking,self._TaskAbort,self,cgrp)
|
||||
commit = MENU_GROUP_COMMAND:New(cgrp,"Commit",tasking,self._Commit,self,cgrp)
|
||||
unable = MENU_GROUP_COMMAND:New(cgrp,"Unable",tasking,self._Unable,self,cgrp)
|
||||
abort = MENU_GROUP_COMMAND:New(cgrp,"Abort",tasking,self._TaskAbort,self,cgrp)
|
||||
--local judy = MENU_GROUP_COMMAND:New(cgrp,"Judy",tasking,self._Judy,self,cgrp)
|
||||
end
|
||||
|
||||
@@ -4933,8 +4936,8 @@ function AWACS:_AnnounceContact(Contact,IsNew,Group,IsBogeyDope,Tag,IsPopup,Repo
|
||||
end
|
||||
end
|
||||
|
||||
string.gsub(BRAText,"BRAA","brah")
|
||||
string.gsub(BRAText,"BRA","brah")
|
||||
BRAText = string.gsub(BRAText,"BRAA","brah")
|
||||
BRAText = string.gsub(BRAText,"BRA","brah")
|
||||
|
||||
local prio = IsNew or IsBogeyDope
|
||||
self:_NewRadioEntry(BRAText,TextScreen,GID,isGroup,true,IsNew,false,prio)
|
||||
@@ -5547,7 +5550,7 @@ end
|
||||
-- @param #string Event
|
||||
-- @param #string To
|
||||
-- @return #AWACS self
|
||||
function AWACS:onbeforeStart(From,Event,to)
|
||||
function AWACS:onbeforeStart(From,Event,To)
|
||||
self:T({From, Event, To})
|
||||
if self.IncludeHelicopters then
|
||||
self.clientset:FilterCategories("helicopter")
|
||||
|
||||
@@ -230,7 +230,7 @@ CSAR = {
|
||||
takenOff = {},
|
||||
csarUnits = {}, -- table of unit names
|
||||
downedPilots = {},
|
||||
woundedGroups = {},
|
||||
-- = {},
|
||||
landedStatus = {},
|
||||
addedTo = {},
|
||||
woundedGroups = {}, -- contains the new group of units
|
||||
@@ -1306,7 +1306,7 @@ end
|
||||
-- @param #string UnitName
|
||||
-- @return #string CallSign
|
||||
function CSAR:_GetCustomCallSign(UnitName)
|
||||
local callsign = Unitname
|
||||
local callsign = UnitName
|
||||
local unit = UNIT:FindByName(UnitName)
|
||||
if unit and unit:IsAlive() then
|
||||
local group = unit:GetGroup()
|
||||
@@ -1876,7 +1876,7 @@ function CSAR:_SignalFlare(_unitName)
|
||||
if _closest ~= nil and _closest.pilot ~= nil and _closest.distance > 0 and _closest.distance < smokedist then
|
||||
|
||||
local _clockDir = self:_GetClockDirection(_heli, _closest.pilot)
|
||||
local _distance = 0
|
||||
local _distance = ""
|
||||
if _SETTINGS:IsImperial() then
|
||||
_distance = string.format("%.1fnm",UTILS.MetersToNM(_closest.distance))
|
||||
else
|
||||
@@ -1889,12 +1889,13 @@ function CSAR:_SignalFlare(_unitName)
|
||||
_coord:FlareRed(_clockDir)
|
||||
else
|
||||
local _distance = smokedist
|
||||
local dtext = ""
|
||||
if _SETTINGS:IsImperial() then
|
||||
_distance = string.format("%.1fnm",UTILS.MetersToNM(smokedist))
|
||||
dtext = string.format("%.1fnm",UTILS.MetersToNM(smokedist))
|
||||
else
|
||||
_distance = string.format("%.1fkm",smokedist/1000)
|
||||
dtext = string.format("%.1fkm",smokedist/1000)
|
||||
end
|
||||
self:_DisplayMessageToSAR(_heli, string.format("No Pilots within %s",_distance), self.messageTime, false, false, true)
|
||||
self:_DisplayMessageToSAR(_heli, string.format("No Pilots within %s",dtext), self.messageTime, false, false, true)
|
||||
end
|
||||
return self
|
||||
end
|
||||
@@ -1930,7 +1931,7 @@ function CSAR:_Reqsmoke( _unitName )
|
||||
local _closest = self:_GetClosestDownedPilot(_heli)
|
||||
if _closest ~= nil and _closest.pilot ~= nil and _closest.distance > 0 and _closest.distance < smokedist then
|
||||
local _clockDir = self:_GetClockDirection(_heli, _closest.pilot)
|
||||
local _distance = 0
|
||||
local _distance = string.format("%.1fkm",_closest.distance/1000)
|
||||
if _SETTINGS:IsImperial() then
|
||||
_distance = string.format("%.1fnm",UTILS.MetersToNM(_closest.distance))
|
||||
else
|
||||
@@ -1942,7 +1943,7 @@ function CSAR:_Reqsmoke( _unitName )
|
||||
local color = self.smokecolor
|
||||
_coord:Smoke(color)
|
||||
else
|
||||
local _distance = 0
|
||||
local _distance = string.format("%.1fkm",smokedist/1000)
|
||||
if _SETTINGS:IsImperial() then
|
||||
_distance = string.format("%.1fnm",UTILS.MetersToNM(smokedist))
|
||||
else
|
||||
|
||||
@@ -204,7 +204,7 @@ CTLD_CARGO = {
|
||||
-- @param #CTLD_CARGO self
|
||||
-- @param #boolean loaded
|
||||
function CTLD_CARGO:Isloaded()
|
||||
if self.HasBeenMoved and not self.WasDropped() then
|
||||
if self.HasBeenMoved and not self:WasDropped() then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
|
||||
@@ -75,7 +75,7 @@ COHORT = {
|
||||
livery = nil,
|
||||
skill = nil,
|
||||
legion = nil,
|
||||
Ngroups = nil,
|
||||
--Ngroups = nil,
|
||||
Ngroups = 0,
|
||||
engageRange = nil,
|
||||
tacanChannel = {},
|
||||
|
||||
@@ -1068,7 +1068,7 @@ self:T(self.lid.."_ReportLaserTargets")
|
||||
if number > 0 and self.AutoLase[playername] then
|
||||
local Settings = ( client and _DATABASE:GetPlayerSettings( playername ) ) or _SETTINGS
|
||||
local target = self:_GetHVTTarget(targetset) -- the one we're lasing
|
||||
local ThreatLevel = target:GetThreatLevel()
|
||||
local ThreatLevel = target:GetThreatLevel() or 1
|
||||
local ThreatLevelText = "high"
|
||||
if ThreatLevel > 3 and ThreatLevel < 8 then
|
||||
ThreatLevelText = "medium"
|
||||
@@ -1078,7 +1078,7 @@ self:T(self.lid.."_ReportLaserTargets")
|
||||
local ThreatGraph = "[" .. string.rep( "■", ThreatLevel ) .. string.rep( "□", 10 - ThreatLevel ) .. "]: "..ThreatLevel
|
||||
local report = REPORT:New("Lasing Report")
|
||||
report:Add(string.rep("-",15))
|
||||
report:Add("Target type: "..target:GetTypeName())
|
||||
report:Add("Target type: "..target:GetTypeName() or "unknown")
|
||||
report:Add("Threat Level: "..ThreatGraph.." ("..ThreatLevelText..")")
|
||||
if not self.ReferencePoint then
|
||||
report:Add("Location: "..client:GetCoordinate():ToStringBULLS(self.Coalition,Settings))
|
||||
|
||||
@@ -522,7 +522,7 @@ function PLAYERTASK:MarkTargetOnF10Map(Text,Coalition,ReadOnly)
|
||||
-- Marker exists, delete one first
|
||||
self.TargetMarker:Remove()
|
||||
end
|
||||
local text = Text or "Target of "..self.lid
|
||||
local text = Text or ("Target of "..self.lid)
|
||||
self.TargetMarker = MARKER:New(coordinate,text)
|
||||
if ReadOnly then
|
||||
self.TargetMarker:ReadOnly()
|
||||
|
||||
Reference in New Issue
Block a user