diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 23c127f..a9585d3 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -72,7 +72,7 @@ CODE405 = True CODE102 = True # Optional -CODE101 = False # Turn this one when names exist in 101 +CODE101 = True # Turn this one when names exist in 101 CODE408 = False # Warning, translates comments and can inflate costs. # Variables @@ -83,7 +83,7 @@ CODE355655 = False CODE357 = False CODE657 = False CODE356 = False -CODE320 = True +CODE320 = False CODE324 = False CODE111 = False CODE108 = False @@ -1162,12 +1162,12 @@ def searchCodes(page, pbar, jobList, filename): # Remove any RPGMaker Code at start ffMatch = re.search( - r"^(\s*[\\]+[aAbBdDeEfFgGhHjJlLmMoOpPqQrRsStTuUwWxXyYzZ]+\[[\w\d\[\]\\]+\])", + r"^(\s*[\\]+[aAbBdDeEfFgGhHjJlLmMoOpPqQrRsStTuUwWxXyYzZ]+\[[\w\d\[\]\\]+?\])", finalJAString, ) if ffMatch != None: - finalJAString = finalJAString.replace(ffMatch.group(0), "") - nametag += ffMatch.group(0) + finalJAString = finalJAString.replace(ffMatch.group(1), "") + nametag += ffMatch.group(1) # Remove _ABL Codes ffMatch = re.search(r"^(_ABL).*", finalJAString) @@ -1185,6 +1185,13 @@ def searchCodes(page, pbar, jobList, filename): # 1st Passthrough (Grabbing Data) if setData == False: + # Remove Textwrap + if FIXTEXTWRAP: + finalJAString = finalJAString.replace('\n', ' ') + if "\\px[200]" in finalJAString: + finalJAString = finalJAString.replace('\\px[200]', '') + + # Append if finalJAString != "": if speaker == "" and finalJAString != "": list401.append(finalJAString) @@ -1242,6 +1249,11 @@ def searchCodes(page, pbar, jobList, filename): if BRFLAG is True: translatedText = translatedText.replace("\n", "
") + # px + if '\\px[200]' in nametag: + translatedText = translatedText.replace("\\px[200]", "") + translatedText = translatedText.replace("\n", "\n\\px[200]") + ### Add Var Strings # CL Flag if CLFlag: diff --git a/modules/tyrano.py b/modules/tyrano.py index ba3e3e0..6b30f7e 100644 --- a/modules/tyrano.py +++ b/modules/tyrano.py @@ -59,57 +59,42 @@ if "gpt-3.5" in MODEL: elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 - BATCHSIZE = 40 + BATCHSIZE = 20 def handleTyrano(filename, estimate): - global ESTIMATE - global FILENAME - FILENAME = filename + global ESTIMATE, TOKENS, FILENAME ESTIMATE = estimate + FILENAME = filename - if ESTIMATE: - start = time.time() - translatedData = openFiles(filename) + # Translate + start = time.time() + translatedData = openFiles(filename) - # Print Result - end = time.time() - tqdm.write(getResultString(translatedData, end - start, filename)) - with LOCK: - TOKENS[0] += translatedData[1][0] - TOKENS[1] += translatedData[1][1] - - # Print Total - totalString = getResultString(["", TOKENS, None], end - start, "TOTAL") - - # Print any errors on maps - if len(MISMATCH) > 0: - return ( - totalString + Fore.RED + f"\nMismatch Errors: {MISMATCH}" + Fore.RESET - ) - else: - return totalString - - else: + # Translate + if not estimate: try: - with open( - "translated/" + filename, "w", encoding="utf8", errors="ignore" - ) as outFile: - start = time.time() - translatedData = openFiles(filename) - - # Print Result - end = time.time() + with open("translated/" + filename, "w", encoding="utf-8") as outFile: outFile.writelines(translatedData[0]) - tqdm.write(getResultString(translatedData, end - start, filename)) - with LOCK: - TOKENS[0] += translatedData[1][0] - TOKENS[1] += translatedData[1][1] except Exception: traceback.print_exc() return "Fail" - return getResultString(["", TOKENS, None], end - start, "TOTAL") + # Print File + end = time.time() + tqdm.write(getResultString(translatedData, end - start, filename)) + with LOCK: + TOKENS[0] += translatedData[1][0] + TOKENS[1] += translatedData[1][1] + + # Print Total + totalString = getResultString(["", TOKENS, None], end - start, "TOTAL") + + # Print any errors on maps + if len(MISMATCH) > 0: + return totalString + Fore.RED + f"\nMismatch Errors: {MISMATCH}" + Fore.RESET + else: + return totalString def getResultString(translatedData, translationTime, filename): @@ -202,7 +187,7 @@ def translateTyrano(data, translatedList): choiceList = [] tokens = [0, 0] speaker = "" - global LOCK, ESTIMATE, FILENAME, PBAR + global LOCK, ESTIMATE, FILENAME, PBAR, MISMATCH i = 0 while i < len(data): @@ -320,6 +305,9 @@ def translateTyrano(data, translatedList): translatedText = choiceList[0] choiceList.pop(0) + # Replace Spaces + translatedText = translatedText.replace(' ', '\u3000') + # Set data[i] = data[i].replace(match.group(1), translatedText) @@ -338,7 +326,7 @@ def translateTyrano(data, translatedList): PBAR.refresh() response = translateGPT( stringList, - "", + "Reply with the English Translation", True ) tokens[0] += response[1][0] diff --git a/vocab.txt b/vocab.txt index 2480a9c..8b64049 100644 --- a/vocab.txt +++ b/vocab.txt @@ -2,12 +2,19 @@ Here are some vocabulary and terms so that you know the proper spelling and tran ``` # Game Characters #Actors -伊早瀬アラカ (Isayase Araka) - Female -如月ヨミ (Kisaragi Yomi) - Female -水本佐奈 (Mizumoto Sana) - Female -ミツキ・ロンズ (Mitsuki Ronzu) - Female -テール (Teeru) - Female -ユウキ (Yuuki) - Male +レイリ (Reiri) - Female +スズリカ (Suzurika) - Female +メルメイア (Merumeia) - Female +ヘーゼル (Hazel) - Female +カナメ (Kaname) - Female +グライヘイム (Guraiheim) +ゴンゾー (Gonzo) - Male +デルケム (Derukemu) - Male +グレッグ (Gregg) - Male +チャーリー (Charlie) - Male +コモル (Komoru) - Male +トムソン (Thomson) - Male +ティン (Tin) - Male # Lewd Terms マンコ (pussy) @@ -86,4 +93,64 @@ w ((lol)) コイツ (this bastard) シュード (Schnood) +# Locations +セレメー入り口 (Sereme Entrance) +地下スラム街 (Underground Slum) +ヘスぺリス監獄 (Hesperis Prison) +ガーゴイル工場 (Gargoyle Factory) +ケイトスの私室 (Cetus's Private Room) +パル・カタナス商会 (Pal Katanas Trading Company) +グレア商会 (Glear Trading Company) + +#Enemies +スライム (Slime) +巨大スライム (Giant Slime) +チスイコウモリモドキ (Bloodsucking Bat Imposter) +ネムリハブ (Sleeping Habu) +ゴブリン (Goblin) +テンタクルシェル (Tentacle Shell) +ガーゴイルの触腕 (Gargoyle's Tentacle) +ノブタ (Wild Boar) +野犬 (Wild Dog) +盗賊下っ端 (Thief Underling) +盗賊リーダー (Thief Leader) +スライム (Slime) +ダミー (Dummy) +サンドバッグ (Punching Bag) +アレチムシクイ (Desert Bug Eater) +はぐれ盗賊 (Rogue Thief) +盗賊エリート (Thief Elite) +巨大ヒル (Giant Leech) +ハネイルカ (Jumping Dolphin) +ダイオオバエ (Giant Fly) +ウマムシ (Horse Bug) +ロックミミック (Rock Mimic) +戦場漁り (Battle Scavenger) +荒くれノブタ (Rough Nobuta) +バリバリコブラ (Crackling Cobra) +洞窟ウナギ (Cave Eel) +浮浪者 (Vagrant) +囚人 (Prisoner) +看守 (Guard) +剣聖スズリカ (Sword Saint Suzurika) +ハーピーのガーゴイル (Harpy Gargoyle) +サラマンダーのガーゴイル (Salamander Gargoyle) +剛力ゴブリン (Mighty Goblin) +ユニコーンのガーゴイル (Unicorn Gargoyle) +サキュバスのガーゴイル (Succubus Gargoyle) +会長代理補佐メルメイア (Acting President's Assistant Merumeia) +クラーケンのガーゴイル (Kraken Gargoyle) +ガーゴイルの触腕 (Gargoyle Tentacle) +ヒュドラの先兵 (Hydra Vanguard) +ミノタウロスのガーゴイル (Minotaur Gargoyle) +ヒュドラのガーゴイル (Hydra Gargoyle) +狼男のガーゴイル (Werewolf Gargoyle) +兵士のガーゴイル (Soldier Gargoyle) +キマイラのガーゴイル (Chimera Gargoyle) +ワイバーンのガーゴイル (Wyvern Gargoyle) +サイコゴブリン・シルバーバック (Psycho Goblin Silverback) +商人パルカタナス (Merchant Palkatanas) +邪視のヴェルセウス (Evil Eye Velseus) +黒いドラゴン (Black Dragon) + ``` \ No newline at end of file