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

Merge pull request #787 from FlightControl-Master/funkyfranky

Browse Source 
RAT fixes
This commit is contained in:
Frank 2017-12-31 18:56:34 +01:00 committed by GitHub
commit b3267c00e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Moose Development/Moose/Functional/RAT.lua
View File

@ -465,7 +465,7 @@ RAT.id="RAT | "
--- RAT version. --- RAT version.
-- @field #string version -- @field #string version
RAT.version="2.0.2" RAT.version="2.0.3"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@ -3526,12 +3526,12 @@ function RAT._WaypointFunction(group, rat, wp)
if wp==WPfinal then if wp==WPfinal then
text=string.format("Flight %s arrived at final destination %s.", group:GetName(), destination) text=string.format("Flight %s arrived at final destination %s.", group:GetName(), destination)
MESSAGE:New(text, 10):ToAllIf(rat.reportstatus) MESSAGE:New(text, 10):ToAllIf(rat.reportstatus)
self:T(RAT.id..text) BASE.T(rat, RAT.id..text)
if landing==RAT.wp.air then if landing==RAT.wp.air then
text=string.format("Activating despawn switch for flight %s! Group will be detroyed soon.", group:GetName()) text=string.format("Activating despawn switch for flight %s! Group will be detroyed soon.", group:GetName())
MESSAGE:New(text, 30):ToAllIf(rat.Debug) MESSAGE:New(text, 30):ToAllIf(rat.Debug)
self:T(RAT.id..text) BASE.T(rat, RAT.id..text)
-- Enable despawn switch. Next time the status function is called, the aircraft will be despawned. -- Enable despawn switch. Next time the status function is called, the aircraft will be despawned.
rat.ratcraft[sdx].despawnme=true rat.ratcraft[sdx].despawnme=true
end end
@ -4188,7 +4188,7 @@ function RAT:_ATCClearForLanding(airport, flight)
-- Debug message. -- Debug message.
local text1=string.format("ATC %s: Flight %s cleared for landing (flag=%d).", airport, flight, flagvalue) local text1=string.format("ATC %s: Flight %s cleared for landing (flag=%d).", airport, flight, flagvalue)
local text2=string.format("ATC %s: Flight %s you are cleared for landing.", airport, flight) local text2=string.format("ATC %s: Flight %s you are cleared for landing.", airport, flight)
self:T( RAT.id..text1) BASE:T( RAT.id..text1)
MESSAGE:New(text2, 10):ToAllIf(RAT.ATC.messages) MESSAGE:New(text2, 10):ToAllIf(RAT.ATC.messages)
end end
@ -4230,9 +4230,9 @@ function RAT:_ATCFlightLanded(name)
local text2=string.format("ATC %s: Number of flights still on final %d.", dest, RAT.ATC.airport[dest].Nonfinal) local text2=string.format("ATC %s: Number of flights still on final %d.", dest, RAT.ATC.airport[dest].Nonfinal)
local text3=string.format("ATC %s: Traffic report: Number of planes landed in total %d. Flights/hour = %3.2f.", dest, RAT.ATC.airport[dest].traffic, TrafficPerHour) local text3=string.format("ATC %s: Traffic report: Number of planes landed in total %d. Flights/hour = %3.2f.", dest, RAT.ATC.airport[dest].traffic, TrafficPerHour)
local text4=string.format("ATC %s: Flight %s landed. Welcome to %s.", dest, name, dest) local text4=string.format("ATC %s: Flight %s landed. Welcome to %s.", dest, name, dest)
self:T(RAT.id..text1) BASE:T(RAT.id..text1)
self:T(RAT.id..text2) BASE:T(RAT.id..text2)
self:T(RAT.id..text3) BASE:T(RAT.id..text3)
MESSAGE:New(text4, 10):ToAllIf(RAT.ATC.messages) MESSAGE:New(text4, 10):ToAllIf(RAT.ATC.messages)
end end