fix missing subtitles for some voicelines

Author: ZingBallyhoo

DataTool/FindLogic/Combo.cs

@@ -210,7 +210,6 @@ public class VoiceLineInstanceInfo {
         public ulong VoiceStimulus;
         public ulong[] Conversations;
         public ulong Subtitle;
-        public ulong SubtitleRuntime;
         public HashSet<ulong> SoundFiles;
 
         public STUCriteriaContainer? m_criteria;
@@ -1052,11 +1051,14 @@ public static ComboInfo Find(ComboInfo info, ulong guid, Dictionary<ulong, ulong
                         voiceLineInstanceInfo.VoiceStimulus = voiceLineInstance.m_voiceLineRuntime.m_stimulus;
                         voiceLineInstanceInfo.ExternalSound = voiceLineInstance.m_voiceLineRuntime.m_externalSound;
                         voiceLineInstanceInfo.Conversations = voiceLineInstance.m_voiceLineRuntime.m_BD1B6F64?.Select(x => x.GUID.GUID).ToArray();
-                        voiceLineInstanceInfo.SubtitleRuntime = voiceLineInstance.m_voiceLineRuntime.m_6148094F;
                         voiceLineInstanceInfo.m_criteria = voiceLineInstance.m_voiceLineRuntime.m_criteria;
                         voiceLineInstanceInfo.m_weight = voiceLineInstance.m_voiceLineRuntime.m_weight;
                         Find(info, voiceLineInstanceInfo.ExternalSound, replacements, context);
-                        Find(info, voiceLineInstanceInfo.SubtitleRuntime, replacements, context);
+
+                        if (voiceLineInstanceInfo.Subtitle == 0) {
+                            voiceLineInstanceInfo.Subtitle = voiceLineInstance.m_voiceLineRuntime.m_6148094F;
+                            Find(info, voiceLineInstanceInfo.Subtitle, replacements, context);
+                        }
                     } else {
                         Console.Out.WriteLine("[DataTool.FindLogic.Combo]: ERROR: voice data container was null (please contact the developers)");
                         if (Debugger.IsAttached) {

DataTool/SaveLogic/Combo.cs

@@ -105,7 +105,7 @@ public static void SaveVoiceLineInstance(
                 var subtitleStr = subtitle.Trim().TrimEnd('.');
                 if (soundSet.Count > 1) {
                     realPath = Path.Combine(realPath, GetValidFilename(subtitleStr));
-                    WriteFile(string.Join("\n", subtitle), Path.Combine(realPath, $"{teResourceGUID.LongKey(voiceLineInstanceInfo.Subtitle):X8}-{teResourceGUID.LongKey(voiceLineInstanceInfo.SubtitleRuntime):X8}-subtitles.txt"));
+                    WriteFile(string.Join("\n", subtitle), Path.Combine(realPath, $"{teResourceGUID.LongKey(voiceLineInstanceInfo.Subtitle):X8}-subtitles.txt"));
                 } else if (soundSet.Count == 1) {
                     try {
                         if (subtitleAsSound) {

DataTool/Static/GUIDNames.csv

@@ -154,7 +154,7 @@ D8,078,Turret/EnemyTurretSeen,1
 69B,078,Hack,1
 69C,078,Hack,1
 69D,078,StealthActivate,1
-69E,078,YourWelcome,1
+69E,078,YoureWelcome,1
 6A1,078,Laugh,1
 6A4,078,Junkenstein,1
 6A5,078,Junkenstein,1