From 97b5f5e87ca1dd73581f39a7c0d6185d5b4345e9 Mon Sep 17 00:00:00 2001 From: dazedanon Date: Fri, 6 Feb 2026 17:17:45 -0600 Subject: [PATCH] Improvements --- modules/rpgmakermvmz.py | 8 +++++++- modules/wolf.py | 14 +++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 5c848a1..a07f21e 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -1636,7 +1636,7 @@ def searchCodes(page, pbar, jobList, filename): nametag = "" ## Event Code: 401 Show Text - if "code" in codeList[i] and codeList[i]["code"] in [401, 405, -1] and (CODE401 or CODE405): + if "code" in codeList[i] and codeList[i]["code"] in [401, 405, -1] and ((codeList[i]["code"] in [401, -1] and CODE401) or (codeList[i]["code"] == 405 and CODE405)): # Save Code and starting index (j) code = codeList[i]["code"] j = i @@ -1896,6 +1896,12 @@ def searchCodes(page, pbar, jobList, filename): finalJAString = finalJAString.replace(ffMatch.group(1), "") nametag = ffMatch.group(1) + nametag + # Remove bare escape codes at start (e.g. \\mn\\tmn, \\tmn, \\mn, \\vc) + bareMatch = re.match(r"^(\\mn\\tmn|\\tmn|\\mn|\\vc)", finalJAString) + if bareMatch is not None: + finalJAString = finalJAString[len(bareMatch.group(0)):] + nametag = bareMatch.group(0) + nametag + # Remove _ABL Codes ffMatch = re.search(r"^(_ABL).*", finalJAString) if ffMatch != None: diff --git a/modules/wolf.py b/modules/wolf.py index c1ef733..0fd2c09 100644 --- a/modules/wolf.py +++ b/modules/wolf.py @@ -70,11 +70,11 @@ CODE122 = False # Other CODE210 = False CODE300 = False -CODE250 = True +CODE250 = False # Database SCENARIOFLAG = False -OPTIONSFLAG = False +OPTIONSFLAG = True NPCFLAG = False DBNAMEFLAG = False DBVALUEFLAG = False @@ -82,7 +82,7 @@ ITEMFLAG = False STATEFLAG = False ENEMYFLAG = False ARMORFLAG = False -WEAPONFLAG = True +WEAPONFLAG = False SKILLFLAG = False # Initialize Translation Config @@ -1239,14 +1239,14 @@ def searchDB(events, pbar, jobList, filename): dataList[j].update({"value": dataList[j].get("value").replace(ogString, translatedText)}) # Grab Options - if table["name"] == "NPC" and OPTIONSFLAG == True: + if table["name"] == "クイズ" and OPTIONSFLAG == True: for option in table["data"]: dataList = option["data"] # Parse for j in range(len(dataList)): # Name - if dataList[j].get("name") == "名前": + if dataList[j].get("name") == "問": if dataList[j].get("value"): jaString = dataList[j].get("value") # Pass 1 (Grab Data) @@ -1260,7 +1260,7 @@ def searchDB(events, pbar, jobList, filename): dataList[j].update({"value": dataList[j].get("value").replace(jaString, translatedText)}) # Description 1 - if dataList[j].get("name") == "プロフ": + if dataList[j].get("name") == "3": if dataList[j].get("value"): jaString = dataList[j].get("value") # Pass 1 (Grab Data) @@ -1277,7 +1277,7 @@ def searchDB(events, pbar, jobList, filename): dataList[j].update({"value": dataList[j].get("value").replace(jaString, translatedText)}) # Description 2 - if dataList[j].get("name") == "防御破壊文言": + if dataList[j].get("name") == "4": if dataList[j].get("value"): jaString = dataList[j].get("value") # Pass 1 (Grab Data)