From 5f14fe07031ad6fe95b3c7c7f586da32d949ace2 Mon Sep 17 00:00:00 2001
From: Dazed <dazedanon@gmail.com>
Date: Sun, 4 Feb 2024 16:27:14 -0600
Subject: [PATCH] Small changes

---
 modules/rpgmakerace.py  | 23 +++++++++++++----------
 modules/rpgmakermvmz.py | 15 +++++++++------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/modules/rpgmakerace.py b/modules/rpgmakerace.py
index c834ea2..eb6405c 100644
--- a/modules/rpgmakerace.py
+++ b/modules/rpgmakerace.py
@@ -50,7 +50,7 @@ if 'gpt-3.5' in MODEL:
 elif 'gpt-4' in MODEL:
     INPUTAPICOST = .01
     OUTPUTAPICOST = .03
-    BATCHSIZE = 40
+    BATCHSIZE = 20
     FREQUENCY_PENALTY = 0.1
 
 #tqdm Globals
@@ -59,11 +59,12 @@ POSITION = 0
 LEAVE = False
 
 # Dialogue / Scroll
-CODE401 = True
-CODE405 = True
+CODE401 = False
+CODE405 = False
+CODE408 = True
 
 # Choices
-CODE102 = True
+CODE102 = False
 
 # Variables
 CODE122 = False
@@ -80,7 +81,6 @@ CODE320 = False
 CODE324 = False
 CODE111 = False
 CODE108 = False
-CODE408 = False
 
 def handleACE(filename, estimate):
     global ESTIMATE, TOKENS
@@ -1031,7 +1031,7 @@ def searchCodes(page, pbar, fillList, filename):
                         # Grab Translated String
                         translatedText = fillList[0]
                         
-                        # Remove added speaker
+                        # Remove speaker
                         if speaker != '':
                             matchSpeakerList = re.findall(r'(^.+?)\s?[|:]\s?', translatedText)
                             if len(matchSpeakerList) > 0:
@@ -1751,10 +1751,12 @@ def searchCodes(page, pbar, fillList, filename):
                     for choice in range(len(codeList[i]['p'][0])):
                         translatedText = translatedTextList[choice]
 
-                        # Remove characters that may break scripts
-                        charList = ['.', '\"', '\\n']
-                        for char in charList:
-                            translatedText = translatedText.replace(char, '')
+                        # Remove speaker
+                        matchSpeakerList = re.findall(r'(^.+?)\s?[|:]\s?', translatedText)
+                        if len(matchSpeakerList) > 0:
+                            newSpeaker = matchSpeakerList[0]
+                            nametag = nametag.replace(speaker, newSpeaker)
+                        translatedText = re.sub(r'(^.+?)\s?[|:]\s?', '', translatedText)
 
                         # Set Data
                         totalTokens[0] += response[1][0]
@@ -2172,6 +2174,7 @@ Output ONLY the {LANGUAGE} translation in the following format: `Translation: <{
 - Never include any notes, explanations, dislaimers, or anything similar in your response.\n\
 - Maintain any spacing in the translation.\n\
 - Maintain any code text in brackets if given. (e.g `[Color_0]`, `[Ascii_0]`, etc)\n\
+- `...` can be a part of the dialogue. Translate it as it is.\n\
 {VOCAB}\n\
 "
     user = f'{subbedT}'
diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py
index c55215a..8c13d79 100644
--- a/modules/rpgmakermvmz.py
+++ b/modules/rpgmakermvmz.py
@@ -58,6 +58,7 @@ LEAVE = False
 # Dialogue / Scroll
 CODE401 = True
 CODE405 = True
+CODE408 = True
 
 # Choices
 CODE102 = True
@@ -77,7 +78,6 @@ CODE320 = False
 CODE324 = False
 CODE111 = False
 CODE108 = False
-CODE408 = False
 
 def handleMVMZ(filename, estimate):
     global ESTIMATE, TOKENS
@@ -1022,7 +1022,7 @@ def searchCodes(page, pbar, fillList, filename):
                         # Grab Translated String
                         translatedText = fillList[0]
                         
-                        # Remove added speaker
+                        # Remove speaker
                         if speaker != '':
                             matchSpeakerList = re.findall(r'(^.+?)\s?[|:]\s?', translatedText)
                             if len(matchSpeakerList) > 0:
@@ -1742,10 +1742,12 @@ def searchCodes(page, pbar, fillList, filename):
                     for choice in range(len(codeList[i]['parameters'][0])):
                         translatedText = translatedTextList[choice]
 
-                        # Remove characters that may break scripts
-                        charList = ['.', '\"', '\\n']
-                        for char in charList:
-                            translatedText = translatedText.replace(char, '')
+                        # Remove speaker
+                        matchSpeakerList = re.findall(r'(^.+?)\s?[|:]\s?', translatedText)
+                        if len(matchSpeakerList) > 0:
+                            newSpeaker = matchSpeakerList[0]
+                            nametag = nametag.replace(speaker, newSpeaker)
+                        translatedText = re.sub(r'(^.+?)\s?[|:]\s?', '', translatedText)
 
                         # Set Data
                         totalTokens[0] += response[1][0]
@@ -2178,6 +2180,7 @@ Output ONLY the {LANGUAGE} translation in the following format: `Translation: <{
 - Never include any notes, explanations, dislaimers, or anything similar in your response.\n\
 - Maintain any spacing in the translation.\n\
 - Maintain any code text in brackets if given. (e.g `[Color_0]`, `[Ascii_0]`, etc)\n\
+- `...` can be a part of the dialogue. Translate it as it is.\n\
 {VOCAB}\n\
 "
     user = f'{subbedT}'