mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Various fixes
This commit is contained in:
parent
6cfa24340f
commit
25915c077e
@ -211,16 +211,6 @@ function DATABASE:FindStatic( StaticName )
|
|||||||
return StaticFound
|
return StaticFound
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Finds a AIRBASE based on the AirbaseName.
|
|
||||||
-- @param #DATABASE self
|
|
||||||
-- @param #string AirbaseName
|
|
||||||
-- @return Wrapper.Airbase#AIRBASE The found AIRBASE.
|
|
||||||
function DATABASE:FindAirbase( AirbaseName )
|
|
||||||
|
|
||||||
local AirbaseFound = self.AIRBASES[AirbaseName]
|
|
||||||
return AirbaseFound
|
|
||||||
end
|
|
||||||
|
|
||||||
--- Adds a Airbase based on the Airbase Name in the DATABASE.
|
--- Adds a Airbase based on the Airbase Name in the DATABASE.
|
||||||
-- @param #DATABASE self
|
-- @param #DATABASE self
|
||||||
-- @param #string AirbaseName The name of the airbase.
|
-- @param #string AirbaseName The name of the airbase.
|
||||||
|
|||||||
@ -1382,9 +1382,9 @@ function ZONE:New( ZoneName )
|
|||||||
end
|
end
|
||||||
|
|
||||||
--- Find a zone in the _DATABASE using the name of the zone.
|
--- Find a zone in the _DATABASE using the name of the zone.
|
||||||
-- @param #ZONE_BASE self
|
-- @param #ZONE self
|
||||||
-- @param #string ZoneName The name of the zone.
|
-- @param #string ZoneName The name of the zone.
|
||||||
-- @return #ZONE_BASE self
|
-- @return #ZONE self
|
||||||
function ZONE:FindByName( ZoneName )
|
function ZONE:FindByName( ZoneName )
|
||||||
|
|
||||||
local ZoneFound = _DATABASE:FindZone( ZoneName )
|
local ZoneFound = _DATABASE:FindZone( ZoneName )
|
||||||
|
|||||||
@ -1755,6 +1755,10 @@ function ATIS:onafterBroadcast(From, Event, To)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Wind
|
-- Wind
|
||||||
|
-- Adding a space after each digit of WINDFROM to convert this to aviation-speak for TTS via SRS
|
||||||
|
if self.useSRS then
|
||||||
|
WINDFROM = string.gsub(WINDFROM,".", "%1 ")
|
||||||
|
end
|
||||||
if self.metric then
|
if self.metric then
|
||||||
subtitle=string.format("Wind from %s at %s m/s", WINDFROM, WINDSPEED)
|
subtitle=string.format("Wind from %s at %s m/s", WINDFROM, WINDSPEED)
|
||||||
else
|
else
|
||||||
@ -2212,7 +2216,7 @@ function ATIS:onafterBroadcast(From, Event, To)
|
|||||||
|
|
||||||
-- TACAN
|
-- TACAN
|
||||||
if self.tacan then
|
if self.tacan then
|
||||||
subtitle=string.format("TACAN channel %dX", self.tacan)
|
subtitle=string.format("TACAN channel %dX Ray", self.tacan)
|
||||||
if not self.useSRS then
|
if not self.useSRS then
|
||||||
self:Transmission(ATIS.Sound.TACANChannel, 1.0, subtitle)
|
self:Transmission(ATIS.Sound.TACANChannel, 1.0, subtitle)
|
||||||
self.radioqueue:Number2Transmission(tostring(self.tacan), nil, 0.2)
|
self.radioqueue:Number2Transmission(tostring(self.tacan), nil, 0.2)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user