Merge branch 'develop' into FF/Ops

Moose Development/Moose/Core/Point.lua

@@ -2776,8 +2776,9 @@ do -- COORDINATE
   -- @param #COORDINATE FromCoordinate The coordinate to measure the distance and the bearing from.
   -- @param #boolean Bogey Add "Bogey" at the end if true (not yet declared hostile or friendly)
   -- @param #boolean Spades Add "Spades" at the end if true (no IFF/VID ID yet known)
+  -- @param #boolean SSML Add SSML tags speaking aspect as 0 1 2 and "brah" instead of BRAA
   -- @return #string The BRAA text.
-  function COORDINATE:ToStringBRAANATO(FromCoordinate,Bogey,Spades)
+  function COORDINATE:ToStringBRAANATO(FromCoordinate,Bogey,Spades,SSML)
     
     -- Thanks to @Pikey
     local BRAANATO = "Merged."
@@ -2798,10 +2799,11 @@ do -- COORDINATE
     local track = UTILS.BearingToCardinal(bearing) or "North"
     
     if rangeNM > 3 then
+      if SSML then
         if aspect == "" then
-        BRAANATO = string.format("BRA, %03d, %d miles, Angels %d, Track %s",bearing, rangeNM, alt, track)
+          BRAANATO = string.format("brah <say-as interpret-as='characters'>%03d</say-as>, %d miles, Angels %d, Track %s",bearing, rangeNM, alt, track)
         else
-        BRAANATO = string.format("BRAA, %03d, %d miles, Angels %d, %s, Track %s",bearing, rangeNM, alt, aspect, track)      
+          BRAANATO = string.format("brah <say-as interpret-as='characters'>%03d</say-as>, %d miles, Angels %d, %s, Track %s",bearing, rangeNM, alt, aspect, track)      
         end
         if Bogey and Spades then
           BRAANATO = BRAANATO..", Bogey, Spades."
@@ -2812,6 +2814,22 @@ do -- COORDINATE
         else
          BRAANATO = BRAANATO.."."
         end
+      else
+        if aspect == "" then
+          BRAANATO = string.format("BRA %03d, %d miles, Angels %d, Track %s",bearing, rangeNM, alt, track)
+        else
+          BRAANATO = string.format("BRAA %03d, %d miles, Angels %d, %s, Track %s",bearing, rangeNM, alt, aspect, track)      
+        end
+        if Bogey and Spades then
+          BRAANATO = BRAANATO..", Bogey, Spades."
+        elseif Bogey then
+          BRAANATO = BRAANATO..", Bogey."
+        elseif Spades then
+         BRAANATO = BRAANATO..", Spades."
+        else
+         BRAANATO = BRAANATO.."."
+        end
+      end
     end
       
     return BRAANATO 

Moose Development/Moose/Sound/SRS.lua

@@ -96,6 +96,14 @@
 -- For more information on setting up a cloud account, visit: https://cloud.google.com/text-to-speech
 -- Google's supported SSML reference: https://cloud.google.com/text-to-speech/docs/ssml
 -- 
+-- **NOTE on using GOOGLE TTS with SRS:** You need to have the C# library installed in your SRS folder for Google to work. 
+-- You can obtain it e.g. here: [NuGet](https://www.nuget.org/packages/Grpc.Core)
+-- 
+-- **Pro-Tipp** - use the command line with power shell to call DCS-SR-ExternalAudio.exe - it will tell you what is missing.    
+-- and also the Google Console error, in case you have missed a step in setting up your Google TTS.   
+-- E.g. `.\DCS-SR-ExternalAudio.exe -t "Text Message" -f 255 -m AM -c 2 -s 2 -z -G "Path_To_You_Google.Json"`   
+-- Plays a message on 255AM for the blue coalition in-game.
+-- 
 -- ## Set Voice
 -- 
 -- Use a specifc voice with the @{#MSRS.SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.

Moose Development/Moose/Wrapper/Positionable.lua

@@ -1625,6 +1625,10 @@ do -- Cargo
           ["Ural-4320T"] = 14,
           ["ZBD04A"] = 7, -- new by kappa
           ["VAB_Mephisto"] = 8, -- new by Apple
+          ["tt_KORD"] = 6, -- 2.7.1 HL/TT
+          ["tt_DSHK"] = 6,
+          ["HL_KORD"] = 6,
+          ["HL_DSHK"] = 6,
         }
 
         -- Assuming that each passenger weighs 95 kg on average.