From f5f33c18260e687ff0cb9ebf70cefbd724f157db Mon Sep 17 00:00:00 2001 From: dazedanon Date: Wed, 18 Jun 2025 09:57:47 -0500 Subject: [PATCH] dazedwrap --- modules/alice.py | 4 +- modules/anim.py | 6 +-- modules/atelier.py | 4 +- modules/csv.py | 10 ++--- modules/eushully.py | 6 +-- modules/irissoft.py | 4 +- modules/javascript.py | 4 +- modules/json.py | 4 +- modules/kansen.py | 6 +-- modules/kirikiri.py | 4 +- modules/lune.py | 4 +- modules/nscript.py | 4 +- modules/regex.py | 4 +- modules/renpy.py | 4 +- modules/rpgmakerace.py | 37 ++++++++--------- modules/rpgmakermvmz.py | 1 - modules/rpgmakerplugin.py | 8 ++-- modules/sakuranbo.py | 6 +-- modules/text.py | 4 +- modules/tyrano.py | 4 +- modules/unity.py | 4 +- modules/wolf.py | 66 ++++++++++++++--------------- modules/wolf2.py | 4 +- vocab.txt | 87 +++++++++++++++++++++++++++++++++++---- 24 files changed, 179 insertions(+), 110 deletions(-) diff --git a/modules/alice.py b/modules/alice.py index 16013f1..d8edc71 100644 --- a/modules/alice.py +++ b/modules/alice.py @@ -1,7 +1,7 @@ # Libraries import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -273,7 +273,7 @@ def translateLines(linesList, pbar): # Textwrap translatedText = translatedText.replace('"', '\\"') - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # Set Data if multiLine: diff --git a/modules/anim.py b/modules/anim.py index c125701..cdb0f83 100644 --- a/modules/anim.py +++ b/modules/anim.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -232,12 +232,12 @@ def translateJSON(keys, data, pbar): match = re.search(r".*@n(.*)", translatedText) if match != None: tlText = match.group(1) - tlText = textwrap.fill(tlText, width=WIDTH) + tlText = dazedwrap.wrapText(tlText, width=WIDTH) tlText = tlText.replace("\n", "@b") translatedText = translatedText.replace(match.group(1), tlText) elif "@b" not in translatedText: - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "@b") # Set Data diff --git a/modules/atelier.py b/modules/atelier.py index f55bd5d..0ead901 100644 --- a/modules/atelier.py +++ b/modules/atelier.py @@ -1,7 +1,7 @@ import os from pathlib import Path import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -169,7 +169,7 @@ def translateText(data, pbar): textHistory.pop(0) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "\\n") # Write diff --git a/modules/csv.py b/modules/csv.py index c16f843..0dc8e30 100644 --- a/modules/csv.py +++ b/modules/csv.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -250,7 +250,7 @@ def translateCSV(data, pbar, writer, filename, translatedList, format): translatedList.pop(0) # Add Wordwrap - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) translatedText = translatedText.replace("\n", "\\n") # Set Data @@ -282,7 +282,7 @@ def translateCSV(data, pbar, writer, filename, translatedList, format): translatedList.pop(0) # Add Wordwrap - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) translatedText = translatedText.replace("\n", "\\n") # Set Data @@ -324,7 +324,7 @@ def translateCSV(data, pbar, writer, filename, translatedList, format): translatedList.pop(0) # Add Wordwrap - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) # Set Data if targetNextRow: @@ -380,7 +380,7 @@ def translateCSV(data, pbar, writer, filename, translatedList, format): translatedText = re.sub(r"^\[?(.+?)\]?\s?[|:]\s?", "", translatedText) # Add Wordwrap - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) translatedText = translatedText.replace("\n", "\\n") # Check for more than 3 newlines (Shoujo Ramune) diff --git a/modules/eushully.py b/modules/eushully.py index fc5db99..cb850d3 100644 --- a/modules/eushully.py +++ b/modules/eushully.py @@ -1,7 +1,7 @@ # Libraries import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -246,7 +246,7 @@ def translateEushully(data, pbar, filename, translatedList): translatedText = re.sub(r"^\[?(.+?)\]?\s?[|:]\s?", "", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedTextList = translatedText.split("\n") # Set Data @@ -303,7 +303,7 @@ def translateEushully(data, pbar, filename, translatedList): translatedText = translatedText.replace('"', "'") # Textwrap - translatedText = textwrap.fill(translatedText, width=LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=LISTWIDTH) translatedText = translatedText.replace("\n", "\\n") # Set Data diff --git a/modules/irissoft.py b/modules/irissoft.py index 7f0159e..ac02a77 100644 --- a/modules/irissoft.py +++ b/modules/irissoft.py @@ -1,7 +1,7 @@ # Libraries import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -267,7 +267,7 @@ def translateIris(data, pbar, filename, translatedList): translatedText = re.sub(r"^.+?:\s", "", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "\n\u3000") # Replace Whitespace and Commas diff --git a/modules/javascript.py b/modules/javascript.py index ed4f172..40aef6a 100644 --- a/modules/javascript.py +++ b/modules/javascript.py @@ -1,7 +1,7 @@ # Libraries import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -200,7 +200,7 @@ def translateJS(data, pbar): translatedList[j] = re.sub(r"[^\\](')", "\\'", translatedList[j]) # Wordwrap [Optional] - translatedList[j] = textwrap.fill(translatedList[j], LISTWIDTH) + translatedList[j] = dazedwrap.wrapText(translatedList[j], LISTWIDTH) translatedList[j] = translatedList[j].replace("\n", r"\\\\\\\\n") # Set diff --git a/modules/json.py b/modules/json.py index 9404745..e335972 100644 --- a/modules/json.py +++ b/modules/json.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -255,7 +255,7 @@ def translateJSON(data, pbar): translatedText = re.sub(r"^.+?:\s", "", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # Set Text item[text] = translatedText diff --git a/modules/kansen.py b/modules/kansen.py index 72022cb..17ac3e8 100644 --- a/modules/kansen.py +++ b/modules/kansen.py @@ -1,7 +1,7 @@ # Libraries import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -344,7 +344,7 @@ def translateTyrano(data, pbar, totalLines): translatedText = re.sub(r"^.+?:\s", "", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) textList = translatedText.split("\n") # Set Text @@ -352,7 +352,7 @@ def translateTyrano(data, pbar, totalLines): for line in textList: # Wordwrap Text if "[r]" not in line: - line = textwrap.fill(line, width=WIDTH) + line = dazedwrap.wrapText(line, width=WIDTH) line = line.replace("\n", "[r]") # Set diff --git a/modules/kirikiri.py b/modules/kirikiri.py index 833163d..5ad74a5 100644 --- a/modules/kirikiri.py +++ b/modules/kirikiri.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -274,7 +274,7 @@ def translateKiriKiri(data, pbar, filename, jobList): translatedText = re.sub(r"\[.*?\]:\s", "", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "[r]") # Replace Quotes diff --git a/modules/lune.py b/modules/lune.py index fdc45e2..be4e3fc 100644 --- a/modules/lune.py +++ b/modules/lune.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -258,7 +258,7 @@ def translateJSON(data, pbar): translatedText = re.sub(r"^.+?:\s", "", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # Set Text item[text] = translatedText diff --git a/modules/nscript.py b/modules/nscript.py index 5ce0ace..c41a04e 100644 --- a/modules/nscript.py +++ b/modules/nscript.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -246,7 +246,7 @@ def translateOnscripter(data, pbar, filename, translatedList): translatedList = None # Textwrap & Other Text - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "\n\u3000") # Split the string into lines diff --git a/modules/regex.py b/modules/regex.py index 2ee5540..b1842a7 100644 --- a/modules/regex.py +++ b/modules/regex.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -284,7 +284,7 @@ def translateRegex(data, translatedList): translatedText = translatedText.replace(">", ")") # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH).replace("\n", "\\n") + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH).replace("\n", "\\n") # Set Data if "「" in data[i-1] and "」" not in translatedText: diff --git a/modules/renpy.py b/modules/renpy.py index 9653122..1b51812 100644 --- a/modules/renpy.py +++ b/modules/renpy.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -248,7 +248,7 @@ def translateRenpy(data, translatedList): translatedText = re.sub(r"[\\]*(')", "\\'", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "\\n") # Set Data diff --git a/modules/rpgmakerace.py b/modules/rpgmakerace.py index 074ac8e..ca16654 100644 --- a/modules/rpgmakerace.py +++ b/modules/rpgmakerace.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -322,7 +322,7 @@ def translateNote(event, regex, wrap=True): # Textwrap if wrap: - translatedText = textwrap.fill(translatedText, width=NOTEWIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=NOTEWIDTH) # translatedText = translatedText.replace("\n", "\\n") translatedText = translatedText.replace('"', "") @@ -735,7 +735,7 @@ def searchNames(data, pbar, context): data[j]["nickname"] = translatedNicknameBatch[0] translatedNicknameBatch.pop(0) if data[j]["description"] != "": - data[j]["description"] = textwrap.fill(translatedProfileBatch[0], LISTWIDTH) + data[j]["description"] = dazedwrap.wrapText(translatedProfileBatch[0], LISTWIDTH) translatedProfileBatch.pop(0) # If Batch is empty. Move on. @@ -779,7 +779,7 @@ def searchNames(data, pbar, context): data[j]["name"] = translatedNameBatch[0] translatedNameBatch.pop(0) if "description" in data[j] and data[j]["description"] != "": - translatedText = textwrap.fill(translatedDescriptionBatch[0], LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedDescriptionBatch[0], LISTWIDTH) # translatedText = translatedText.replace("\n", "\\n") data[j]["description"] = translatedText translatedDescriptionBatch.pop(0) @@ -1148,12 +1148,9 @@ def searchCodes(page, pbar, jobList, filename): translatedText = list401[0] # Remove speaker - if speaker != "": - matchSpeakerList = re.findall(r"^\[?(.+?)\]?\s?[|:]\s?", translatedText) - if len(matchSpeakerList) > 0: - newSpeaker = matchSpeakerList[0] - nametag = nametag.replace(speaker, newSpeaker) - translatedText = re.sub(r"^\[?(.+?)\]?\s?[|:]\s?", "", translatedText) + match = re.search(r'(^\[.+?\]\s?[|:]\s?)', translatedText) + if match: + translatedText = translatedText.replace(match.group(1), "") # Fix '- ' translatedText = translatedText.replace("- ", "-") @@ -1164,10 +1161,10 @@ def searchCodes(page, pbar, jobList, filename): finalJAString = finalJAString.replace("
", " ") if FIXTEXTWRAP is True and "_ABL" in nametag: - translatedText = textwrap.fill(translatedText, width=100) + translatedText = dazedwrap.wrapText(translatedText, width=100) # # translatedText = translatedText.replace("\n", "\\n") elif FIXTEXTWRAP is True: - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # # translatedText = translatedText.replace("\n", "\\n") # BR Flag @@ -1286,7 +1283,7 @@ def searchCodes(page, pbar, jobList, filename): translatedText = translatedText.replace(char, "") # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # translatedText = translatedText.replace("\n", "\\n") # Set @@ -1338,7 +1335,7 @@ def searchCodes(page, pbar, jobList, filename): translatedText = translatedText.replace(char, "") # Textwrap - # translatedText = textwrap.fill(translatedText, 80) + # translatedText = dazedwrap.wrapText(translatedText, 80) # # translatedText = translatedText.replace("\n", "\\n") # translatedText = re.sub(r"[\\]+c", r"\\\\c", translatedText) translatedText = re.sub(r"[\\]+\*item", r"\\\\*item", translatedText) @@ -1387,7 +1384,7 @@ def searchCodes(page, pbar, jobList, filename): totalTokens[1] += response[1][1] # Textwrap & Set - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # translatedText = translatedText.replace("\n", "\\n") codeList[i]["p"][3]["messageText"] = translatedText @@ -1460,7 +1457,7 @@ def searchCodes(page, pbar, jobList, filename): translatedText = translatedText.replace(char, "") # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # translatedText = translatedText.replace("\n", "\\n") translatedText = startString + translatedText + endString @@ -1633,7 +1630,7 @@ def searchCodes(page, pbar, jobList, filename): translatedText = translatedText.replace(char, "") # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # translatedText = translatedText.replace("\n", "\\n") # Set Data @@ -1687,7 +1684,7 @@ def searchCodes(page, pbar, jobList, filename): # Textwrap # if codeList[i + 1]["c"] == 408: - # translatedText = textwrap.fill(translatedText, WIDTH) + # translatedText = dazedwrap.wrapText(translatedText, WIDTH) # # translatedText = translatedText.replace("\n", "\\n") # Remove characters that may break scripts @@ -1847,7 +1844,7 @@ def searchCodes(page, pbar, jobList, filename): totalTokens[1] += response[1][1] # Textwrap & Replace Whitespace - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # translatedText = translatedText.replace("\n", "\\n") translatedText = translatedText.replace(" ", "_") @@ -2302,7 +2299,7 @@ Translate 'Taroを倒した！' as 'Taro was defeated!'", if "description" in state: # Textwrap translatedText = descriptionResponse[0] - translatedText = textwrap.fill(translatedText, width=LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=LISTWIDTH) # translatedText = translatedText.replace("\n", "\\n") state["description"] = translatedText.replace('"', "") if "message1" in state: diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 4d5f946..863a1e9 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -2,7 +2,6 @@ import json import os import re -import textwrap import util.dazedwrap as dazedwrap import threading import time diff --git a/modules/rpgmakerplugin.py b/modules/rpgmakerplugin.py index a34effc..d068c1a 100644 --- a/modules/rpgmakerplugin.py +++ b/modules/rpgmakerplugin.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -243,7 +243,7 @@ def translatePlugin(data, pbar, filename, translatedList): translatedText = re.sub(r"([^\\'])\"", r"\1\\'", translatedText) # Textwrap - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) # Replace \n and \c translatedText = re.sub(r"\\+n", re.escape(newline), translatedText) @@ -420,7 +420,7 @@ def translatePlugin(data, pbar, filename, translatedList): translatedList = None # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", r"\\\\\\\\n") match = match.replace("\\c", r"\\\\\\\\\\\\\\\\c") @@ -461,7 +461,7 @@ def translatePlugin(data, pbar, filename, translatedList): translatedList = None # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", r"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\n") # Replace Single Quotes diff --git a/modules/sakuranbo.py b/modules/sakuranbo.py index 9565f61..f256e75 100644 --- a/modules/sakuranbo.py +++ b/modules/sakuranbo.py @@ -1,6 +1,6 @@ import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -289,7 +289,7 @@ def translateTyrano(data, pbar): # Wordwrap Text if "_" not in translatedText: - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "_") # Set @@ -362,7 +362,7 @@ def translateTyrano(data, pbar): # Wordwrap Text if "_" not in translatedText: - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "_") translatedText = originalLine.replace(originalText, translatedText) diff --git a/modules/text.py b/modules/text.py index c652032..0d00965 100644 --- a/modules/text.py +++ b/modules/text.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -222,7 +222,7 @@ def translateTxt(data, translatedList): translatedText = re.sub(r"^\[?(.+?)\]?\s?[|:]\s?", "", translatedText) # # Textwrap - # translatedText = textwrap.fill(translatedText, width=WIDTH) + # translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # translatedText = translatedText.replace("\n", "\\n") # Set Data diff --git a/modules/tyrano.py b/modules/tyrano.py index dbd831f..81873fa 100644 --- a/modules/tyrano.py +++ b/modules/tyrano.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -289,7 +289,7 @@ def translateTyrano(data, translatedList): translatedText = translatedText.replace("]", ")") # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) translatedText = translatedText.replace("\n", "[r]") # Set Data diff --git a/modules/unity.py b/modules/unity.py index 4853e8d..6c1607b 100644 --- a/modules/unity.py +++ b/modules/unity.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -231,7 +231,7 @@ def translateUnity(data, pbar, filename, translatedList): translatedList = None # Textwrap - # translatedText = textwrap.fill(translatedText, width=WIDTH) + # translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # translatedText = translatedText.replace("\n", "\\n") # Remove Double Spaces and = diff --git a/modules/wolf.py b/modules/wolf.py index f7bf9a5..2cd4041 100644 --- a/modules/wolf.py +++ b/modules/wolf.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -354,7 +354,7 @@ def searchCodes(events, pbar, jobList, filename): # Textwrap if FIXTEXTWRAP is True: - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # Set Data codeList[i]["stringArgs"][0] = codeList[i]["stringArgs"][0].replace(initialJAString, translatedText) @@ -426,7 +426,7 @@ def searchCodes(events, pbar, jobList, filename): # Textwrap if FIXTEXTWRAP is True: - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # Set Data codeList[i]["stringArgs"][1] = translatedText @@ -472,7 +472,7 @@ def searchCodes(events, pbar, jobList, filename): if len(list122) == len(list122TL): # Adjust Speaker and Add Textwrap for j in range(len(list122TL)): - list122TL[j] = textwrap.fill(list122TL[j], WIDTH) + list122TL[j] = dazedwrap.wrapText(list122TL[j], WIDTH) list122TL[j] = re.sub(r"^\[?(.+?)\]?:", r"\1：", list122TL[j]) list122TL[j] = list122TL[j].replace("：", "：\n") list122TL[j] = list122TL[j].replace("：\n ", "：\n") @@ -505,7 +505,7 @@ def searchCodes(events, pbar, jobList, filename): totalTokens[1] += response[1][1] # Textwrap - # translatedText = textwrap.fill(translatedText, 30) + # translatedText = dazedwrap.wrapText(translatedText, 30) # Set String codeList[i]["stringArgs"][0] = codeList[i]["stringArgs"][0].replace(originalString, translatedText) @@ -549,7 +549,7 @@ def searchCodes(events, pbar, jobList, filename): translatedText = list150[0] # Textwrap - # translatedText = textwrap.fill(translatedText, WIDTH) + # translatedText = dazedwrap.wrapText(translatedText, WIDTH) # Set String with font formatting codeList[i]["stringArgs"][0] = re.sub(r'\\f\[(\d+)\]', lambda x: f'\\f[{int(x.group(1))-2}]', translatedText) @@ -608,7 +608,7 @@ def searchCodes(events, pbar, jobList, filename): # Pass 2 else: # Add Textwrap and Font - translatedText = textwrap.fill(list300[0], WIDTH) + translatedText = dazedwrap.wrapText(list300[0], WIDTH) list300.pop(0) # Write to File @@ -666,7 +666,7 @@ def searchCodes(events, pbar, jobList, filename): # Textwrap if FIXTEXTWRAP is True: - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # Set Data codeList[i]["stringArgs"][1] = codeList[i]["stringArgs"][1].replace(initialJAString, translatedText) @@ -701,7 +701,7 @@ def searchCodes(events, pbar, jobList, filename): list250.pop(0) # Textwrap - # translatedText = textwrap.fill(translatedText, WIDTH) + # translatedText = dazedwrap.wrapText(translatedText, WIDTH) # Add/Replace font formatting # Remove existing font command if present @@ -973,7 +973,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = npcList[1][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Set Data @@ -1021,7 +1021,7 @@ def searchDB(events, pbar, jobList, filename): else: translatedText = scenarioList[0][0] scenarioList[0].pop(0) - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) # Remove Speaker speakerMatch = re.search(r"\[(.+?)\]\s?[|:]\s?", translatedText) @@ -1079,7 +1079,7 @@ def searchDB(events, pbar, jobList, filename): else: translatedText = scenarioList[1][0] scenarioList[1].pop(0) - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) # Remove Speaker speakerMatch = re.search(r"\[(.+?)\]\s?[|:]\s?", translatedText) @@ -1138,7 +1138,7 @@ def searchDB(events, pbar, jobList, filename): else: translatedText = scenarioList[2][0] scenarioList[2].pop(0) - translatedText = textwrap.fill(translatedText, WIDTH) + translatedText = dazedwrap.wrapText(translatedText, WIDTH) # Remove Speaker speakerMatch = re.search(r"\[(.+?)\]\s?[|:]\s?", translatedText) @@ -1199,7 +1199,7 @@ def searchDB(events, pbar, jobList, filename): else: translatedText = optionsList[1][0] optionsList[1].pop(0) - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) dataList[j].update({"value": dataList[j].get("value").replace(jaString, translatedText)}) # Description 2 @@ -1216,7 +1216,7 @@ def searchDB(events, pbar, jobList, filename): else: translatedText = optionsList[2][0] optionsList[2].pop(0) - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) dataList[j].update({"value": dataList[j].get("value").replace(jaString, translatedText)}) # Grab DB Names @@ -1267,7 +1267,7 @@ def searchDB(events, pbar, jobList, filename): translatedText = dbValueList[0][0] # Textwrap - translatedText = textwrap.fill(translatedText, 30) + translatedText = dazedwrap.wrapText(translatedText, 30) translatedText = translatedText.replace("\n", f"\r\n\\f[{font}]") # Subject @@ -1328,7 +1328,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = itemList[1][0] - # translatedText = textwrap.fill(translatedText, LISTWIDTH) + # translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) # Font if font: @@ -1366,7 +1366,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = itemList[2][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) # translatedText = font + translatedText # Remove Taro @@ -1394,7 +1394,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = itemList[3][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) # Font if font: @@ -1443,7 +1443,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = armorList[1][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) # Font if font: @@ -1491,7 +1491,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = enemyList[1][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) # Font if font: @@ -1540,7 +1540,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = weaponsList[1][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) # Font if font: @@ -1590,7 +1590,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = skillList[1][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) # Font if font: @@ -1628,7 +1628,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = skillList[2][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1666,7 +1666,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = skillList[3][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1704,7 +1704,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = skillList[4][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1752,7 +1752,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = stateList[1][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Set Data @@ -1787,7 +1787,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = stateList[2][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1825,7 +1825,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = stateList[3][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1863,7 +1863,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = stateList[4][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1900,7 +1900,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = stateList[5][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1938,7 +1938,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = stateList[6][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro @@ -1976,7 +1976,7 @@ def searchDB(events, pbar, jobList, filename): if dataList[j].get("value") != "": # Textwrap translatedText = stateList[7][0] - translatedText = textwrap.fill(translatedText, LISTWIDTH) + translatedText = dazedwrap.wrapText(translatedText, LISTWIDTH) translatedText = font + translatedText # Remove Taro diff --git a/modules/wolf2.py b/modules/wolf2.py index 117b905..cd046ee 100644 --- a/modules/wolf2.py +++ b/modules/wolf2.py @@ -2,7 +2,7 @@ import json import os import re -import textwrap +import util.dazedwrap as dazedwrap import threading import time import traceback @@ -277,7 +277,7 @@ def translateWOLF(data, translatedList, pbar, filename): translatedText = translatedText.replace(matchSpeakerList[0], "") # Textwrap - translatedText = textwrap.fill(translatedText, width=WIDTH) + translatedText = dazedwrap.wrapText(translatedText, width=WIDTH) # Set Data data.insert(i, f"{translatedText}\n") diff --git a/vocab.txt b/vocab.txt index 65fdf1a..89a7598 100644 --- a/vocab.txt +++ b/vocab.txt @@ -1,12 +1,33 @@ Here are some vocabulary and terms so that you know the proper spelling and translation. ``` # Game Characters -Taro - Male -羽田 千紗 (Haneda Chisa) - Female -川村 芳乃 (Kawamura Yoshino) - Female -御小柴 朱梨 (Mikoshiba Shuri) - Female -早乙女 恭香 (Saotome Kyouka) - Female -夢園 蓮美 (Yumezono Hasumi) - Female +ミズキ (Mizuki) - Female +ソウタ (Souta) - Male +陰陽師シグレ (Onmyoji Shigure) - Male +ヒネズミ (Hinezumi) +イヌガミ (Inugami) +タタリモッケ (Tatarimokke) +ヤタガラス (Yatagarasu) +イジコ (Ijiko) +ムラマサ (Muramasa) +ライジュウ (Raijuu) +ヌエ (Nue) +ウミボウズ (Umibouzu) +カイナンホウシ (Kainan Houshi) +ユキンコ (Yukinko) +ツララオンナ (Tsuraraonna) +カワタロウ (Kawatarou) +ネネコ (Neneko) +イソオトメ (Iso Otome) +ワダツミ (Wadatsumi) +ヌリカベ (Nurikabe) +ダイダラボッチ (Daidarabotchi) +ジュボッコ (Jubokko) +ホウコウ (Houkou) +バク (Baku) +イチガンキ (Ichiganki) +ツチグモ (Tsuchigumo) +ジョロウグモ (Jorougumo) # Lewd Terms マンコ (pussy) @@ -77,13 +98,13 @@ Taro - Male 攻撃力 (Attack) 回避率 (Evasion) 敏捷性 (Agility) +命中率 (Accuracy) 最大ＨＰ (Max HP) 経験値 (EXP) 購入する (Buy) 魔力攻撃 (M. Attack) 魔力防御 (M. Defense) 魔法力 (M. Power) -命中率 (Accuracy) %1 の%2を獲得！ (Gained %1 %2) 持っている数 (Owned) ME 音量 (ME Volume) @@ -143,6 +164,20 @@ ME 音量 (ME Volume) 吸血鬼 (Vampire) ドワーフ (Dwarf) +# Elements +物理 (Physical) +吸収 (Absorption) +火 (Fire) +氷 (Ice) +雷 (Thunder) +水 (Water) +地 (Earth) +風 (Wind) +神聖 (Holy) +暗黒 (Dark) +木 (Wood) +人間 (Human) + # Other w ((lol)) ２万 (20,000) @@ -150,5 +185,43 @@ w ((lol)) 』 (』) # Game Specific +キズヨ神社 (Kizuyo Shrine) +ミズキの部屋 (Mizuki's Room) +ソウタの部屋 (Souta's Room) +カグラ村 (Kagura Village) +トコヨの森 (Tokoyo Forest) +ガンクツ院 (Gankutsu Temple) +ツクヨミ山 (Tsukuyomi Mountain) +ソウリュウ郷 (Souryuu Village) +水神の宮 (Water God's Shrine) +ゲンサイの庵 (Gensai's Hermitage) +シオサイ村 (Shiosai Village) +網元の家 (Fisherman's House) +宝船 (Treasure Ship) +土蜘蛛の巣 (Tsuchigumo's Nest) +ヨミの隧道 (Yomi Tunnel) +トウミョウ院 (Toumyou Temple) +管主の家 (Head Priest's House) +慰霊塔 (Memorial Tower) +奥の院 (Inner Sanctuary) +博徒の里 (Gambler's Village) +飛天組 (Hiten Group) +飛天組のアジト (Hiten Group Hideout) +キョウラクの都 (City of Kyouraku) +山賊の根城 (Bandit Stronghold) +遊郭 (Red-Light District) +不夜城 (Sleepless Castle) +太乙縮地盤 (Taiyi Teleportation Platform) +寺子屋 (Temple School) +陰陽屋敷 (Onmyoji Mansion) +顔役宅 (Boss's House) +安珍宅 (Anchin's House) +タレ職人宅 (Sauce Artisan's House) +ミタマ島 (Mitama Island) +ヤミ島 (Yami Island) +イザナミ鉱山 (Izanami Mine) +ホゼ (Hoze) +ゲンタ (Genta) +ゲンゾウ (Genzou) ``` \ No newline at end of file