From 45912911ee8b46e47f451e61de9619e3c44b3cb1 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 27 Dec 2024 14:40:32 +0100 Subject: [PATCH 1/2] #MSRS Google 2025 voice catalog --- Moose Development/Moose/Sound/SRS.lua | 130 ++++++++++++++++---------- 1 file changed, 79 insertions(+), 51 deletions(-) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 261489e7b..3726f309f 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -318,11 +318,14 @@ MSRS.Voices = { ["en_IN_Standard_B"] = 'en-IN-Standard-B', -- [6] MALE ["en_IN_Standard_C"] = 'en-IN-Standard-C', -- [7] MALE ["en_IN_Standard_D"] = 'en-IN-Standard-D', -- [8] FEMALE - ["en_GB_Standard_A"] = 'en-GB-Standard-A', -- [9] FEMALE - ["en_GB_Standard_B"] = 'en-GB-Standard-B', -- [10] MALE - ["en_GB_Standard_C"] = 'en-GB-Standard-C', -- [11] FEMALE - ["en_GB_Standard_D"] = 'en-GB-Standard-D', -- [12] MALE - ["en_GB_Standard_F"] = 'en-GB-Standard-F', -- [13] FEMALE + -- 2025 changes + ["en_GB_Standard_A"] = 'en-GB-Standard-N', -- [9] FEMALE + ["en_GB_Standard_B"] = 'en-GB-Standard-O', -- [10] MALE + ["en_GB_Standard_C"] = 'en-GB-Standard-N', -- [11] FEMALE + ["en_GB_Standard_D"] = 'en-GB-Standard-O', -- [12] MALE + ["en_GB_Standard_F"] = 'en-GB-Standard-N', -- [13] FEMALE + ["en_GB_Standard_O"] = 'en-GB-Standard-O', -- [12] MALE + ["en_GB_Standard_N"] = 'en-GB-Standard-N', -- [13] FEMALE ["en_US_Standard_A"] = 'en-US-Standard-A', -- [14] MALE ["en_US_Standard_B"] = 'en-US-Standard-B', -- [15] MALE ["en_US_Standard_C"] = 'en-US-Standard-C', -- [16] FEMALE @@ -333,25 +336,36 @@ MSRS.Voices = { ["en_US_Standard_H"] = 'en-US-Standard-H', -- [21] FEMALE ["en_US_Standard_I"] = 'en-US-Standard-I', -- [22] MALE ["en_US_Standard_J"] = 'en-US-Standard-J', -- [23] MALE - ["fr_FR_Standard_A"] = "fr-FR-Standard-A", -- Female - ["fr_FR_Standard_B"] = "fr-FR-Standard-B", -- Male - ["fr_FR_Standard_C"] = "fr-FR-Standard-C", -- Female - ["fr_FR_Standard_D"] = "fr-FR-Standard-D", -- Male - ["fr_FR_Standard_E"] = "fr-FR-Standard-E", -- Female - ["de_DE_Standard_A"] = "de-DE-Standard-A", -- Female - ["de_DE_Standard_B"] = "de-DE-Standard-B", -- Male - ["de_DE_Standard_C"] = "de-DE-Standard-C", -- Female - ["de_DE_Standard_D"] = "de-DE-Standard-D", -- Male - ["de_DE_Standard_E"] = "de-DE-Standard-E", -- Male - ["de_DE_Standard_F"] = "de-DE-Standard-F", -- Female - ["es_ES_Standard_A"] = "es-ES-Standard-A", -- Female - ["es_ES_Standard_B"] = "es-ES-Standard-B", -- Male - ["es_ES_Standard_C"] = "es-ES-Standard-C", -- Female - ["es_ES_Standard_D"] = "es-ES-Standard-D", -- Female - ["it_IT_Standard_A"] = "it-IT-Standard-A", -- Female - ["it_IT_Standard_B"] = "it-IT-Standard-B", -- Female - ["it_IT_Standard_C"] = "it-IT-Standard-C", -- Male - ["it_IT_Standard_D"] = "it-IT-Standard-D", -- Male + -- 2025 catalog changes + ["fr_FR_Standard_A"] = "fr-FR-Standard-F", -- Female + ["fr_FR_Standard_B"] = "fr-FR-Standard-G", -- Male + ["fr_FR_Standard_C"] = "fr-FR-Standard-F", -- Female + ["fr_FR_Standard_D"] = "fr-FR-Standard-G", -- Male + ["fr_FR_Standard_E"] = "fr-FR-Standard-F", -- Female + ["fr_FR_Standard_G"] = "fr-FR-Standard-G", -- Male + ["fr_FR_Standard_F"] = "fr-FR-Standard-F", -- Female + -- 2025 catalog changes + ["de_DE_Standard_A"] = "de-DE-Standard-G", -- Female + ["de_DE_Standard_B"] = "de-DE-Standard-H", -- Male + ["de_DE_Standard_C"] = "de-DE-Standard-G", -- Female + ["de_DE_Standard_D"] = "de-DE-Standard-H", -- Male + ["de_DE_Standard_E"] = "de-DE-Standard-H", -- Male + ["de_DE_Standard_F"] = "de-DE-Standard-G", -- Female + ["de_DE_Standard_H"] = "de-DE-Standard-H", -- Male + ["de_DE_Standard_G"] = "de-DE-Standard-G", -- Female + ["es_ES_Standard_A"] = "es-ES-Standard-E", -- Female + ["es_ES_Standard_B"] = "es-ES-Standard-F", -- Male + ["es_ES_Standard_C"] = "es-ES-Standard-E", -- Female + ["es_ES_Standard_D"] = "es-ES-Standard-F", -- Male + ["es_ES_Standard_E"] = "es-ES-Standard-E", -- Female + ["es_ES_Standard_F"] = "es-ES-Standard-F", -- Male + -- 2025 catalog changes + ["it_IT_Standard_A"] = "it-IT-Standard-E", -- Female + ["it_IT_Standard_B"] = "it-IT-Standard-E", -- Female + ["it_IT_Standard_C"] = "it-IT-Standard-F", -- Male + ["it_IT_Standard_D"] = "it-IT-Standard-F", -- Male + ["it_IT_Standard_E"] = "it-IT-Standard-E", -- Female + ["it_IT_Standard_F"] = "it-IT-Standard-F", -- Male }, Wavenet = { ["en_AU_Wavenet_A"] = 'en-AU-Wavenet-A', -- [1] FEMALE @@ -362,12 +376,15 @@ MSRS.Voices = { ["en_IN_Wavenet_B"] = 'en-IN-Wavenet-B', -- [6] MALE ["en_IN_Wavenet_C"] = 'en-IN-Wavenet-C', -- [7] MALE ["en_IN_Wavenet_D"] = 'en-IN-Wavenet-D', -- [8] FEMALE - ["en_GB_Wavenet_A"] = 'en-GB-Wavenet-A', -- [9] FEMALE - ["en_GB_Wavenet_B"] = 'en-GB-Wavenet-B', -- [10] MALE - ["en_GB_Wavenet_C"] = 'en-GB-Wavenet-C', -- [11] FEMALE - ["en_GB_Wavenet_D"] = 'en-GB-Wavenet-D', -- [12] MALE - ["en_GB_Wavenet_F"] = 'en-GB-Wavenet-F', -- [13] FEMALE - ["en_US_Wavenet_A"] = 'en-US-Wavenet-A', -- [14] MALE + -- 2025 changes + ["en_GB_Wavenet_A"] = 'en-GB-Wavenet-N', -- [9] FEMALE + ["en_GB_Wavenet_B"] = 'en-GB-Wavenet-O', -- [10] MALE + ["en_GB_Wavenet_C"] = 'en-GB-Wavenet-N', -- [11] FEMALE + ["en_GB_Wavenet_D"] = 'en-GB-Wavenet-O', -- [12] MALE + ["en_GB_Wavenet_F"] = 'en-GB-Wavenet-N', -- [13] FEMALE + ["en_GB_Wavenet_O"] = 'en-GB-Wavenet-O', -- [12] MALE + ["en_GB_Wavenet_N"] = 'en-GB-Wavenet-N', -- [13] FEMALE + ["en_US_Wavenet_A"] = 'en-US-Wavenet-N', -- [14] MALE ["en_US_Wavenet_B"] = 'en-US-Wavenet-B', -- [15] MALE ["en_US_Wavenet_C"] = 'en-US-Wavenet-C', -- [16] FEMALE ["en_US_Wavenet_D"] = 'en-US-Wavenet-D', -- [17] MALE @@ -377,24 +394,35 @@ MSRS.Voices = { ["en_US_Wavenet_H"] = 'en-US-Wavenet-H', -- [21] FEMALE ["en_US_Wavenet_I"] = 'en-US-Wavenet-I', -- [22] MALE ["en_US_Wavenet_J"] = 'en-US-Wavenet-J', -- [23] MALE - ["fr_FR_Wavenet_A"] = "fr-FR-Wavenet-A", -- Female - ["fr_FR_Wavenet_B"] = "fr-FR-Wavenet-B", -- Male - ["fr_FR_Wavenet_C"] = "fr-FR-Wavenet-C", -- Female - ["fr_FR_Wavenet_D"] = "fr-FR-Wavenet-D", -- Male - ["fr_FR_Wavenet_E"] = "fr-FR-Wavenet-E", -- Female - ["de_DE_Wavenet_A"] = "de-DE-Wavenet-A", -- Female - ["de_DE_Wavenet_B"] = "de-DE-Wavenet-B", -- Male - ["de_DE_Wavenet_C"] = "de-DE-Wavenet-C", -- Female - ["de_DE_Wavenet_D"] = "de-DE-Wavenet-D", -- Male - ["de_DE_Wavenet_E"] = "de-DE-Wavenet-E", -- Male - ["de_DE_Wavenet_F"] = "de-DE-Wavenet-F", -- Female - ["es_ES_Wavenet_B"] = "es-ES-Wavenet-B", -- Male - ["es_ES_Wavenet_C"] = "es-ES-Wavenet-C", -- Female - ["es_ES_Wavenet_D"] = "es-ES-Wavenet-D", -- Female - ["it_IT_Wavenet_A"] = "it-IT-Wavenet-A", -- Female - ["it_IT_Wavenet_B"] = "it-IT-Wavenet-B", -- Female - ["it_IT_Wavenet_C"] = "it-IT-Wavenet-C", -- Male - ["it_IT_Wavenet_D"] = "it-IT-Wavenet-D", -- Male + -- 2025 catalog changes + ["fr_FR_Wavenet_A"] = "fr-FR-Wavenet-F", -- Female + ["fr_FR_Wavenet_B"] = "fr-FR-Wavenet-G", -- Male + ["fr_FR_Wavenet_C"] = "fr-FR-Wavenet-F", -- Female + ["fr_FR_Wavenet_D"] = "fr-FR-Wavenet-G", -- Male + ["fr_FR_Wavenet_E"] = "fr-FR-Wavenet-F", -- Female + ["fr_FR_Wavenet_G"] = "fr-FR-Wavenet-G", -- Male + ["fr_FR_Wavenet_F"] = "fr-FR-Wavenet-F", -- Female + -- 2025 catalog changes + ["de_DE_Wavenet_A"] = "de-DE-Wavenet-G", -- Female + ["de_DE_Wavenet_B"] = "de-DE-Wavenet-H", -- Male + ["de_DE_Wavenet_C"] = "de-DE-Wavenet-G", -- Female + ["de_DE_Wavenet_D"] = "de-DE-Wavenet-H", -- Male + ["de_DE_Wavenet_E"] = "de-DE-Wavenet-H", -- Male + ["de_DE_Wavenet_F"] = "de-DE-Wavenet-G", -- Female + ["de_DE_Wavenet_H"] = "de-DE-Wavenet-H", -- Male + ["de_DE_Wavenet_G"] = "de-DE-Wavenet-G", -- Female + ["es_ES_Wavenet_B"] = "es-ES-Wavenet-E", -- Male + ["es_ES_Wavenet_C"] = "es-ES-Wavenet-F", -- Female + ["es_ES_Wavenet_D"] = "es-ES-Wavenet-E", -- Female + ["es_ES_Wavenet_E"] = "es-ES-Wavenet-E", -- Male + ["es_ES_Wavenet_F"] = "es-ES-Wavenet-F", -- Female + -- 2025 catalog changes + ["it_IT_Wavenet_A"] = "it-IT-Wavenet-E", -- Female + ["it_IT_Wavenet_B"] = "it-IT-Wavenet-E", -- Female + ["it_IT_Wavenet_C"] = "it-IT-Wavenet-F", -- Male + ["it_IT_Wavenet_D"] = "it-IT-Wavenet-F", -- Male + ["it_IT_Wavenet_E"] = "it-IT-Wavenet-E", -- Female + ["it_IT_Wavenet_F"] = "it-IT-Wavenet-F", -- Male } , }, } @@ -1634,9 +1662,9 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab end for _,freq in pairs(Frequencies) do - self:F("Calling GRPC.tts with the following parameter:") - self:F({ssml=ssml, freq=freq, options=options}) - self:F(options.provider[provider]) + self:T("Calling GRPC.tts with the following parameter:") + self:T({ssml=ssml, freq=freq, options=options}) + self:T(options.provider[provider]) GRPC.tts(ssml, freq*1e6, options) end From 3b3666c5f775f1653a99f244bdff72a3ad909e14 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sat, 28 Dec 2024 14:52:09 +0100 Subject: [PATCH 2/2] #AIRBASE add 2 Kola bases, correct #ENUM for OH-58D weps in STORAGE --- Moose Development/Moose/Utilities/Enums.lua | 22 +++++++-------- Moose Development/Moose/Wrapper/Airbase.lua | 30 ++++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Moose Development/Moose/Utilities/Enums.lua b/Moose Development/Moose/Utilities/Enums.lua index 0d43e2d1b..7686630b7 100644 --- a/Moose Development/Moose/Utilities/Enums.lua +++ b/Moose Development/Moose/Utilities/Enums.lua @@ -1196,17 +1196,17 @@ ENUMS.Storage.weapons.UH1H.M134_MiniGun_Left_Door = {4,15,46,174} ENUMS.Storage.weapons.UH1H.M60_MG_Left_Door = {4,15,46,176} -- Kiowa ENUMS.Storage.weapons.OH58.FIM92 = {4,4,7,449} -ENUMS.Storage.weapons.OH58.MG_M3P100 = {4,15,46,2608} -ENUMS.Storage.weapons.OH58.MG_M3P200 = {4,15,46,2607} -ENUMS.Storage.weapons.OH58.MG_M3P300 = {4,15,46,2606} -ENUMS.Storage.weapons.OH58.MG_M3P400 = {4,15,46,2605} -ENUMS.Storage.weapons.OH58.MG_M3P500 = {4,15,46,2604} -ENUMS.Storage.weapons.OH58.Smk_Grenade_Blue = {4,5,9,486} -ENUMS.Storage.weapons.OH58.Smk_Grenade_Green = {4,5,9,487} -ENUMS.Storage.weapons.OH58.Smk_Grenade_Red = {4,5,9,485} -ENUMS.Storage.weapons.OH58.Smk_Grenade_Violet = {4,5,9,488} -ENUMS.Storage.weapons.OH58.Smk_Grenade_White = {4,5,9,490} -ENUMS.Storage.weapons.OH58.Smk_Grenade_Yellow = {4,5,9,489} +ENUMS.Storage.weapons.OH58.MG_M3P100 = {4,15,46,2611} +ENUMS.Storage.weapons.OH58.MG_M3P200 = {4,15,46,2610} +ENUMS.Storage.weapons.OH58.MG_M3P300 = {4,15,46,2609} +ENUMS.Storage.weapons.OH58.MG_M3P400 = {4,15,46,2608} +ENUMS.Storage.weapons.OH58.MG_M3P500 = {4,15,46,2607} +ENUMS.Storage.weapons.OH58.Smk_Grenade_Blue = {4,5,9,488} +ENUMS.Storage.weapons.OH58.Smk_Grenade_Green = {4,5,9,489} +ENUMS.Storage.weapons.OH58.Smk_Grenade_Red = {4,5,9,487} +ENUMS.Storage.weapons.OH58.Smk_Grenade_Violet = {4,5,9,490} +ENUMS.Storage.weapons.OH58.Smk_Grenade_White = {4,5,9,492} +ENUMS.Storage.weapons.OH58.Smk_Grenade_Yellow = {4,5,9,491} -- Apache ENUMS.Storage.weapons.AH64D.AN_APG78 = {4,15,44,2138} ENUMS.Storage.weapons.AH64D.Internal_Aux_FuelTank = {1,3,43,1700} diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index f4d041449..1a1d6566e 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -791,6 +791,8 @@ AIRBASE.Sinai = { -- * AIRBASE.Kola.Vuojarvi -- * AIRBASE.Kola.Andoya -- * AIRBASE.Kola.Alakourtti +-- * AIRBASE.Kola.Kittila +-- * AIRBASE.Kola.Bardufoss -- -- @field Kola AIRBASE.Kola = { @@ -814,6 +816,8 @@ AIRBASE.Kola = { ["Vuojarvi"] = "Vuojarvi", ["Andoya"] = "Andoya", ["Alakourtti"] = "Alakourtti", + ["Kittila"] = "Kittila", + ["Bardufoss"] = "Bardufoss", } --- Airbases of the Afghanistan map @@ -855,19 +859,19 @@ AIRBASE.Afghanistan = { --- Airbases of the Iraq map -- --- * `AIRBASE.Iraq.Baghdad_International_Airport` Baghdad International Airport --- * `AIRBASE.Iraq.Sulaimaniyah_International_Airport` Sulaimaniyah International Airport --- * `AIRBASE.Iraq.Al_Sahra_Airport` Al-Sahra Airport --- * `AIRBASE.Iraq.Erbil_International_Airport` Erbil International Airport --- * `AIRBASE.Iraq.Al_Taji_Airport` Al-Taji Airport --- * `AIRBASE.Iraq.Al_Asad_Airbase` Al-Asad Airbase --- * `AIRBASE.Iraq.Al_Salam_Airbase` Al-Salam Airbase --- * `AIRBASE.Iraq.Balad_Airbase` Balad Airbase --- * `AIRBASE.Iraq.Kirkuk_International_Airport` Kirkuk International Airport --- * `AIRBASE.Iraq.Bashur_Airport` Bashur Airport --- * `AIRBASE.Iraq.Al_Taquddum_Airport` Al-Taquddum Airport --- * `AIRBASE.Iraq.Qayyarah_Airfield_West` Qayyarah Airfield West --- * `AIRBASE.Iraq.K1_Base` K1 Base +-- * AIRBASE.Iraq.Baghdad_International_Airport +-- * AIRBASE.Iraq.Sulaimaniyah_International_Airport +-- * AIRBASE.Iraq.Al_Sahra_Airport +-- * AIRBASE.Iraq.Erbil_International_Airpor +-- * AIRBASE.Iraq.Al_Taji_Airport +-- * AIRBASE.Iraq.Al_Asad_Airbase +-- * AIRBASE.Iraq.Al_Salam_Airbase +-- * AIRBASE.Iraq.Balad_Airbase +-- * AIRBASE.Iraq.Kirkuk_International_Airport +-- * AIRBASE.Iraq.Bashur_Airport +-- * AIRBASE.Iraq.Al_Taquddum_Airport +-- * AIRBASE.Iraq.Qayyarah_Airfield_West +-- * AIRBASE.Iraq.K1_Base -- -- @field Iraq AIRBASE.Iraq = {