From 7faaa1ead954c767b0cc658d49a8237ad810714f Mon Sep 17 00:00:00 2001 From: dazedanon Date: Sat, 8 Nov 2025 11:18:06 -0600 Subject: [PATCH] Some updates to modules --- modules/json.py | 126 +++++++++++++++++++++++++++++++++++++- modules/rpgmakermvmz.py | 8 ++- modules/rpgmakerplugin.py | 4 +- 3 files changed, 131 insertions(+), 7 deletions(-) diff --git a/modules/json.py b/modules/json.py index dcb97cd..d5c51d4 100644 --- a/modules/json.py +++ b/modules/json.py @@ -187,17 +187,35 @@ def translateJSON(data, filename, translatedList): eventList = translatedList[1] else: stringList = [] - eventList = [[], [], []] # [title, process, text] + eventList = [[], [], [], [], [], [], []] # [title, process, text, key, target, job, place] tokens = [0, 0] speaker = "" i = 0 stringListTL = [] - eventListTL = [[], [], []] + eventListTL = [[], [], [], [], [], [], []] while i < len(data): speakerKey = "character_nameText" messageKey = "m_text" + # Event List Format - Key + if "key" in data[i] and data[i]["key"]: + jaString = data[i]["key"] + + # Pass 1 + if not translatedList: + eventList[3].append(jaString.strip()) + + # Pass 2 + else: + if eventList[3]: + translatedText = eventList[3][0] + eventList[3].pop(0) + + # Set Data + data[i]["key"] = translatedText + save_progress_json(data, filename) + # Event List Format - Title if "title" in data[i] and data[i]["title"]: jaString = data[i]["title"] @@ -216,6 +234,60 @@ def translateJSON(data, filename, translatedList): data[i]["title"] = translatedText save_progress_json(data, filename) + # Event List Format - Target + if "target" in data[i] and data[i]["target"]: + jaString = data[i]["target"] + + # Pass 1 + if not translatedList: + eventList[4].append(jaString.strip()) + + # Pass 2 + else: + if eventList[4]: + translatedText = eventList[4][0] + eventList[4].pop(0) + + # Set Data + data[i]["target"] = translatedText + save_progress_json(data, filename) + + # Event List Format - Job + if "job" in data[i] and data[i]["job"]: + jaString = data[i]["job"] + + # Pass 1 + if not translatedList: + eventList[5].append(jaString.strip()) + + # Pass 2 + else: + if eventList[5]: + translatedText = eventList[5][0] + eventList[5].pop(0) + + # Set Data + data[i]["job"] = translatedText + save_progress_json(data, filename) + + # Event List Format - Place + if "place" in data[i] and data[i]["place"]: + jaString = data[i]["place"] + + # Pass 1 + if not translatedList: + eventList[6].append(jaString.strip()) + + # Pass 2 + else: + if eventList[6]: + translatedText = eventList[6][0] + eventList[6].pop(0) + + # Set Data + data[i]["place"] = translatedText + save_progress_json(data, filename) + # Event List Format - Process if "process" in data[i] and data[i]["process"]: jaString = data[i]["process"] @@ -250,7 +322,7 @@ def translateJSON(data, filename, translatedList): eventList[2].pop(0) # Apply text wrapping and restore linebreaks - translatedText = dazedwrap.wrapText(translatedText, 55) + translatedText = dazedwrap.wrapText(translatedText, 70) # Set Data data[i]["text"] = translatedText @@ -389,6 +461,54 @@ def translateJSON(data, filename, translatedList): if FILENAME not in MISMATCH: MISMATCH.append(FILENAME) + # Event Key + if eventList[3]: + response = translateAI(eventList[3], "Event Key", True) + tokens[0] += response[1][0] + tokens[1] += response[1][1] + eventListTL[3] = response[0] + + if len(eventList[3]) != len(eventListTL[3]): + with LOCK: + if FILENAME not in MISMATCH: + MISMATCH.append(FILENAME) + + # Event Target + if eventList[4]: + response = translateAI(eventList[4], "Character Name", True) + tokens[0] += response[1][0] + tokens[1] += response[1][1] + eventListTL[4] = response[0] + + if len(eventList[4]) != len(eventListTL[4]): + with LOCK: + if FILENAME not in MISMATCH: + MISMATCH.append(FILENAME) + + # Event Job + if eventList[5]: + response = translateAI(eventList[5], "Job/Occupation", True) + tokens[0] += response[1][0] + tokens[1] += response[1][1] + eventListTL[5] = response[0] + + if len(eventList[5]) != len(eventListTL[5]): + with LOCK: + if FILENAME not in MISMATCH: + MISMATCH.append(FILENAME) + + # Event Place + if eventList[6]: + response = translateAI(eventList[6], "Location Name", True) + tokens[0] += response[1][0] + tokens[1] += response[1][1] + eventListTL[6] = response[0] + + if len(eventList[6]) != len(eventListTL[6]): + with LOCK: + if FILENAME not in MISMATCH: + MISMATCH.append(FILENAME) + # String List if stringList: PBAR.total = len(stringList) diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index b4afeb1..d0c707a 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -1669,7 +1669,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(0, 2000)): + if codeList[i]["parameters"][0] not in list(range(2, 3)): i += 1 continue @@ -2067,7 +2067,7 @@ def searchCodes(page, pbar, jobList, filename): # "text =": (r"text\s*=\s*'(.+[^\\])'"), # "const text": (r'(const\stext\s?=\s?"(.+)";?)'), # "ex_a_name": (r'ex_a_name\(\d+,"(.+)"\)'), - # "gameVariables.setValue": (r"\$gameVariables.setValue\(\d+,\s?'(.+)'\)"), + "gameVariables.setValue": (r'\$gameVariables\.setValue\(\d+,\s*"([^"]*)"\)'), # "BattleManager._logWindow.push('addText'": (r"BattleManager._logWindow.push\('addText',\s'(.+)'\)"), # "BattleManager._logWindow.addText": (r"BattleManager._logWindow.addText\('(.+)'\)"), } @@ -2102,6 +2102,10 @@ def searchCodes(page, pbar, jobList, filename): # Double backslashes before control codes translatedText = re.sub(r'(?