From 165a1b99aefe744ae6708850d0f730b789ad385f Mon Sep 17 00:00:00 2001
From: Dazed <dazedanon@gmail.com>
Date: Mon, 6 Nov 2023 13:07:47 -0600
Subject: [PATCH] display name and tyrano changes

---
 modules/rpgmakerace.py  |  6 ++++++
 modules/rpgmakermvmz.py | 10 +++++++---
 modules/tyrano.py       | 12 ++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/modules/rpgmakerace.py b/modules/rpgmakerace.py
index c9ad1cb..76fc6d3 100644
--- a/modules/rpgmakerace.py
+++ b/modules/rpgmakerace.py
@@ -195,6 +195,12 @@ def parseMap(data, filename):
     events = data['events']
     global LOCK
 
+    # Translate displayName for Map files
+    if 'Map' in filename:
+        response = translateGPT(data['display_name'], 'Reply with only the english translation of the RPG location name', False)
+        totalTokens += response[1]
+        data['display_name'] = response[0].replace('\"', '')
+
     # Get total for progress bar
     for key in events:
         if key is not None:
diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py
index 454389c..89bfebd 100644
--- a/modules/rpgmakermvmz.py
+++ b/modules/rpgmakermvmz.py
@@ -559,7 +559,7 @@ def searchCodes(page, pbar):
                     # Color Regex: ^([\\]+[cC]\[[0-9]\]+(.+?)[\\]+[cC]\[[0]\])
                     matchList = re.findall(r'(.*?([\\]+[nN]<(.+?)>).*)', finalJAString)
                     if len(matchList) > 0:  
-                        response = translateGPT(matchList[0][2], 'Reply with only the english translation of the NPC name', True)
+                        response = translateGPT(matchList[0][2], 'Reply with only the english translation of the NPC name', False)
                         tokens += response[1]
                         speaker = response[0].strip('.')
                         nametag = matchList[0][1].replace(matchList[0][2], speaker)
@@ -724,15 +724,19 @@ def searchCodes(page, pbar):
 
                     # Translate
                     if speaker == '' and finalJAString != '':
-                        response = translateGPT(finalJAString, 'Past Translated Text: (' + ', '.join(textHistory) + ')', True)
+                        response = translateGPT(finalJAString, textHistory, True)
                         tokens += response[1]
                         translatedText = response[0]
+
+                        # Remove added speaker
+                        translatedText = re.sub(r'^.+?:\s?', '', translatedText)
+
                         # Sub Vars
                         varResponse = subVars(translatedText)
                         subbedT = varResponse[0]
                         textHistory.append('\"' + varResponse[0] + '\"')
                     elif finalJAString != '':
-                        response = translateGPT(speaker + ': ' + finalJAString, 'Past Translated Text: (' + ', '.join(textHistory) + ')', True)
+                        response = translateGPT(speaker + ': ' + finalJAString, textHistory, True)
                         tokens += response[1]
                         translatedText = response[0]
                         
diff --git a/modules/tyrano.py b/modules/tyrano.py
index b9c58fc..88561c2 100644
--- a/modules/tyrano.py
+++ b/modules/tyrano.py
@@ -159,7 +159,7 @@ def translateTyrano(data, pbar):
                 translatedText = data[i].replace(matchList[0], translatedText.replace(' ', '\u00A0'))
                 data[i] = translatedText                
 
-        # Lines
+        # Grab Lines
         matchList = re.findall(r'(.+?)\[p\]', data[i])
         if len(matchList) > 0:
             matchList[0] = matchList[0].replace('「', '')
@@ -203,8 +203,8 @@ def translateTyrano(data, pbar):
                 translatedText = response[0]
                 textHistory.append('\"' + translatedText + '\"')
 
-                # Remove added speaker
-                translatedText = re.sub(r'^.+:\s?', '', translatedText)
+            # Remove added speaker
+            translatedText = re.sub(r'^.+:\s?', '', translatedText)
 
             # Set Data
             translatedText = translatedText.replace('ッ', '')
@@ -268,7 +268,7 @@ def translateTyrano(data, pbar):
             currentGroup = [] 
             speaker = ''
         
-        # pcm Line
+        # Grab Lines [p][cm]
         matchList = re.findall(r'(.+?)\[p\]\[cm\]', data[i])
         if len(matchList) > 0:
             matchList[0] = matchList[0].replace('「', '')
@@ -291,8 +291,8 @@ def translateTyrano(data, pbar):
                 translatedText = response[0]
                 textHistory.append('\"' + translatedText + '\"')
 
-                # Remove added speaker
-                translatedText = re.sub(r'^.+:\s?', '', translatedText)
+            # Remove added speaker
+            translatedText = re.sub(r'^.+:\s?', '', translatedText)
 
             # Set Data
             translatedText = translatedText.replace('ッ', '')