From 31fb9bc1699e439a05410b827bd2bcba2b4fe361 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Sat, 9 Sep 2023 11:54:45 +0200 Subject: [PATCH 1/6] Update Group.lua Docu fix --- Moose Development/Moose/Wrapper/Group.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index 1783a059d..faeb810a5 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/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. From 515764bb88a86f2963302ef8d928778e803d0344 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Sat, 9 Sep 2023 11:56:28 +0200 Subject: [PATCH 2/6] Update Group.lua Docu fix --- Moose Development/Moose/Wrapper/Group.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index 1783a059d..faeb810a5 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/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. From ab1e3e6c60e35d0861146daa31e96f34b302f7c3 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sat, 9 Sep 2023 13:09:20 +0200 Subject: [PATCH 3/6] #AICSAR * Force LoadingDone, UnloadingDone since changes in OPSTRANSPORT --- Moose Development/Moose/Functional/AICSAR.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Functional/AICSAR.lua b/Moose Development/Moose/Functional/AICSAR.lua index b71050778..5f158932f 100644 --- a/Moose Development/Moose/Functional/AICSAR.lua +++ b/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) - AICPickedUp(helo,helo:GetCargoGroups(),Index) + 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 From ba361e7eff66a2a3d1598154cb1c5b14cea53bbc Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 10 Sep 2023 15:41:54 +0200 Subject: [PATCH 4/6] #RAT * Try more than once to get coord in status loop --- Moose Development/Moose/Functional/RAT.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Functional/RAT.lua b/Moose Development/Moose/Functional/RAT.lua index 6875875ea..86f74409a 100644 --- a/Moose Development/Moose/Functional/RAT.lua +++ b/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() From 1362fe9019e914ad7b2e8698614b90ce33c85946 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 10 Sep 2023 22:40:05 +0200 Subject: [PATCH 5/6] Update SRS.lua --- Moose Development/Moose/Sound/SRS.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 1679c9bf6..7299dc2b5 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -146,7 +146,7 @@ MSRS = { MSRS.version="0.1.1" --- Voices --- @type Voices +-- @type MSRS.Voices MSRS.Voices = { Microsoft = { ["Hedda"] = "Microsoft Hedda Desktop", -- de-DE From 6ccfd499c8976903086f9e83f1eb6d04cc9c7044 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 10 Sep 2023 22:42:39 +0200 Subject: [PATCH 6/6] Update SRS.lua - Fixed bug in GRPC backend --- Moose Development/Moose/Sound/SRS.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 8405c4e67..207f0177a 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -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