mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
@@ -502,9 +502,9 @@ function PSEUDOATC:PlayerTakeOff(unit, place)
|
|||||||
-- Bye-Bye message.
|
-- Bye-Bye message.
|
||||||
if place and self.chatty then
|
if place and self.chatty then
|
||||||
local text=string.format("%s, %s, you are airborne. Have a safe trip!", place, CallSign)
|
local text=string.format("%s, %s, you are airborne. Have a safe trip!", place, CallSign)
|
||||||
if self.reportplayername then
|
if self.reportplayername then
|
||||||
text=string.format("%s, %s, you are airborne. Have a safe trip!", place, PlayerName)
|
text=string.format("%s, %s, you are airborne. Have a safe trip!", place, PlayerName)
|
||||||
end
|
end
|
||||||
MESSAGE:New(text, self.mdur):ToGroup(group)
|
MESSAGE:New(text, self.mdur):ToGroup(group)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -878,8 +878,8 @@ function PSEUDOATC:ReportHeight(GID, UID, dt, _clear)
|
|||||||
-- Message text.
|
-- Message text.
|
||||||
local _text=string.format("%s, your altitude is %s AGL.", callsign, Hs)
|
local _text=string.format("%s, your altitude is %s AGL.", callsign, Hs)
|
||||||
if self.reportplayername then
|
if self.reportplayername then
|
||||||
_text=string.format("%s, your altitude is %s AGL.", PlayerName, Hs)
|
_text=string.format("%s, your altitude is %s AGL.", PlayerName, Hs)
|
||||||
end
|
end
|
||||||
-- Append flight level.
|
-- Append flight level.
|
||||||
if _clear==false then
|
if _clear==false then
|
||||||
_text=_text..string.format(" FL%03d.", position.y/30.48)
|
_text=_text..string.format(" FL%03d.", position.y/30.48)
|
||||||
|
|||||||
Reference in New Issue
Block a user