FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Applevangelist 2023-12-26 19:19:45 +01:00
commit 7aa150f287
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-includes.yml vendored
View File

@ -107,7 +107,7 @@ jobs:
- name: Run LuaSrcDiet - name: Run LuaSrcDiet
run: | run: |
luasrcdiet --basic --opt-emptylines ./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 # Push to MOOSE_INCLUDE
######################################################################### #########################################################################

6
Moose Development/Moose/Functional/AICSAR.lua
View File

@ -608,8 +608,8 @@ function AICSAR:SetPilotTTSVoice(Voice,Culture,Gender)
self.SRSPilot:SetLabel("PILOT") self.SRSPilot:SetLabel("PILOT")
if self.SRSGoogle then if self.SRSGoogle then
local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions
self.SRSOperator:SetGoogle(poptions.credentials) self.SRSPilot:SetGoogle(poptions.credentials)
self.SRSOperator:SetGoogleAPIKey(poptions.key) self.SRSPilot:SetGoogleAPIKey(poptions.key)
end end
return self return self
end end
@ -629,7 +629,7 @@ function AICSAR:SetOperatorTTSVoice(Voice,Culture,Gender)
self.SRSOperator:SetVoice(Voice) self.SRSOperator:SetVoice(Voice)
self.SRSOperator:SetCulture(Culture or "en-GB") self.SRSOperator:SetCulture(Culture or "en-GB")
self.SRSOperator:SetGender(Gender or "female") self.SRSOperator:SetGender(Gender or "female")
self.SRSPilot:SetLabel("RESCUE") self.SRSOperator:SetLabel("RESCUE")
if self.SRSGoogle then if self.SRSGoogle then
local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions
self.SRSOperator:SetGoogle(poptions.credentials) self.SRSOperator:SetGoogle(poptions.credentials)

2
Moose Development/Moose/Ops/ArmyGroup.lua
View File

@ -1860,6 +1860,7 @@ function ARMYGROUP:_UpdateEngageTarget()
else else
-- Could not get position of target (not alive any more?) ==> Disengage. -- Could not get position of target (not alive any more?) ==> Disengage.
self:T(self.lid.."Could not get position of target ==> Disengage!")
self:Disengage() self:Disengage()
end end
@ -1867,6 +1868,7 @@ function ARMYGROUP:_UpdateEngageTarget()
else else
-- Target not alive any more ==> Disengage. -- Target not alive any more ==> Disengage.
self:T(self.lid.."Target not ALIVE ==> Disengage!")
self:Disengage() self:Disengage()
end end

4
Moose Development/Moose/Ops/EasyGCICAP.lua
View File

@ -141,14 +141,14 @@
-- -- **Note** If you need different tanker types, i.e. Boom and Drogue, set them up at different AirWings! -- -- **Note** If you need different tanker types, i.e. Boom and Drogue, set them up at different AirWings!
-- -- Add a tanker point -- -- Add a tanker point
-- mywing:AddPatrolPointTanker(AIRBASE.Caucasus.Kutaisi,ZONE:FindByName("Blue Zone Tanker"):GetCoordinate(),20000,280,270,50) -- 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) -- 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 (optional)
-- --
-- -- Add an AWACS point -- -- Add an AWACS point
-- mywing:AddPatrolPointAwacs(AIRBASE.Caucasus.Kutaisi,ZONE:FindByName("Blue Zone AWACS"):GetCoordinate(),25000,300,270,50) -- 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) -- mywing:AddAWACSSquadron("Blue AWACS","AWACS Ops Kutaisi",AIRBASE.Caucasus.Kutaisi,20,AI.Skill.AVERAGE,702,nil,271,radio.modulation.AM)
-- --
-- # Fine-Tuning -- # Fine-Tuning

4
Moose Development/Moose/Ops/Target.lua
View File

@ -526,11 +526,11 @@ function TARGET:IsAlive()
for _,_target in pairs(self.targets) do for _,_target in pairs(self.targets) do
local target=_target --Ops.Target#TARGET.Object local target=_target --Ops.Target#TARGET.Object
if target.Status==TARGET.ObjectStatus.ALIVE then if target.Status~=TARGET.ObjectStatus.DEAD then
return true return true
end end
end end
return false return false
end end

1
Moose Development/Moose/Sound/SRS.lua
View File

@ -1529,6 +1529,7 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab
-- We use a specific voice -- We use a specific voice
options.provider[provider].voice = Voice options.provider[provider].voice = Voice
else else
-- DCS-gRPC doesn't directly support language/gender, but can use SSML -- DCS-gRPC doesn't directly support language/gender, but can use SSML
local preTag, genderProp, langProp, postTag = '', '', '', '' local preTag, genderProp, langProp, postTag = '', '', '', ''