OPS ATIS

Moose Development/Moose/Core/Point.lua

@@ -1081,10 +1081,8 @@ do -- COORDINATE
       elseif AirbaseCategory == Airbase.Category.AIRDROME then
         RoutePoint.airdromeId = AirbaseID
       else
-        self:T("ERROR: Unknown airbase category in COORDINATE:WaypointAir()!")
+        self:E("ERROR: Unknown airbase category in COORDINATE:WaypointAir()!")
       end
-      
-      --self:MarkToAll(string.format("Landing waypoint at airbase %s, ID=%d, Category=%d", airbase:GetName(), AirbaseID, AirbaseCategory  ))
     end
     
     -- Time in minutes to stay at the airbase before resuming route. 
@@ -1104,7 +1102,7 @@ do -- COORDINATE
     --RoutePoint.formation_template=""
 
     -- Debug.
-    self:T({RoutePoint=RoutePoint})
+    self:I({RoutePoint=RoutePoint})
     
     -- Return waypoint.
     return RoutePoint

Moose Development/Moose/Core/RadioQueue.lua

@@ -51,6 +51,8 @@ RADIOQUEUE = {
 -- @field #string filename Name of the file to be transmitted.
 -- @field #string path Path in miz file where the file is located.
 -- @field #number duration Duration in seconds.
+-- @field #string subtitle Subtitle of the transmission.
+-- @field #number subduration Duration of the subtitle being displayed.
 -- @field #number Tstarted Mission time (abs) in seconds when the transmission started.
 -- @field #boolean isplaying If true, transmission is currently playing.
 -- @field #number Tplay Mission time (abs) in seconds when the transmission should be played.
@@ -96,7 +98,7 @@ function RADIOQUEUE:Start(delay, dt)
   
   dt=dt or 0.01
   
-  self:I(self.lid..string.format("Starting RADIOQUEUE in %.1f seconds with interval dt=%.3f seconds.", delay, dt))
+  self:I(self.lid..string.format("Starting RADIOQUEUE on Frequency %.2f MHz [modulation=%d] in %.1f seconds (dt=%.3f sec)", self.frequency/1000000, self.modulation, delay, dt))
 
   self.RQid=self.scheduler:Schedule(self, self._CheckRadioQueue, {}, delay, dt)
   
@@ -137,13 +139,17 @@ end
 -- @param #string filename The name of the sound file.
 -- @param #number duration The duration of the sound file in seconds.
 -- @param #string path The directory within the miz file where the sound is located. Default "l10n/DEFAULT/".
+-- @param #string subtitle Subtitle of the transmission.
+-- @param #number subduration Duration [sec] of the subtitle being displayed. Default 5 sec.
 -- @return #RADIOQUEUE self The RADIOQUEUE object.
-function RADIOQUEUE:SetDigit(digit, filename, duration, path)
+function RADIOQUEUE:SetDigit(digit, filename, duration, path, subtitle, subduration)
 
   local transmission={} --#RADIOQUEUE.Transmission
   transmission.filename=filename
   transmission.duration=duration
   transmission.path=path or "l10n/DEFAULT/"
+  transmission.subtitle=nil
+  transmission.subduration=nil
   
   -- Convert digit to string in case it is given as a number.
   if type(digit)=="number" then
@@ -182,8 +188,10 @@ end
 -- @param #number path Directory path inside the miz file where the sound file is located. Default "l10n/DEFAULT/".
 -- @param #number tstart Start time (abs) seconds. Default now.
 -- @param #number interval Interval in seconds after the last transmission finished.
+-- @param #string subtitle Subtitle of the transmission.
+-- @param #number subduration Duration [sec] of the subtitle being displayed. Default 5 sec.
 -- @return #RADIOQUEUE self The RADIOQUEUE object.
-function RADIOQUEUE:NewTransmission(filename, duration, path, tstart, interval)
+function RADIOQUEUE:NewTransmission(filename, duration, path, tstart, interval, subtitle, subduration)
 
   -- Sanity checks.
   if not filename then
@@ -210,6 +218,12 @@ function RADIOQUEUE:NewTransmission(filename, duration, path, tstart, interval)
   transmission.duration=duration
   transmission.path=path or "l10n/DEFAULT/"
   transmission.Tplay=tstart or timer.getAbsTime()
+  transmission.subtitle=subtitle
+  if transmission.subtitle then
+    transmission.subduration=subduration or 5
+  else
+    transmission.subduration=nil
+  end
   
   -- Add transmission to queue.  
   self:AddTransmission(transmission)
@@ -276,13 +290,10 @@ function RADIOQUEUE:Broadcast(transmission)
   -- Construct file name.
   local filename=string.format("%s%s", transmission.path, transmission.filename)
   
-  -- Create subtitle for transmission.
-  --local subtitle=self:_RadioSubtitle(radio, call, loud)
-  
   if sender then
     
     -- Broadcasting from aircraft. Only players tuned in to the right frequency will see the message.
-    self:T(self.lid..string.format("Broadcasting from aircraft %s", sender:GetName()))
+    self:I(self.lid..string.format("Broadcasting from aircraft %s", sender:GetName()))
     
     -- Command to set the Frequency for the transmission.
     local commandFrequency={
@@ -297,7 +308,7 @@ function RADIOQUEUE:Broadcast(transmission)
       id = "TransmitMessage",
       params = {
         file=filename,
-        duration=transmission.subduration or 5,
+        duration=transmission.subduration,
         subtitle=transmission.subtitle or "",
         loop=false,
       }}
@@ -311,7 +322,7 @@ function RADIOQUEUE:Broadcast(transmission)
   else
     
     -- Broadcasting from carrier. No subtitle possible. Need to send messages to players.
-    self:T(self.lid..string.format("Broadcasting from carrier via trigger.action.radioTransmission()."))
+    self:I(self.lid..string.format("Broadcasting from carrier via trigger.action.radioTransmission()."))
   
     -- Position from where to transmit.
     local vec3=nil
@@ -331,8 +342,8 @@ function RADIOQUEUE:Broadcast(transmission)
     
     -- Transmit via trigger.
     if vec3 then
-      self:E("Sending")
-      self:E( { filename = filename, vec3 = vec3, modulation = self.modulation, frequency = self.frequency, power = self.power } )
+      self:T("Sending")
+      self:T( { filename = filename, vec3 = vec3, modulation = self.modulation, frequency = self.frequency, power = self.power } )
       trigger.action.radioTransmission(filename, vec3, self.modulation, false, self.frequency, self.power)
     end