From 8eec7fcc9ebdf858e24d5771206fe51711a56c0b Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 25 Dec 2023 12:29:40 +0100 Subject: [PATCH 01/11] Update build-includes.yml (#2071) --- .github/workflows/build-includes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 4bd22bdbe..1f24421c3 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -97,7 +97,7 @@ jobs: - name: Run LuaSrcDiet run: | - luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + luasrcdiet --maximum --details --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua ######################################################################### # Run LuaCheck From 1d5952b4a58780a209510a47576c6135c0c2c2a6 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 25 Dec 2023 12:34:57 +0100 Subject: [PATCH 02/11] Update build-includes.yml (#2072) --- .github/workflows/build-includes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 1f24421c3..de58838a0 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -97,7 +97,7 @@ jobs: - name: Run LuaSrcDiet run: | - luasrcdiet --maximum --details --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + luasrcdiet --basic --opt-srcequiv --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua ######################################################################### # Run LuaCheck From 3f384d72ab003eee04e3463230204c0d1590d80d Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 25 Dec 2023 12:38:18 +0100 Subject: [PATCH 03/11] Update build-includes.yml (#2073) --- .github/workflows/build-includes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index de58838a0..52ad01444 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -97,7 +97,7 @@ jobs: - name: Run LuaSrcDiet run: | - luasrcdiet --basic --opt-srcequiv --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + luasrcdiet --opt-binequiv ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua ######################################################################### # Run LuaCheck From c5dec374c8759c740ff0e2610167dc3af830d51b Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 25 Dec 2023 12:40:33 +0100 Subject: [PATCH 04/11] Update build-includes.yml (#2074) --- .github/workflows/build-includes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 52ad01444..61979d072 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -97,7 +97,7 @@ jobs: - name: Run LuaSrcDiet run: | - luasrcdiet --opt-binequiv ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + luasrcdiet ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua ######################################################################### # Run LuaCheck From 44b3f41ae43d78efc30936cf3cd74a8fc9cfc3c3 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 25 Dec 2023 12:49:54 +0100 Subject: [PATCH 05/11] Update build-includes.yml (#2075) --- .github/workflows/build-includes.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 61979d072..9632094c0 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -95,9 +95,9 @@ 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 ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + #- name: Run LuaSrcDiet + # run: | + # luasrcdiet ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua ######################################################################### # Run LuaCheck From 2a7dbad02a3c0075045a23b26cc1cc16384414a0 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:21:51 +0100 Subject: [PATCH 06/11] Update build-includes.yml --- .github/workflows/build-includes.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 9632094c0..1535ded87 100644 --- a/.github/workflows/build-includes.yml +++ b/.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 ./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 ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + ######################################################################### # Push to MOOSE_INCLUDE ######################################################################### From e46b14872142596aa18745e1d3b04ea8c0ab0725 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Mon, 25 Dec 2023 13:28:00 +0100 Subject: [PATCH 07/11] SRS --- Moose Development/Moose/Sound/SRS.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 118edb9e1..9ec6b347e 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -1529,6 +1529,7 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab -- We use a specific voice options.provider[provider].voice = Voice else + -- DCS-gRPC doesn't directly support language/gender, but can use SSML local preTag, genderProp, langProp, postTag = '', '', '', '' From a51afeda144b3062cb1cbd51c31e3557fc325d02 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:31:35 +0100 Subject: [PATCH 08/11] Update build-includes.yml --- .github/workflows/build-includes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 1535ded87..15065ba9e 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -106,7 +106,7 @@ jobs: - name: Run LuaSrcDiet run: | - luasrcdiet ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua ######################################################################### # Push to MOOSE_INCLUDE From bf0ad93bf768308374fea84fabdc479154e34732 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Mon, 25 Dec 2023 13:59:23 +0100 Subject: [PATCH 09/11] AICSAR Fix --- Moose Development/Moose/Functional/AICSAR.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Functional/AICSAR.lua b/Moose Development/Moose/Functional/AICSAR.lua index 5b9da5494..322959dea 100644 --- a/Moose Development/Moose/Functional/AICSAR.lua +++ b/Moose Development/Moose/Functional/AICSAR.lua @@ -608,8 +608,8 @@ function AICSAR:SetPilotTTSVoice(Voice,Culture,Gender) self.SRSPilot:SetLabel("PILOT") if self.SRSGoogle then local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions - self.SRSOperator:SetGoogle(poptions.credentials) - self.SRSOperator:SetGoogleAPIKey(poptions.key) + self.SRSPilot:SetGoogle(poptions.credentials) + self.SRSPilot:SetGoogleAPIKey(poptions.key) end return self end @@ -629,7 +629,7 @@ function AICSAR:SetOperatorTTSVoice(Voice,Culture,Gender) self.SRSOperator:SetVoice(Voice) self.SRSOperator:SetCulture(Culture or "en-GB") self.SRSOperator:SetGender(Gender or "female") - self.SRSPilot:SetLabel("RESCUE") + self.SRSOperator:SetLabel("RESCUE") if self.SRSGoogle then local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions self.SRSOperator:SetGoogle(poptions.credentials) From 1b01b893438d56e32c36709491a49c0793c814cc Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 25 Dec 2023 23:12:55 +0100 Subject: [PATCH 10/11] TARGET - Fixed IsAlive --- Moose Development/Moose/Ops/ArmyGroup.lua | 2 ++ Moose Development/Moose/Ops/Target.lua | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/ArmyGroup.lua b/Moose Development/Moose/Ops/ArmyGroup.lua index 1bbad51e8..d6b54a757 100644 --- a/Moose Development/Moose/Ops/ArmyGroup.lua +++ b/Moose Development/Moose/Ops/ArmyGroup.lua @@ -1860,6 +1860,7 @@ function ARMYGROUP:_UpdateEngageTarget() else -- Could not get position of target (not alive any more?) ==> Disengage. + self:T(self.lid.."Could not get position of target ==> Disengage!") self:Disengage() end @@ -1867,6 +1868,7 @@ function ARMYGROUP:_UpdateEngageTarget() else -- Target not alive any more ==> Disengage. + self:T(self.lid.."Target not ALIVE ==> Disengage!") self:Disengage() end diff --git a/Moose Development/Moose/Ops/Target.lua b/Moose Development/Moose/Ops/Target.lua index 4cdbbdbfa..c5b9ca558 100644 --- a/Moose Development/Moose/Ops/Target.lua +++ b/Moose Development/Moose/Ops/Target.lua @@ -526,11 +526,11 @@ function TARGET:IsAlive() for _,_target in pairs(self.targets) do local target=_target --Ops.Target#TARGET.Object - if target.Status==TARGET.ObjectStatus.ALIVE then + if target.Status~=TARGET.ObjectStatus.DEAD then return true end end - + return false end From e2e9bd7de05ab1ca26295a6af6d0e19428baa96d Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Tue, 26 Dec 2023 08:53:11 +0100 Subject: [PATCH 11/11] Update EasyGCICAP.lua --- Moose Development/Moose/Ops/EasyGCICAP.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/EasyGCICAP.lua b/Moose Development/Moose/Ops/EasyGCICAP.lua index 0d2ce7d99..34ec1301b 100644 --- a/Moose Development/Moose/Ops/EasyGCICAP.lua +++ b/Moose Development/Moose/Ops/EasyGCICAP.lua @@ -141,14 +141,14 @@ -- -- **Note** If you need different tanker types, i.e. Boom and Drogue, set them up at different AirWings! -- -- Add a tanker point -- mywing:AddPatrolPointTanker(AIRBASE.Caucasus.Kutaisi,ZONE:FindByName("Blue Zone Tanker"):GetCoordinate(),20000,280,270,50) --- -- Add an AWACS squad - Radio 251 AM, TACAN 51Y +-- -- Add a tanker squad - Radio 251 AM, TACAN 51Y -- mywing:AddTankerSquadron("Blue Tanker","Tanker Ops Kutaisi",AIRBASE.Caucasus.Kutaisi,20,AI.Skill.EXCELLENT,602,nil,251,radio.modulation.AM,51) -- -- ### Add an AWACS (optional) -- -- -- Add an AWACS point -- mywing:AddPatrolPointAwacs(AIRBASE.Caucasus.Kutaisi,ZONE:FindByName("Blue Zone AWACS"):GetCoordinate(),25000,300,270,50) --- -- Add a tanker squad - Radio 251 AM, TACAN 51Y +-- -- Add an AWACS squad - Radio 251 AM, TACAN 51Y -- mywing:AddAWACSSquadron("Blue AWACS","AWACS Ops Kutaisi",AIRBASE.Caucasus.Kutaisi,20,AI.Skill.AVERAGE,702,nil,271,radio.modulation.AM) -- -- # Fine-Tuning