diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index a96becccd..efaf22639 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -234,12 +234,12 @@ function ATIS:onafterBroadcast(From, Event, To) local coord=self.airbase:GetCoordinate() - local height=coord:GetLandHeight() + local height=coord:GetLandHeight()+10 ---------------- --- Pressure --- ---------------- - local qfe=coord:GetPressure(height+5) + local qfe=coord:GetPressure(height) local qnh=coord:GetPressure(0) -- Convert to inHg @@ -257,7 +257,7 @@ function ATIS:onafterBroadcast(From, Event, To) ------------ --- Wind --- ------------ - local windFrom, windSpeed=coord:GetWind(height+10) + local windFrom, windSpeed=coord:GetWind(height) local WINDFROM=string.format("%03d", windFrom) local WINDSPEED=string.format("%d", UTILS.MpsToKnots(windSpeed)) @@ -267,6 +267,9 @@ function ATIS:onafterBroadcast(From, Event, To) local time=timer.getAbsTime() -- TODO add zulu time correction. + if self.theatre==DCSMAP.Caucasus then + time=time-4*60*60 -- Caucasus i UTC+4 hours + end local clock=UTILS.SecondsToClock(time) local zulu=UTILS.Split(clock, ":") @@ -275,7 +278,7 @@ function ATIS:onafterBroadcast(From, Event, To) ------------------- --- Temperature --- ------------------- - local temperature=coord:GetTemperature(height+10) + local temperature=coord:GetTemperature(height) local TEMPERATURE=string.format("%d", temperature) -- Weather @@ -347,8 +350,7 @@ function ATIS:onafterBroadcast(From, Event, To) local subduration=10 --Airbase. - self.radioqueue:NewTransmission(string.format("%s/%s.ogg", self.theatre, self.airbasename), 1.0, self.soundpath, nil, nil, string.format("%s Airport", self.airbasename), subduration) - self.radioqueue:NewTransmission(string.format("%s/Airport.ogg", self.theatre), 0.70, self.soundpath) + self.radioqueue:NewTransmission(string.format("%s/%s.ogg", self.theatre, self.airbasename), 3.0, self.soundpath, nil, nil, string.format("%s Airport", self.airbasename), subduration) -- Time self.radioqueue:Number2Transmission(ZULU) @@ -435,7 +437,7 @@ function ATIS:onafterBroadcast(From, Event, To) end -- Active runway. - self.radioqueue:NewTransmission("ActiveRunway.ogg", 1.05, self.soundpath, nil, 2.0, string.format("Active runway %s", runway.idx), subduration) + self.radioqueue:NewTransmission("ActiveRunway.ogg", 1.05, self.soundpath, nil, 1.0, string.format("Active runway %s", runway.idx), subduration) self.radioqueue:Number2Transmission(runway.idx) end @@ -497,12 +499,12 @@ function ATIS:GetStaticWeather() fog=weather.fog end - self:I("FF weather:") - self:I({clouds=clouds}) - self:I({visibility=visibility}) - self:I({turbulence=turbulence}) - self:I({fog=fog}) - self:I({dust=dust}) + self:T("FF weather:") + self:T({clouds=clouds}) + self:T({visibility=visibility}) + self:T({turbulence=turbulence}) + self:T({fog=fog}) + self:T({dust=dust}) return clouds, visibility, turbulence, fog, dust end diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 6a47ce4be..55bb3d3bf 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -1030,6 +1030,9 @@ function AIRBASE:GetRunwayData() self:T(string.format("Runway coords # = %d", #runwaycoords)) + -- Magnetic declination. + local magvar=0 --UTILS.GetMagneticDeclination() + for i=1,#runwaycoords,2 do -- Assuming each runway has two points. @@ -1047,7 +1050,7 @@ function AIRBASE:GetRunwayData() local hdg=c1:HeadingTo(c2) -- Runway ID: heading=070° ==> idx="07" - local idx=string.format("%02d", UTILS.Round(hdg/10, 0)) + local idx=string.format("%02d", UTILS.Round((hdg-magvar)/10, 0)) -- Debug info. self:T(string.format("Runway %d heading=%03d", j, hdg)) @@ -1072,7 +1075,7 @@ function AIRBASE:GetRunwayData() end -- Runway ID: heading=070° ==> ID="07" - local idx=string.format("%02d", UTILS.Round(hdg/10, 0)) + local idx=string.format("%02d", UTILS.Round((hdg-magvar)/10, 0)) local runway={} --#AIRBASE.Runway runway.heading=hdg