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

.github/workflows/build-includes.yml

@@ -95,10 +95,6 @@ jobs:
           export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict)
           lua5.3 "./Moose Setup/Moose_Create.lua" D "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Dynamic"
 
-      - name: Run LuaSrcDiet
-        run: |
-          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
-
       #########################################################################
       # Run LuaCheck
       #########################################################################
@@ -108,6 +104,10 @@ jobs:
         run: |
           luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose"
 
+      - name: Run LuaSrcDiet
+        run: |
+          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
+      
       #########################################################################
       # Push to MOOSE_INCLUDE
       #########################################################################

Moose Development/Moose/Ops/CSAR.lua

@@ -31,7 +31,7 @@
 -- @image OPS_CSAR.jpg
 
 -- Date: May 2023
--- Last: Update Oct 2024
+-- Last: Update Dec 2024
 
 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM

Moose Development/Moose/Sound/SRS.lua

@@ -1535,11 +1535,11 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab
 
     local gender=""
     if self.gender then
-      gender=string.format(' gender=\"\%s\"', self.gender)
+      gender=string.format(' gender=\"%s\"', self.gender)
     end
     local language=""
     if self.culture then
-      language=string.format(' language=\"\%s\"', self.culture)
+      language=string.format(' language=\"%s\"', self.culture)
     end
 
     if self.gender or self.culture then

Moose Development/Moose/Sound/SoundOutput.lua

@@ -160,52 +160,61 @@ do -- Sound File
   -- @param #string FileName The name of the sound file, e.g. "Hello World.ogg".
   -- @param #string Path The path of the directory, where the sound file is located. Default is "l10n/DEFAULT/" within the miz file.
   -- @param #number Duration Duration in seconds, how long it takes to play the sound file. Default is 3 seconds.
+  -- @param #bolean UseSrs Set if SRS should be used to play this file. Default is false.
   -- @return #SOUNDFILE self
-  function SOUNDFILE:New(FileName, Path, Duration)
-  
+  function SOUNDFILE:New(FileName, Path, Duration, UseSrs)
+
     -- Inherit BASE.
     local self=BASE:Inherit(self, BASE:New()) -- #SOUNDFILE
 
+    -- Debug info:
+    self:F( {FileName, Path, Duration, UseSrs} )
+
     -- Set file name.
     self:SetFileName(FileName)
-    
+
+    -- Set if SRS should be used to play this file
+    self:SetPlayWithSRS(UseSrs or false)
+
     -- Set path.
     self:SetPath(Path)
-    
+
     -- Set duration.
     self:SetDuration(Duration)
-    
-    -- Debug info:
-    self:T(string.format("New SOUNDFILE: file name=%s, path=%s", self.filename, self.path))
 
     return self
   end
-  
+
   --- Set path, where the sound file is located.
   -- @param #SOUNDFILE self
   -- @param #string Path Path to the directory, where the sound file is located. In case this is nil, it defaults to the DCS mission temp directory.
   -- @return #SOUNDFILE self
   function SOUNDFILE:SetPath(Path)
-    
+    self:F( {Path} )
+
     -- Init path.
-    self.path=Path or "l10n/DEFAULT/"
-    
-    if not Path and self.useSRS then -- use path to mission temp dir
-      self.path = os.getenv('TMP') .. "\\DCS\\Mission\\l10n\\DEFAULT"
-    end    
-    
+    if not Path then
+      if self.useSRS then -- use path to mission temp dir
+        self.path = lfs.tempdir() .. "Mission\\l10n\\DEFAULT"
+      else -- use internal path in miz file
+        self.path="l10n/DEFAULT/"
+      end
+    end
+
     -- Remove (back)slashes.
     local nmax=1000 ; local n=1
     while (self.path:sub(-1)=="/" or self.path:sub(-1)==[[\]]) and n<=nmax do
       self.path=self.path:sub(1,#self.path-1)
       n=n+1
     end
-    
+
     -- Append slash.
     self.path=self.path.."/"
-          
+
+    self:T("self.path=".. self.path)
+
     return self
-  end  
+  end
 
   --- Get path of the directory, where the sound file is located.
   -- @param #SOUNDFILE self
@@ -228,7 +237,7 @@ do -- Sound File
   --- Get the sound file name.
   -- @param #SOUNDFILE self
   -- @return #string Name of the soud file. This does *not* include its path.
-  function SOUNDFILE:GetFileName()    
+  function SOUNDFILE:GetFileName()
     return self.filename
   end
 
@@ -264,14 +273,16 @@ do -- Sound File
   -- @param #boolean Switch If true or nil, use SRS. If false, use DCS transmission.
   -- @return #SOUNDFILE self
   function SOUNDFILE:SetPlayWithSRS(Switch)
+    self:F( {Switch} )
     if Switch==true or Switch==nil then
       self.useSRS=true
     else
       self.useSRS=false
     end
+    self:T("self.useSRS=".. tostring(self.useSRS))
     return self
-  end  
-  
+  end
+
 end
 
 do -- Text-To-Speech