From 99205e9d692337510e21de87857dbbe71d018f59 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Sat, 2 Nov 2024 12:33:21 +0300 Subject: [PATCH 1/9] tiranda and tavish2 --- .../ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl | 1 + Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl index 9a5b44a9de8..ffc94ed1761 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl @@ -58,3 +58,4 @@ tts-voice-name-hearthstone-tarkus = (NEW) [Hearthstone] Таркус tts-voice-name-hearthstone-uter = (NEW) [Hearthstone] Утер tts-voice-name-hearthstone-malfurion = (NEW) [Hearthstone] Малфурион tts-voice-name-hearthstone-gul-dan = (NEW) [Hearthstone] ГулДан +tts-voice-name-hearthstone-tiranda = (NEW) [Hearthstone] Тиранда diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index c0d54d22d70..06a55085161 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -294,7 +294,7 @@ id: HearthstoneZverolovTavish name: tts-voice-name-hearthstone-zverolov-tavish sex: Male - speaker: hearthstone_zverolov_tavish + speaker: hearthstone_zverolov_tavish_2 provider: sunrise - type: ttsVoice @@ -508,3 +508,10 @@ provider: sunrise roundStart: true sponsorOnly: false + +- type: ttsVoice + id: HearthstoneTiranda + name: tts-voice-name-hearthstone-tiranda + sex: Female + speaker: hearthstone_tiranda + provider: sunrise From 11ee97e607a07a4f160787ff20eb074acdf67e86 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Tue, 5 Nov 2024 14:12:13 +0300 Subject: [PATCH 2/9] s --- .../_sunrise/tts/tts-voices-sunrise.ftl | 3 ++- .../_Sunrise/tts_voices_sunrise.yml | 23 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl index ffc94ed1761..2174e817b9c 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl @@ -35,7 +35,8 @@ tts-voice-name-hearthstone-reno = (NEW) [Hearthstone] Рено tts-voice-name-hearthstone-zverolov-tavish = (NEW) [Hearthstone] Зверолов Тавиш tts-voice-name-hearthstone-elisa = (NEW) [Hearthstone] Элиза tts-voice-name-hearthstone-sotis = (NEW) [Hearthstone] Сотис -tts-voice-name-hearthstone-mediv = (NEW) [Hearthstone] Медив +tts-voice-name-hearthstone-mediv1 = (NEW) [Hearthstone] Медив +tts-voice-name-hearthstone-mediv2 = (NEW) [Hearthstone] Медив II tts-voice-name-mtf1 = (NEW) [Containment Breach] MTF 1 tts-voice-name-mtf2 = (NEW) [Containment Breach] MTF 2 tts-voice-name-petr_glance_ivashenko = (NEW) [Актер Озвучки] Пётр Иващенко diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index 06a55085161..c5ba1e1810d 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -294,7 +294,7 @@ id: HearthstoneZverolovTavish name: tts-voice-name-hearthstone-zverolov-tavish sex: Male - speaker: hearthstone_zverolov_tavish_2 + speaker: hearthstone_zverolov_tavish provider: sunrise - type: ttsVoice @@ -311,13 +311,6 @@ speaker: hearthstone_sotis provider: sunrise -- type: ttsVoice - id: HearthstoneMediv - name: tts-voice-name-hearthstone-mediv - sex: Male - speaker: hearthstone_mediv - provider: sunrise - - type: ttsVoice id: CBMTF1 name: tts-voice-name-mtf1 @@ -515,3 +508,17 @@ sex: Female speaker: hearthstone_tiranda provider: sunrise + +- type: ttsVoice + id: HearthstoneMediv1 + name: tts-voice-name-hearthstone-mediv1 + sex: Male + speaker: hearthstone_mediv1 + provider: sunrise + +- type: ttsVoice + id: HearthstoneMediv2 + name: tts-voice-name-hearthstone-mediv2 + sex: Male + speaker: hearthstone_mediv2 + provider: sunrise From 51c38bdf9d45a6fd26306b8917794629c3b82463 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Tue, 5 Nov 2024 14:21:25 +0300 Subject: [PATCH 3/9] clean --- .../_Sunrise/tts_voices_sunrise.yml | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index c5ba1e1810d..f48d5d35fcf 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -79,15 +79,6 @@ provider: sunrise sponsorOnly: true -- type: ttsVoice - id: Livsey - name: tts-voice-name-livsey - sex: Male - speaker: livsey - roundStart: false # устаревший способ обучения моделей - provider: sunrise - sponsorOnly: true - - type: ttsVoice id: HL2Barni name: tts-voice-name-hl2-barni @@ -146,7 +137,7 @@ id: Livsey2 name: tts-voice-name-livsey sex: Male - speaker: livsey_2 + speaker: livsey roundStart: true provider: sunrise sponsorOnly: true @@ -169,13 +160,6 @@ provider: sunrise sponsorOnly: true -- type: ttsVoice - id: Ludvig - name: tts-voice-name-ludvig - sex: Male - speaker: ludvig - provider: sunrise - - type: ttsVoice id: IcarusRevenge name: tts-voice-name-icarus-revenge @@ -198,14 +182,6 @@ speaker: kendrick provider: sunrise -- type: ttsVoice - id: SplikZerys - name: tts-voice-name-splikzerys - sex: Male - speaker: splikzerys - provider: sunrise - roundStart: false # предстоит перетренировка модели - - type: ttsVoice id: Dota2Riki name: tts-voice-name-dota2-riki From 302af40255e544c268ed3993e6d494bdaa530cd3 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Sun, 10 Nov 2024 09:42:21 +0300 Subject: [PATCH 4/9] thrall --- .../ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl | 1 + Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl index 2174e817b9c..6db989f1c3b 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl @@ -60,3 +60,4 @@ tts-voice-name-hearthstone-uter = (NEW) [Hearthstone] Утер tts-voice-name-hearthstone-malfurion = (NEW) [Hearthstone] Малфурион tts-voice-name-hearthstone-gul-dan = (NEW) [Hearthstone] ГулДан tts-voice-name-hearthstone-tiranda = (NEW) [Hearthstone] Тиранда +tts-voice-name-hearthstone-thrall = (NEW) [Hearthstone] Троль diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index f48d5d35fcf..bca31e89e66 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -498,3 +498,10 @@ sex: Male speaker: hearthstone_mediv2 provider: sunrise + +- type: ttsVoice + id: HearthstoneThrall + name: tts-voice-name-hearthstone-thrall + sex: Male + speaker: hearthstone_thrall + provider: sunrise From 87891306d1343af99cb692c7ae51485728f41175 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Wed, 13 Nov 2024 00:33:42 +0300 Subject: [PATCH 5/9] asd --- .../_sunrise/tts/tts-voices-sunrise.ftl | 6 ++- .../_Sunrise/tts_voices_sunrise.yml | 45 ++++++++++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl index 6db989f1c3b..118d00f4ab5 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl @@ -51,7 +51,7 @@ tts-voice-name-pathologic2-alexander-saburov = (NEW) [Pathologic 2] Алекса tts-voice-name-pathologic2-inkvizitor = (NEW) [Pathologic 2] Инквизитор tts-voice-name-pathologic2-alexander-blok = (NEW) [Pathologic 2] Александр Блок tts-voice-name-pathologic2-mark-bessmertnik = (NEW) [Pathologic 2] Марк Бессмертник -tts-voice-name-crysis2-ai-blackops-03-v1 = (NEW) [Crysis 2] Оперативник 3 1.0 +tts-voice-name-crysis2-ai-blackops-03-v1 = (NEW) [Crysis 2] Оперативник 3 tts-voice-name-crysis2-ai-costume = (NEW) [Crysis 2] ИИ Нанокостюма 2.0 tts-voice-name-hearthstone-bellok-bright-blade = (NEW) [Hearthstone] Беллок Сияющий Клинок tts-voice-name-hearthstone-prince-artas = (NEW) [Hearthstone] Принц Артас @@ -61,3 +61,7 @@ tts-voice-name-hearthstone-malfurion = (NEW) [Hearthstone] Малфурион tts-voice-name-hearthstone-gul-dan = (NEW) [Hearthstone] ГулДан tts-voice-name-hearthstone-tiranda = (NEW) [Hearthstone] Тиранда tts-voice-name-hearthstone-thrall = (NEW) [Hearthstone] Троль +tts-voice-name-warcraft-lord-garithos = (NEW) [Warcraft] Лорд Гаритос +tts-voice-name-crysis2-ai-usafrican-01 = (NEW) [Crysis 2] Оперативник 1 +tts-voice-name-warcraft-muradin = (NEW) [Warcraft] Мурадин +tts-voice-name-warcraft-artas-2 = (NEW) [Warcraft] Артас 2.0 diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index bca31e89e66..fb379c5883d 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -1,4 +1,9 @@ -- type: ttsVoice +# всего 66 голосов +# 51 уникальных доступных раундстартом +# 8 недоступных раундстартом +# 7 вторых версий + +- type: ttsVoice id: Minkir name: tts-voice-name-minkir sex: Male @@ -408,7 +413,7 @@ sponsorOnly: true - type: ttsVoice - id: Crysis2Operator3v1 # недообучена + id: Crysis2Operator3v1 name: tts-voice-name-crysis2-ai-blackops-03-v1 sex: Male speaker: crysis2_ai_blackops_03_v1 @@ -505,3 +510,39 @@ sex: Male speaker: hearthstone_thrall provider: sunrise + +- type: ttsVoice + id: Crysis2AIUsafrican01 + name: tts-voice-name-crysis2-ai-usafrican-01 + sex: Male + speaker: ai_usafrican_01 + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: WarcraftLordGarithos + name: tts-voice-name-warcraft-lord-garithos + sex: Male + speaker: warcraft_lord_garithos + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: WarcraftArtas2 + name: tts-voice-name-warcraft-artas-2 + sex: Male + speaker: warcraft_artas + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: WarcraftMuradin + name: tts-voice-name-warcraft-muradin + sex: Male + speaker: warcraft_muradin + provider: sunrise + roundStart: true + sponsorOnly: false From d1e1a31c600531a0e58043b7e75c50cdca049a94 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Wed, 13 Nov 2024 06:58:26 +0300 Subject: [PATCH 6/9] asd --- .../_sunrise/tts/tts-voices-sunrise.ftl | 7 ++++--- .../_Sunrise/tts_voices_sunrise.yml | 21 +++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl index 118d00f4ab5..fcdc2c5a612 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl @@ -61,7 +61,8 @@ tts-voice-name-hearthstone-malfurion = (NEW) [Hearthstone] Малфурион tts-voice-name-hearthstone-gul-dan = (NEW) [Hearthstone] ГулДан tts-voice-name-hearthstone-tiranda = (NEW) [Hearthstone] Тиранда tts-voice-name-hearthstone-thrall = (NEW) [Hearthstone] Троль -tts-voice-name-warcraft-lord-garithos = (NEW) [Warcraft] Лорд Гаритос +tts-voice-name-warcraft3-lord-garithos = (NEW) [Warcraft] Лорд Гаритос tts-voice-name-crysis2-ai-usafrican-01 = (NEW) [Crysis 2] Оперативник 1 -tts-voice-name-warcraft-muradin = (NEW) [Warcraft] Мурадин -tts-voice-name-warcraft-artas-2 = (NEW) [Warcraft] Артас 2.0 +tts-voice-name-warcraft3-muradin = (NEW) [Warcraft 3] Мурадин +tts-voice-name-warcraft3-artas-2 = (NEW) [Warcraft 3] Артас 2.0 +tts-voice-name-warcraft3-witcher = (NEW) [Warcraft 3] Ведьмак diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index fb379c5883d..cd0e454b7d4 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -521,28 +521,37 @@ sponsorOnly: false - type: ttsVoice - id: WarcraftLordGarithos + id: Warcraft3LordGarithos name: tts-voice-name-warcraft-lord-garithos sex: Male - speaker: warcraft_lord_garithos + speaker: warcraft3_lord_garithos provider: sunrise roundStart: true sponsorOnly: false - type: ttsVoice - id: WarcraftArtas2 + id: Warcraft3Artas2 name: tts-voice-name-warcraft-artas-2 sex: Male - speaker: warcraft_artas + speaker: warcraft3_artas provider: sunrise roundStart: true sponsorOnly: false - type: ttsVoice - id: WarcraftMuradin + id: Warcraft3Muradin name: tts-voice-name-warcraft-muradin sex: Male - speaker: warcraft_muradin + speaker: warcraft3_muradin + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: Warcraft3Witcher + name: tts-voice-name-warcraft3-witcher + sex: Male + speaker: warcraft3_witcher provider: sunrise roundStart: true sponsorOnly: false From f3a49a90557109ea27d58cebac358222196ab745 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Wed, 13 Nov 2024 06:58:44 +0300 Subject: [PATCH 7/9] asd --- Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index cd0e454b7d4..fd6def1b648 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -1,5 +1,5 @@ -# всего 66 голосов -# 51 уникальных доступных раундстартом +# всего 67 голосов +# 52 уникальных доступных раундстартом # 8 недоступных раундстартом # 7 вторых версий From 8b0ae54ee331541de969de4734d963988bd8fb65 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Wed, 13 Nov 2024 08:22:12 +0300 Subject: [PATCH 8/9] asd --- Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index fd6def1b648..288402ee666 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -553,5 +553,5 @@ sex: Male speaker: warcraft3_witcher provider: sunrise - roundStart: true + roundStart: false # перетренировать sponsorOnly: false From b7856541e6798b14ae77e7dc0b3586bf8657db55 Mon Sep 17 00:00:00 2001 From: SplikZerys Date: Wed, 20 Nov 2024 08:42:51 +0300 Subject: [PATCH 9/9] tttttttttttttasdasdad --- Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index 288402ee666..06d9c864392 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -522,7 +522,7 @@ - type: ttsVoice id: Warcraft3LordGarithos - name: tts-voice-name-warcraft-lord-garithos + name: tts-voice-name-warcraft3-lord-garithos sex: Male speaker: warcraft3_lord_garithos provider: sunrise @@ -531,7 +531,7 @@ - type: ttsVoice id: Warcraft3Artas2 - name: tts-voice-name-warcraft-artas-2 + name: tts-voice-name-warcraft3-artas-2 sex: Male speaker: warcraft3_artas provider: sunrise @@ -540,7 +540,7 @@ - type: ttsVoice id: Warcraft3Muradin - name: tts-voice-name-warcraft-muradin + name: tts-voice-name-warcraft3-muradin sex: Male speaker: warcraft3_muradin provider: sunrise