Fix custom NPCs not getting a voice

zengbo20101 · Feb 12, 2020 · 717b79c · 717b79c
1 parent 5b31cb1
commit 717b79c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/PelicanTTS/PelicanTTSMod.cs b/PelicanTTS/PelicanTTSMod.cs
@@ -29,7 +29,9 @@ public override void Entry(IModHelper helper)
             _helper = helper;
             config = Helper.ReadConfig<ModConfig>();
 
-            Helper.Events.GameLoop.GameLaunched += GameLoop_GameLaunched;
+            Helper.Events.GameLoop.OneSecondUpdateTicked += GameLoop_OneSecondUpdateTicked;
+
+            helper.ConsoleCommands.Add("tts_update", "Updates new NPCs", (s,p) => setUpNPCConfig());
 
             Helper.WriteConfig<ModConfig>(config);
             string tmppath = Path.Combine(Path.Combine(Environment.CurrentDirectory, "Content"), "TTS");
@@ -51,7 +53,15 @@ public override void Entry(IModHelper helper)
 
         }
 
-        private void GameLoop_GameLaunched(object sender, GameLaunchedEventArgs e)
+        private void GameLoop_OneSecondUpdateTicked(object sender, OneSecondUpdateTickedEventArgs e)
+        {
+            setUpNPCConfig();
+            setUpConfig();
+            Helper.Events.GameLoop.OneSecondUpdateTicked -= GameLoop_OneSecondUpdateTicked;
+
+        }
+
+        private void setUpNPCConfig()
         {
             var npcs = Helper.Content.Load<Dictionary<string, string>>("Data//NPCDispositions", ContentSource.GameContent);
             foreach (string npc in npcs.Keys)
@@ -61,8 +71,8 @@ private void GameLoop_GameLaunched(object sender, GameLaunchedEventArgs e)
             }
             config.Rate = Math.Max(50, Math.Min(config.Rate, 200));
             Helper.WriteConfig<ModConfig>(config);
-            setUpConfig();
         }
+
         public static Dictionary<string, MenuVoiceSetup> activeVoiceSetup = new Dictionary<string, MenuVoiceSetup>();
         public static int activeRate = 100;
         public static float activeVolume = 1;

diff --git a/PelicanTTS/SpeechHandlerPolly.cs b/PelicanTTS/SpeechHandlerPolly.cs
@@ -172,10 +172,10 @@ public static string getVoice(string name, bool female = true)
             speakerName = name;
 
             string t = PelicanTTSMod.i18n.Get(name);
-            if (t.ToString() != "")
+            if (t.ToString() != "" && !t.Contains("no translation"))
                 return t;
 
-            return "default_" + (female ? "female" : "male");
+            return PelicanTTSMod.i18n.Get("default_" + (female ? "female" : "male"));
         }
 
 

diff --git a/PelicanTTS/manifest.json b/PelicanTTS/manifest.json
@@ -1,7 +1,7 @@
 {
   "Name": "PelicanTTS",
   "Author": "Platonymous",
-  "Version": "1.8.8",
+  "Version": "1.8.9",
   "Description": "Text-To-Speech Mod",
   "UniqueID": "Platonymous.PelicanTTS",
   "EntryDll": "PelicanTTS.dll",

diff --git a/_releases/PelicanTTS 1.8.9.zip b/_releases/PelicanTTS 1.8.9.zip