diff --git a/modules/images.py b/modules/images.py
index f1a48d7..b64844e 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -265,13 +265,17 @@ def processImagesDir(directory_path, imageList):
if ".txt" in file_name:
try:
- with open(f'{directory_path}/{file_name}', 'r', encoding='utf8') as file:
+ with open(
+ f"{directory_path}/{file_name}", "r", encoding="utf8"
+ ) as file:
for line in file:
line = line.strip()
- line = line.replace(':', '：')
- line = line.replace('/', '／')
- line = line.replace('?', '？')
- imageList[0].append(line) # Using strip() to remove any extra newlines or spaces
+ line = line.replace(":", "：")
+ line = line.replace("/", "／")
+ line = line.replace("?", "？")
+ imageList[0].append(
+ line
+ ) # Using strip() to remove any extra newlines or spaces
imageList[1].append([100, 15])
except FileNotFoundError:
print(f"The file at {file_path} was not found.")
diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py
index ffc7775..70e80a6 100644
--- a/modules/rpgmakermvmz.py
+++ b/modules/rpgmakermvmz.py
@@ -37,7 +37,7 @@ MAXHISTORY = 10
ESTIMATE = ""
TOKENS = [0, 0]
NAMESLIST = []
-FIRSTLINESPEAKERS = True # If 1st line of dialogue is a speaker, set to True
+FIRSTLINESPEAKERS = False # If 1st line of dialogue is a speaker, set to True
NAMES = False # Output a list of all the character names found
BRFLAG = False # If the game uses
instead
FIXTEXTWRAP = True # Overwrites textwrap
@@ -67,12 +67,12 @@ POSITION = 0
LEAVE = False
# Dialogue / Scroll
-CODE401 = True
-CODE405 = True
-CODE408 = False
+CODE401 = False
+CODE405 = False
+CODE408 = True
# Choices
-CODE102 = True
+CODE102 = False
# Variables
CODE122 = False
@@ -682,10 +682,11 @@ def searchNames(data, pbar, context):
nameList.append(data[i]["name"])
# Notes
- if "")
- totalTokens[0] += tokensResponse[0]
- totalTokens[1] += tokensResponse[1]
+ if "note" in data[i]:
+ if "")
+ totalTokens[0] += tokensResponse[0]
+ totalTokens[1] += tokensResponse[1]
i += 1
else:
batchFull = True
@@ -845,12 +846,14 @@ def searchCodes(page, pbar, jobList, filename):
list122 = jobList[1]
list355655 = jobList[2]
list108 = jobList[3]
+ list356 = jobList[4]
setData = True
else:
list401 = []
list122 = []
list355655 = []
list108 = []
+ list356 = []
setData = False
textHistory = []
match = []
@@ -971,7 +974,9 @@ def searchCodes(page, pbar, jobList, filename):
and len(codeList[i + 1]["parameters"]) > 0
and len(codeList[i + 1]["parameters"][0]) > 0
):
- if codeList[i + 1]["parameters"][0].strip()[0] in [
+ if codeList[i + 1]["parameters"] != "" and codeList[i + 1][
+ "parameters"
+ ][0].strip()[0] in [
"「",
'"',
"(",
@@ -1247,7 +1252,7 @@ def searchCodes(page, pbar, jobList, filename):
## Event Code: 122 [Set Variables]
if "code" in codeList[i] and codeList[i]["code"] == 122 and CODE122 is True:
# This is going to be the var being set. (IMPORTANT)
- if codeList[i]["parameters"][0] not in list(range(150, 180)):
+ if codeList[i]["parameters"][0] not in list(range(70, 90)):
i += 1
continue
@@ -1786,71 +1791,32 @@ def searchCodes(page, pbar, jobList, filename):
if textMatch and textMatch.group(0) != "":
text = textMatch.group(1)
- # Using this to keep track of 401's in a row. Throws IndexError at EndOfList (Expected Behavior)
- currentGroup.append(text)
+ # Pass 1
+ if setData == False:
+ text = text.replace("_", " ")
+ list356.append(text)
- # Check Next Codes for text
- while codeList[i + 1]["code"] == 356:
- match = re.search(regex, codeList[i + 1]["parameters"][0])
- if match == None:
- break
- else:
- jaString = codeList[i + 1]["parameters"][0]
- textMatch = re.search(regex, jaString)
- if textMatch != None:
- currentGroup.append(textMatch.group(1))
- i += 1
-
- # Set Final List
- finalList = currentGroup
-
- # Clear Group and Reset Index
- currentGroup = []
- i = i - len(finalList) + 1
-
- # Translate
- response = translateGPT(
- finalList, "Reply with the " + LANGUAGE + " Translation.", True
- )
- finalListTL = response[0]
- totalTokens[0] += response[1][0]
- totalTokens[1] += response[1][1]
-
- for j in range(len(finalListTL)):
- # Grab String Again For Replace
- jaString = codeList[i]["parameters"][0]
- textMatch = re.search(regex, jaString)
- if textMatch != None:
- text = textMatch.group(1)
-
- # Grab
- translatedText = finalListTL[j]
-
- # Textwrap
- translatedText = textwrap.fill(
- translatedText, width=LISTWIDTH, drop_whitespace=False
- )
-
- # Remove characters that may break scripts
- charList = [".", '"']
- for char in charList:
- translatedText = translatedText.replace(char, "")
-
- # Cant have spaces?
- translatedText = translatedText.replace(" ", "_")
-
- # Fix spacing after ___
- translatedText = translatedText.replace("__\n", "__")
-
- # Put Args Back
- translatedText = jaString.replace(text, translatedText)
-
- # Set Data
- codeList[i]["parameters"][0] = translatedText
- i += 1
+ # Pass 2
else:
- i += 1
- continue
+ if len(list356) > 0:
+ # Grab
+ translatedText = list356[0]
+
+ # Remove characters that may break scripts
+ charList = [".", '"']
+ for char in charList:
+ translatedText = translatedText.replace(char, "")
+
+ # Cant have spaces?
+ translatedText = translatedText.replace(" ", "_")
+ translatedText = translatedText.replace("__", "_")
+
+ # Put Args Back
+ translatedText = jaString.replace(text, translatedText)
+
+ # Set Data
+ codeList[i]["parameters"][0] = translatedText
+ list356.pop(0)
if "namePop" in jaString:
matchList = re.findall(r"namePop\s\d+\s(.+?)\s.+", jaString)
@@ -2108,6 +2074,7 @@ def searchCodes(page, pbar, jobList, filename):
# EOF
list401TL = []
list122TL = []
+ list356TL = []
list355655TL = []
list108TL = []
setData = False
@@ -2165,10 +2132,26 @@ def searchCodes(page, pbar, jobList, filename):
else:
setData = True
+ # 356
+ if len(list356) > 0:
+ response = translateGPT(list356, textHistory, True)
+ list356TL = response[0]
+ totalTokens[0] += response[1][0]
+ totalTokens[1] += response[1][1]
+ if len(list356TL) != len(list356):
+ with LOCK:
+ if filename not in MISMATCH:
+ MISMATCH.append(filename)
+ else:
+ setData = True
+
# Start Pass 2
if setData:
searchCodes(
- page, pbar, [list401TL, list122TL, list355655TL, list108TL], filename
+ page,
+ pbar,
+ [list401TL, list122TL, list355655TL, list108TL, list356TL],
+ filename,
)
# Delete all -1 codes
diff --git a/modules/wolf.py b/modules/wolf.py
index ddb7a2e..15311cb 100644
--- a/modules/wolf.py
+++ b/modules/wolf.py
@@ -470,7 +470,7 @@ def searchCodes(events, pbar, jobList, filename):
if codeList[i]["code"] == 122 and CODE122 == True:
if "stringArgs" in codeList[i] and len(codeList[i]["stringArgs"]) > 0:
# Grab String
- jaString = re.search(r'^\n?(.*)\n?$', codeList[i]["stringArgs"][0])
+ jaString = re.search(r"^\n?(.*)\n?$", codeList[i]["stringArgs"][0])
if jaString:
jaString = jaString.group(1)
else:
@@ -542,7 +542,9 @@ def searchCodes(events, pbar, jobList, filename):
# translatedText = textwrap.fill(translatedText, WIDTH)
# Set String
- codeList[i]["stringArgs"][0] = codeList[i]["stringArgs"][0].replace(jaString, translatedText)
+ codeList[i]["stringArgs"][0] = codeList[i][
+ "stringArgs"
+ ][0].replace(jaString, translatedText)
### Event Code: 300 Common Events
if (
@@ -983,9 +985,9 @@ def searchDB(events, pbar, jobList, filename):
f'{dataList[j].get('value')} ({itemList[0][0]})\n'
)
line = itemList[0][0]
- line = line.replace(':', '：')
- line = line.replace('/', '／')
- line = line.replace('?', '？')
+ line = line.replace(":", "：")
+ line = line.replace("/", "／")
+ line = line.replace("?", "？")
dataList[j].update({"value": line})
itemList[0].pop(0)
diff --git a/vocab.txt b/vocab.txt
index f443441..240565e 100644
--- a/vocab.txt
+++ b/vocab.txt
@@ -1,8 +1,11 @@
Here are some vocabulary and terms so that you know the proper spelling and translation.
```
# Game Characters
-ラピスフィリア (Lapis Philia) - Female\n
-水奈月 瑠璃 (Mizunazuki Ruri) - Female\n
+リエナ (Liena) - Female\n
+イル (Iru) - Male\n
+ヨーグ (Yorg) - Male\n
+メリッサ (Melissa) - Female\n
+ナーサ (Naasa) - Female\n\
# Lewd Terms
マンコ (pussy)