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

luacheck barking

Browse Source
This commit is contained in:
Applevangelist
2022-04-28 13:48:48 +02:00
parent d89cb8f1e9
commit 6404417dad
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Moose Development/Moose/Ops/Awacs.lua
View File

@@ -1120,12 +1120,13 @@ function AWACS:_StartSettings(FlightGroup,Mission)
return self return self
end end
--- [Internal] Return Bullseye BR for Alpha Check etc, returns e.g. "Bullseye 021, 16" --- [Internal] Return Bullseye BR for Alpha Check etc, returns e.g. "Rock 021, 16" ("Rock" being the set BE name)
-- @param #AWACS self -- @param #AWACS self
-- @param Core.Point#COORDINATE Coordinate -- @param Core.Point#COORDINATE Coordinate
-- @return #string BullseyeBR -- @return #string BullseyeBR
function AWACS:ToStringBULLS( Coordinate ) function AWACS:ToStringBULLS( Coordinate )
-- local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.coalition ) ) -- local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.coalition ) )
local bullseyename = self.AOName or "Rock"
local BullsCoordinate = self.OpsZone:GetCoordinate() local BullsCoordinate = self.OpsZone:GetCoordinate()
local DirectionVec3 = BullsCoordinate:GetDirectionVec3( Coordinate ) local DirectionVec3 = BullsCoordinate:GetDirectionVec3( Coordinate )
local AngleRadians = Coordinate:GetAngleRadians( DirectionVec3 ) local AngleRadians = Coordinate:GetAngleRadians( DirectionVec3 )
@@ -1133,10 +1134,10 @@ function AWACS:ToStringBULLS( Coordinate )
local AngleDegrees = UTILS.Round( UTILS.ToDegree( AngleRadians ), 0 ) local AngleDegrees = UTILS.Round( UTILS.ToDegree( AngleRadians ), 0 )
local Bearing = string.format( '%03d', AngleDegrees ) local Bearing = string.format( '%03d', AngleDegrees )
local Distance = UTILS.Round( UTILS.MetersToNM( Distance ), 0 ) local Distance = UTILS.Round( UTILS.MetersToNM( Distance ), 0 )
return string.format("Bullseye %03d, %03d",Bearing,Distance) return string.format("%s %03d, %03d",bullseyename,Bearing,Distance)
end end
--- [Internal] Chnage Bullseye string to be TTS friendly, "Bullseye 021, 16" returns e.g. "Bulls eye 0 2 1. 1 6" --- [Internal] Change Bullseye string to be TTS friendly, "Bullseye 021, 16" returns e.g. "Bulls eye 0 2 1. 1 6"
-- @param #AWACS self -- @param #AWACS self
-- @param #string Text Input text -- @param #string Text Input text
-- @return #string BullseyeBRTTS -- @return #string BullseyeBRTTS
@@ -1144,7 +1145,7 @@ function AWACS:ToStringBullsTTS(Text)
local text = Text local text = Text
text=string.gsub(text,"Bullseye","Bulls eye") text=string.gsub(text,"Bullseye","Bulls eye")
text=string.gsub(text,"%d","%1 ") text=string.gsub(text,"%d","%1 ")
text=string.gsub(text,".," ,"\.") text=string.gsub(text," ," ,".")
text=string.gsub(text," $","") text=string.gsub(text," $","")
return text return text
end end
@@ -2772,7 +2773,9 @@ function AWACS:_GetBRAfromBullsOrAO(clustercoordinate)
local BRAText = "" local BRAText = ""
if not self.UseBullsAO then if not self.UseBullsAO then
-- get BR from AO -- get BR from AO
BRAText = "AO "..refcoord:ToStringBR(clustercoordinate) local bullsname = self.AOName or "Rock"
BRAText = string.format("%s %s",bullsname,refcoord:ToStringBR(clustercoordinate))
--BRAText = "AO "..refcoord:ToStringBR(clustercoordinate)
else else
-- get BR from Bulls -- get BR from Bulls
BRAText = self:ToStringBULLS(clustercoordinate) BRAText = self:ToStringBULLS(clustercoordinate)