From 5ff8dd7836b51222a961901ccd5b97d682ec3aab Mon Sep 17 00:00:00 2001 From: dazedanon Date: Mon, 27 Oct 2025 00:20:43 -0500 Subject: [PATCH] Handle the ff catch for speakers before first line speaker --- modules/rpgmakermvmz.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 0b10a0d..3cf95da 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -1335,6 +1335,15 @@ def searchCodes(page, pbar, jobList, filename): # Speaker Check speakerList = [] + # Remove any RPGMaker Code at start + ffMatch = re.search( + r"^((?:[\\]+[^cCnNiIkKvV]+\[[\d\w]+\])+)", + jaString, + ) + if ffMatch != None: + jaString = jaString.replace(ffMatch.group(0), "") + nametag += ffMatch.group(0) + # m and z Codes match = re.search(r"(.*?)[\\]+m\[\d+?\][\\]+z\[\d+?\]", jaString) if match: @@ -1378,15 +1387,6 @@ def searchCodes(page, pbar, jobList, filename): # First Line Speakers if len(speakerList) == 0 and FIRSTLINESPEAKERS is True: - # Remove any RPGMaker Code at start - ffMatch = re.search( - r"^((?:[\\]+[^cCnNiIkKvV]+\[[\d\w]+\])+)", - jaString, - ) - if ffMatch != None: - jaString = jaString.replace(ffMatch.group(0), "") - nametag += ffMatch.group(0) - # Test Speaker if ( len(jaString) < 40