From 93837943c41eac2758e9a05f5c0f960d2faf8f5a Mon Sep 17 00:00:00 2001
From: dazedanon <dazedanon@gmail.com>
Date: Sat, 5 Apr 2025 18:56:18 -0500
Subject: [PATCH] Major fix to actors scan

---
 modules/rpgmakermvmz.py | 47 +++++++++++++++++++++++++++++++++++++----
 vocab.txt               |  4 ++--
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py
index b6e1e55..465bec8 100644
--- a/modules/rpgmakermvmz.py
+++ b/modules/rpgmakermvmz.py
@@ -534,6 +534,7 @@ def searchNames(data, pbar, context):
     with open("translations.txt", "a", encoding="utf-8") as file:
         file.write(f"\n#{context}\n")
     while i < len(data) or filling == True:
+        batchFull = False
         if i < len(data):
             # Empty Data
             if data[i] is None or data[i]["name"] == "":
@@ -548,7 +549,7 @@ def searchNames(data, pbar, context):
                         nameList.append(data[i]["name"])
                     if "nickname" in data[i] and data[i]["nickname"]:
                         nicknameList.append(data[i]["nickname"])
-                    if "profile" in data[i] and data[i]["profile"] != "":
+                    if "profile" in data[i] and data[i]["profile"]:
                         profileList.append(data[i]["profile"].replace("\n", " "))
 
                     # Notes
@@ -744,6 +745,8 @@ def searchNames(data, pbar, context):
                             # If Batch is empty. Move on.
                             if len(translatedNameBatch) == 0:
                                 nameList.clear()
+                                profileList.clear()
+                                nicknameList.clear()
                                 filling = False
                             j += 1
                 else:
@@ -1552,7 +1555,7 @@ def searchCodes(page, pbar, jobList, filename):
                             else:
                                 # Grab and Replace
                                 translatedText = list355655[0]
-                                translatedText = translatedText.replace("'", "\\'")
+                                translatedText = re.sub(r"(?<!\\)'", r"\\'", translatedText)
 
                                 # Textwrap
                                 # translatedText = textwrap.fill(translatedText, width=WIDTH)
@@ -1590,7 +1593,7 @@ def searchCodes(page, pbar, jobList, filename):
                             else:
                                 # Grab and Replace
                                 translatedText = list355655[0]
-                                translatedText = translatedText.replace("'", "\\'")
+                                translatedText = re.sub(r"(?<!\\)'", r"\\'", translatedText)
 
                                 # Textwrap
                                 # translatedText = textwrap.fill(translatedText, width=WIDTH)
@@ -1626,7 +1629,43 @@ def searchCodes(page, pbar, jobList, filename):
                             else:
                                 # Grab and Replace
                                 translatedText = list355655[0]
-                                translatedText = translatedText.replace("'", "\\'")
+                                translatedText = re.sub(r"(?<!\\)'", r"\\'", translatedText)
+
+                                # Textwrap
+                                # translatedText = textwrap.fill(translatedText, width=WIDTH)
+
+                                # Set
+                                codeList[i]["parameters"][0] = codeList[i]["parameters"][0].replace(replaceString, translatedText)
+                                list355655.pop(0)
+
+                elif ".setNickname" in jaString:
+                    jaString = codeList[i]["parameters"][0]
+                    regex = r'.setNickname\(\\?"(.+?)\\?"\)'
+
+                    # Check Exist
+                    match = re.search(regex, jaString)
+                    if match:
+                        replaceString = match.group(1)
+                        finalJAString = replaceString
+
+                        # Remove Textwrap
+                        # finalJAString = finalJAString.replace("\n", " ")
+                        
+                        # Remove Spaces
+                        finalJAString = finalJAString.replace("\u3000", "")
+                        finalJAString = finalJAString.strip()
+                        
+                        # Final Set
+                        if finalJAString:
+                            # Pass 1
+                            if setData:
+                                list355655.append(finalJAString)
+
+                            # Pass 2
+                            else:
+                                # Grab and Replace
+                                translatedText = list355655[0]
+                                translatedText = re.sub(r"(?<!\\)'", r"\\'", translatedText)
 
                                 # Textwrap
                                 # translatedText = textwrap.fill(translatedText, width=WIDTH)
diff --git a/vocab.txt b/vocab.txt
index c6dbb41..b176895 100644
--- a/vocab.txt
+++ b/vocab.txt
@@ -68,10 +68,10 @@ ME 音量 (ME Volume)
 # Sex Terms
 理性 (Sanity)
 性欲 (Libido)
-子宮の状態 (Uterus)
+子宮の状態 (Uterus St.)
 最後の相手 (Last Partner)
 陰茎の長さ (Penis Length)
-射精量 (Cum)
+射精量 (Total Cum)
 絶頂回数 (Orgasm)
 搾精回数 (Semen Milked)
 経験人数 (Partners)