Merge remote-tracking branch 'origin/master-ng' into develop

This commit is contained in:
Applevangelist
2026-02-27 09:34:46 +01:00
2 changed files with 8 additions and 7 deletions
+4 -4
View File
@@ -17,7 +17,7 @@
-- ===
--
-- ### Author: **applevangelist**
-- @date Last Update July 2025
-- @date Last Update Feb 2026
-- @module Ops.AWACS
-- @image OPS_AWACS.jpg
@@ -6855,7 +6855,7 @@ function AWACS:onafterCheckTacticalQueue(From,Event,To)
end
-- AI AWACS Speaking
local gtext = RadioEntry.TextTTS
if self.PathToGoogleKey then
if self.PathToGoogleKey and self.Backend ~= MSRS.Backend.HOUND then
gtext = string.format("<speak><prosody rate='medium'>%s</prosody></speak>",gtext)
end
self.TacticalSRSQ:NewTransmission(gtext,nil,self.TacticalSRS,nil,0.5,nil,nil,nil,frequency,self.TacticalModulation)
@@ -6914,7 +6914,7 @@ function AWACS:onafterCheckRadioQueue(From,Event,To)
if not RadioEntry.FromAI then
-- AI AWACS Speaking
if self.PathToGoogleKey then
if self.PathToGoogleKey and self.Backend ~= MSRS.Backend.HOUND then
local gtext = RadioEntry.TextTTS
gtext = string.format("<speak><prosody rate='medium'>%s</prosody></speak>",gtext)
self.AwacsSRS:PlayTextExt(gtext,nil,self.MultiFrequency,self.MultiModulation,self.Gender,self.Culture,self.Voice,self.Volume,"AWACS")
@@ -6927,7 +6927,7 @@ function AWACS:onafterCheckRadioQueue(From,Event,To)
if RadioEntry.GroupID and RadioEntry.GroupID ~= 0 then
local managedgroup = self.ManagedGrps[RadioEntry.GroupID] -- #AWACS.ManagedGroup
if managedgroup and managedgroup.FlightGroup and managedgroup.FlightGroup:IsAlive() then
if self.PathToGoogleKey then
if self.PathToGoogleKey and self.Backend ~= MSRS.Backend.HOUND then
local gtext = RadioEntry.TextTTS
gtext = string.format("<speak><prosody rate='medium'>%s</prosody></speak>",gtext)
managedgroup.FlightGroup:RadioTransmission(gtext,1,false)
+4 -3
View File
@@ -4112,9 +4112,10 @@ end
--- Get a NATO abbreviated MGRS text for SRS use, optionally with prosody slow tag
-- @param #string Text The input string, e.g. "MGRS 4Q FJ 12345 67890"
-- @param #boolean Slow Optional - add slow tags
-- @param #boolean Slow Optional - add slow tags, if the backend is not Hound
-- @param #string Backend The TTS Backend used
-- @return #string Output for (Slow) spelling in SRS TTS e.g. "MGRS;<prosody rate="slow">4;Quebec;Foxtrot;Juliett;1;2;3;4;5;6;7;8;niner;zero;</prosody>"
function UTILS.MGRSStringToSRSFriendly(Text,Slow)
function UTILS.MGRSStringToSRSFriendly(Text,Slow,Backend)
local Text = string.gsub(Text,"MGRS ","")
Text = string.gsub(Text,"%s+","")
Text = string.gsub(Text,"([%a%d])","%1;") -- "0;5;1;"
@@ -4146,7 +4147,7 @@ function UTILS.MGRSStringToSRSFriendly(Text,Slow)
Text = string.gsub(Text,"Z","Zulu")
Text = string.gsub(Text,"0","zero")
Text = string.gsub(Text,"9","niner")
if Slow then
if Slow and Backend ~= nil and Backend ~= MSRS.Backend.HOUND then
Text = '<prosody rate="slow">'..Text..'</prosody>'
end
Text = "MGRS;"..Text