Merge branch 'FF/Ops' into FF/OpsDev

Moose Development/Moose/Functional/AICSAR.lua

@@ -22,7 +22,7 @@
 -- ===
 -- 
 -- ### Author: **Applevangelist**
--- Last Update July 2023
+-- Last Update Sept 2023
 --
 -- ===
 -- @module Functional.AICSAR
@@ -191,7 +191,7 @@
 -- @field #AICSAR
 AICSAR = {
   ClassName = "AICSAR",
-  version = "0.1.15",
+  version = "0.1.16",
   lid = "",
   coalition = coalition.side.BLUE,
   template = "",
@@ -889,7 +889,7 @@ function AICSAR:_InitMission(Pilot,Index)
   
     -- Cargo transport assignment.
   local opstransport=OPSTRANSPORT:New(Pilot, pickupzone, self.farpzone)
-  
+  --opstransport:SetVerbosity(3)
   
   local helo = self:_GetFlight()
   -- inject reservation
@@ -915,8 +915,9 @@ function AICSAR:_InitMission(Pilot,Index)
     self:__PilotUnloaded(2,Helo,OpsGroup)
   end
   
-  function helo:OnAfterLoadingDone(From,Event,To)
+  function helo:OnAfterLoading(From,Event,To)
     AICPickedUp(helo,helo:GetCargoGroups(),Index) 
+    helo:__LoadingDone(5)  
   end
   
   function helo:OnAfterDead(From,Event,To)
@@ -925,6 +926,7 @@ function AICSAR:_InitMission(Pilot,Index)
   
   function helo:OnAfterUnloaded(From,Event,To,OpsGroupCargo)
     AICHeloUnloaded(helo,OpsGroupCargo)
+    helo:__UnloadingDone(5)
   end
   
   self.helos[Index] = helo

Moose Development/Moose/Functional/RAT.lua

@@ -3491,8 +3491,11 @@ function RAT:Status(message, forID)
       local life=self:_GetLife(group)
       local fuel=group:GetFuel()*100.0
       local airborne=group:InAir()
-      local coords=group:GetCoordinate()
-      local alt=coords.y or 1000
+      local coords=group:GetCoordinate() or group:GetVec3()
+      local alt=1000
+      if coords then
+        alt=coords.y or 1000
+      end  
       --local vel=group:GetVelocityKMH()
       local departure=ratcraft.departure:GetName()
       local destination=ratcraft.destination:GetName()

Moose Development/Moose/Sound/SRS.lua

@@ -192,7 +192,7 @@ MSRS = {
 MSRS.version="0.1.2"
 
 --- Voices
--- @type Voices
+-- @type MSRS.Voices
 MSRS.Voices = {
   Microsoft = {
     ["Hedda"] = "Microsoft Hedda Desktop", -- de-DE
@@ -634,7 +634,7 @@ function MSRS:Help()
 end
 
 --- Sets an alternate SRS backend to be used by MSRS to transmit over SRS for all new MSRS class instances.
--- @param #table A table containing a table `Functions` with new/replacement class functions and `Vars` with new/replacement variables. 
+-- @param #table Backend A table containing a table `Functions` with new/replacement class functions and `Vars` with new/replacement variables. 
 -- @return #boolean Returns 'true' on success.
 function MSRS.SetDefaultBackend(Backend)
   if type(Backend) == "table" then
@@ -1194,7 +1194,7 @@ MSRS_BACKEND_DCSGRPC.Functions.PlayTextExt = function (self, Text, Delay, Freque
   if Delay and Delay>0 then
       self:ScheduleOnce(Delay, self.PlayTextExt, self, Text, 0, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label)
   else
-      self:_DCSgRPCtts(tostring(Text, nil, Frequencies, Voice, Label))
+      self:_DCSgRPCtts(tostring(Text), nil, Frequencies, Voice, Label)
   end
   
   return self

Moose Development/Moose/Wrapper/Group.lua

@@ -37,7 +37,7 @@
 -- @module Wrapper.Group
 -- @image Wrapper_Group.JPG
 
-
+---
 -- @type GROUP
 -- @extends Wrapper.Controllable#CONTROLLABLE
 -- @field #string GroupName The name of the group.