From 2a4316b8622656f3f13d922ecf0fa6c12f2df180 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 30 May 2020 23:33:18 +0100 Subject: [PATCH 1/2] update string matching for all languages --- pbrEngine/guiStateDistinguisher.py | 56 +++++++++++++++++++++++------- setup.py | 2 +- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/pbrEngine/guiStateDistinguisher.py b/pbrEngine/guiStateDistinguisher.py index db30fc8..4990c74 100644 --- a/pbrEngine/guiStateDistinguisher.py +++ b/pbrEngine/guiStateDistinguisher.py @@ -99,19 +99,49 @@ def distinguishStart(self, data): # start menu _map_start = { - "Wii Remote Control Sideways": PbrGuis.START_WIIMOTE_INFO, + "Wii Remote Control Sideways" : PbrGuis.START_WIIMOTE_INFO, + "Configuración horizontal del mando de Wii" : PbrGuis.START_WIIMOTE_INFO, # es + "Type de commandes horizontal" : PbrGuis.START_WIIMOTE_INFO, # fr + "Steuerung C" : PbrGuis.START_WIIMOTE_INFO, # de + "Telecomando Wii - Orizzontale" : PbrGuis.START_WIIMOTE_INFO, # it + "Ｗｉｉリモコン「よこ」" : PbrGuis.START_WIIMOTE_INFO, # ja # This is the only one currently needed - "Choose a Game Mode" : PbrGuis.START_MENU, - "Selección de modo de juego" : PbrGuis.START_MENU, # es - "Choisir un mode de jeu" : PbrGuis.START_MENU, # fr - "Spielmodus wählen" : PbrGuis.START_MENU, # de - "Scegli una modalità di gioco" : PbrGuis.START_MENU, # it - "ゲームモードを　えらんでください" : PbrGuis.START_MENU, # ja - - "Choose Options" : PbrGuis.START_OPTIONS, - "Save the changed options settings?" : PbrGuis.START_OPTIONS_SAVE, - "Announcer's Voice" : PbrGuis.START_VOICE, - "Colosseum Mode" : PbrGuis.START_MODE, - "Continue" : PbrGuis.START_SAVEFILE, # doesn't work, but relying on unstucker anyway + "Choose a Game Mode" : PbrGuis.START_MENU, + "Selección de modo de juego" : PbrGuis.START_MENU, # es + "Choisir un mode de jeu" : PbrGuis.START_MENU, # fr + "Spielmodus wählen" : PbrGuis.START_MENU, # de + "Scegli una modalità di gioco" : PbrGuis.START_MENU, # it + "ゲームモードを　えらんでください" : PbrGuis.START_MENU, # ja + + "Choose Options" : PbrGuis.START_OPTIONS, + "Selección de opciones" : PbrGuis.START_OPTIONS, # es + "Options" : PbrGuis.START_OPTIONS, # fr + "Optionen wählen" : PbrGuis.START_OPTIONS, # de + "Scegli opzione" : PbrGuis.START_OPTIONS, # it + "せっていを　えらんでください" : PbrGuis.START_OPTIONS, # ja + + "Save the changed options settings?" : PbrGuis.START_OPTIONS_SAVE, + "¿Guardar la nueva configuración?" : PbrGuis.START_OPTIONS_SAVE, # es + "Sauvegarder les nouveaux paramètres?" : PbrGuis.START_OPTIONS_SAVE, # fr + "Änderungen übernehmen?" : PbrGuis.START_OPTIONS_SAVE, # de + "Vuoi salvare le modifiche alle impostazioni?" : PbrGuis.START_OPTIONS_SAVE, # it + "せっていが　へんこうされました。\nゲームデータをセーブしますか？" : PbrGuis.START_OPTIONS_SAVE, # ja + + "Colosseum Mode" : PbrGuis.START_MODE, + "Modo Reto Coliseo" : PbrGuis.START_MODE, # es + "Mode Colosseum" : PbrGuis.START_MODE, # fr + "Colosseum-Modus" : PbrGuis.START_MODE, # de + "Modalità Arena" : PbrGuis.START_MODE, # it + "コロシアムモード" : PbrGuis.START_MODE, # ja + + # todo verify if it actually doesn't work + # doesn't work, but relying on unstucker anyway + "Continue" : PbrGuis.START_SAVEFILE, + "Continuar" : PbrGuis.START_SAVEFILE, # es + "Continuer" : PbrGuis.START_SAVEFILE, # fr + "Fortfahren" : PbrGuis.START_SAVEFILE, # de + "Continua" : PbrGuis.START_SAVEFILE, # it + "つづきから　はじめる" : PbrGuis.START_SAVEFILE, # ja + } diff --git a/setup.py b/setup.py index ecf2a94..468fa21 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="pbrengine", - version="0.9.7.4", + version="0.9.7.5", packages=find_packages(), package_dir={"pbrEngine": "pbrEngine"}, package_data={"pbrEngine": ["eps/libeps32.dll", "eps/libeps64.dll", "eps/libeps.so", "eps/template_pokemon.epsd"]}, From 5c184c775a955490847f37b4a59682c1752b2de8 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 31 May 2020 21:54:05 +0100 Subject: [PATCH 2/2] formatting --- pbrEngine/guiStateDistinguisher.py | 112 +++++++++++++++++++---------- 1 file changed, 74 insertions(+), 38 deletions(-) diff --git a/pbrEngine/guiStateDistinguisher.py b/pbrEngine/guiStateDistinguisher.py index 4990c74..e7b2fd9 100644 --- a/pbrEngine/guiStateDistinguisher.py +++ b/pbrEngine/guiStateDistinguisher.py @@ -99,49 +99,85 @@ def distinguishStart(self, data): # start menu _map_start = { - "Wii Remote Control Sideways" : PbrGuis.START_WIIMOTE_INFO, - "Configuración horizontal del mando de Wii" : PbrGuis.START_WIIMOTE_INFO, # es - "Type de commandes horizontal" : PbrGuis.START_WIIMOTE_INFO, # fr - "Steuerung C" : PbrGuis.START_WIIMOTE_INFO, # de - "Telecomando Wii - Orizzontale" : PbrGuis.START_WIIMOTE_INFO, # it - "Ｗｉｉリモコン「よこ」" : PbrGuis.START_WIIMOTE_INFO, # ja + "Wii Remote Control Sideways": + PbrGuis.START_WIIMOTE_INFO, + "Configuración horizontal del mando de Wii": + PbrGuis.START_WIIMOTE_INFO, # es + "Type de commandes horizontal": + PbrGuis.START_WIIMOTE_INFO, # fr + "Steuerung C": + PbrGuis.START_WIIMOTE_INFO, # de + "Telecomando Wii - Orizzontale": + PbrGuis.START_WIIMOTE_INFO, # it + "Ｗｉｉリモコン「よこ」": + PbrGuis.START_WIIMOTE_INFO, # ja # This is the only one currently needed - "Choose a Game Mode" : PbrGuis.START_MENU, - "Selección de modo de juego" : PbrGuis.START_MENU, # es - "Choisir un mode de jeu" : PbrGuis.START_MENU, # fr - "Spielmodus wählen" : PbrGuis.START_MENU, # de - "Scegli una modalità di gioco" : PbrGuis.START_MENU, # it - "ゲームモードを　えらんでください" : PbrGuis.START_MENU, # ja - - "Choose Options" : PbrGuis.START_OPTIONS, - "Selección de opciones" : PbrGuis.START_OPTIONS, # es - "Options" : PbrGuis.START_OPTIONS, # fr - "Optionen wählen" : PbrGuis.START_OPTIONS, # de - "Scegli opzione" : PbrGuis.START_OPTIONS, # it - "せっていを　えらんでください" : PbrGuis.START_OPTIONS, # ja - - "Save the changed options settings?" : PbrGuis.START_OPTIONS_SAVE, - "¿Guardar la nueva configuración?" : PbrGuis.START_OPTIONS_SAVE, # es - "Sauvegarder les nouveaux paramètres?" : PbrGuis.START_OPTIONS_SAVE, # fr - "Änderungen übernehmen?" : PbrGuis.START_OPTIONS_SAVE, # de - "Vuoi salvare le modifiche alle impostazioni?" : PbrGuis.START_OPTIONS_SAVE, # it - "せっていが　へんこうされました。\nゲームデータをセーブしますか？" : PbrGuis.START_OPTIONS_SAVE, # ja + "Choose a Game Mode": + PbrGuis.START_MENU, + "Selección de modo de juego": + PbrGuis.START_MENU, # es + "Choisir un mode de jeu": + PbrGuis.START_MENU, # fr + "Spielmodus wählen": + PbrGuis.START_MENU, # de + "Scegli una modalità di gioco": + PbrGuis.START_MENU, # it + "ゲームモードを　えらんでください": + PbrGuis.START_MENU, # ja + + "Choose Options": + PbrGuis.START_OPTIONS, + "Selección de opciones": + PbrGuis.START_OPTIONS, # es + "Options": + PbrGuis.START_OPTIONS, # fr + "Optionen wählen": + PbrGuis.START_OPTIONS, # de + "Scegli opzione": + PbrGuis.START_OPTIONS, # it + "せっていを　えらんでください": + PbrGuis.START_OPTIONS, # ja + + "Save the changed options settings?": + PbrGuis.START_OPTIONS_SAVE, + "¿Guardar la nueva configuración?": + PbrGuis.START_OPTIONS_SAVE, # es + "Sauvegarder les nouveaux paramètres?": + PbrGuis.START_OPTIONS_SAVE, # fr + "Änderungen übernehmen?": + PbrGuis.START_OPTIONS_SAVE, # de + "Vuoi salvare le modifiche alle impostazioni?": + PbrGuis.START_OPTIONS_SAVE, # it + "せっていが　へんこうされました。\nゲームデータをセーブしますか？": + PbrGuis.START_OPTIONS_SAVE, # ja - "Colosseum Mode" : PbrGuis.START_MODE, - "Modo Reto Coliseo" : PbrGuis.START_MODE, # es - "Mode Colosseum" : PbrGuis.START_MODE, # fr - "Colosseum-Modus" : PbrGuis.START_MODE, # de - "Modalità Arena" : PbrGuis.START_MODE, # it - "コロシアムモード" : PbrGuis.START_MODE, # ja + "Colosseum Mode": + PbrGuis.START_MODE, + "Modo Reto Coliseo": + PbrGuis.START_MODE, # es + "Mode Colosseum": + PbrGuis.START_MODE, # fr + "Colosseum-Modus": + PbrGuis.START_MODE, # de + "Modalità Arena": + PbrGuis.START_MODE, # it + "コロシアムモード": + PbrGuis.START_MODE, # ja # todo verify if it actually doesn't work # doesn't work, but relying on unstucker anyway - "Continue" : PbrGuis.START_SAVEFILE, - "Continuar" : PbrGuis.START_SAVEFILE, # es - "Continuer" : PbrGuis.START_SAVEFILE, # fr - "Fortfahren" : PbrGuis.START_SAVEFILE, # de - "Continua" : PbrGuis.START_SAVEFILE, # it - "つづきから　はじめる" : PbrGuis.START_SAVEFILE, # ja + "Continue": + PbrGuis.START_SAVEFILE, + "Continuar": + PbrGuis.START_SAVEFILE, # es + "Continuer": + PbrGuis.START_SAVEFILE, # fr + "Fortfahren": + PbrGuis.START_SAVEFILE, # de + "Continua": + PbrGuis.START_SAVEFILE, # it + "つづきから　はじめる": + PbrGuis.START_SAVEFILE, # ja }