diff --git a/Main.py b/Main.py index b34518fe..652ea35e 100644 --- a/Main.py +++ b/Main.py @@ -64,11 +64,8 @@ def main(args, seed=None, fish=None): world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)} logger.info( - '%s %s %s - %s: %s\n', - world.fish.translate("cli","cli","app.title"), - world.fish.translate("cli","cli","version"), + world.fish.translate("cli","cli","app.title") + "\n", __version__, - world.fish.translate("cli","cli","seed"), world.seed ) @@ -271,7 +268,7 @@ def main(args, seed=None, fish=None): world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase)) logger.info(world.fish.translate("cli","cli","done")) - logger.info('%s: %s', world.fish.translate("cli","cli","total.time"), time.perf_counter() - start) + logger.info(world.fish.translate("cli","cli","total.time"), time.perf_counter() - start) # print_wiki_doors_by_room(dungeon_regions,world,1) @@ -436,9 +433,9 @@ def create_playthrough(world): state_cache.append(state.copy()) - logging.getLogger('').debug('Calculated sphere %i, containing %i of %i progress items.', len(collection_spheres), len(sphere), len(prog_locations)) + logging.getLogger('').debug(world.fish.translate("cli","cli","building.calculating.spheres"), len(collection_spheres), len(sphere), len(prog_locations)) if not sphere: - logging.getLogger('').debug('The following items could not be reached: %s', ['%s (Player %d) at %s (Player %d)' % (location.item.name, location.item.player, location.name, location.player) for location in sphere_candidates]) + logging.getLogger('').debug(world.fish.translate("cli","cli","cannot.reach.items"), [world.fish.translate("cli","cli","cannot.reach.item") % (location.item.name, location.item.player, location.name, location.player) for location in sphere_candidates]) if any([world.accessibility[location.item.player] != 'none' for location in sphere_candidates]): raise RuntimeError(world.fish.translate("cli","cli","cannot.reach.progression")) else: @@ -492,7 +489,7 @@ def create_playthrough(world): collection_spheres.append(sphere) - logging.getLogger('').debug('Calculated final sphere %i, containing %i of %i progress items.', len(collection_spheres), len(sphere), len(required_locations)) + logging.getLogger('').debug(world.fish.translate("cli","cli","building.final.spheres"), len(collection_spheres), len(sphere), len(required_locations)) if not sphere: raise RuntimeError(world.fish.translate("cli","cli","cannot.reach.required")) diff --git a/resources/app/cli/lang/de.json b/resources/app/cli/lang/de.json new file mode 100644 index 00000000..07936374 --- /dev/null +++ b/resources/app/cli/lang/de.json @@ -0,0 +1,27 @@ +{ + "cli": { + "app.title": "ALttP Tür Randomisier Version %s - Nummer: %d", + "shuffling.world": "Welt wird durchmischt.", + "generating.itempool": "Generier Gegenstandsbasis.", + "calc.access.rules": "Berechne Zugriffsregeln.", + "placing.dungeon.prizes": "Platziere Verliespreise.", + "placing.dungeon.items": "Platziere Verliesgegenstände.", + "fill.world": "Fülle die Welt.", + "balance.multiworld": "Gleiche Multiwelt-Fortschritt aus.", + "patching.rom": "Patche ROM.", + "calc.playthrough": "Berechne Durschpiellösung.", + "done": "Fertig. Viel Spaß.", + "total.time": "Gesamtzeit: %s", + "building.collection.spheres": "Baue Sammelbereiche auf.", + "building.calculating.spheres": "Berechneter Bereich %i, beinhaltet %i von %i Progressionsgegenständen.", + "cannot.reach.items": "Die folgenden Gegenstände können nicht erreicht werden: %s", + "cannot.reach.item": "%s (Spieler %d) in %s (Spieler %d)", + "check.item.location": "Prüfe ob %s (Spieler %d) benötigt wird um das Spiel zu schlagen.", + "check.item.location.true": "Ja, Gegenstand wird benötigt um das Spiel zu schlagen.", + "check.item.location.false": "Nein, Gegenstand wird nicht benötigt um das Spiel zu schlagen.", + "building.final.spheres": "Berechneter Finalbereich %i, beinhaltet, %i von %i Progressionsgegenständen.", + "cannot.beat.game": "Spiel is nicht schlagbar.", + "cannot.reach.progression": "Nicht alle Progressionsgegenstände erreichbar.", + "cannot.reach.required": "Nitch alle benötigten Gegenstände erreichbar." + } +} diff --git a/resources/app/cli/lang/en.json b/resources/app/cli/lang/en.json index 90b641d7..53ef9599 100644 --- a/resources/app/cli/lang/en.json +++ b/resources/app/cli/lang/en.json @@ -1,6 +1,6 @@ { "cli": { - "app.title": "ALttP Door Randomizer", + "app.title": "ALttP Door Randomizer Version %s - Seed: %d", "version": "Version", "seed": "Seed", "player": "Player", @@ -25,19 +25,26 @@ "splitting.up": "Splitting Up", "balance.multiworld": "Balancing multiworld progression", "cannot.beat.game": "Cannot beat game! Something went terribly wrong here!", + "cannot.reach.items": "The following items could not be reached: %s", + "cannot.reach.item": "%s (Player %d) at %s (Player %d)", + "check.item.location": "Checking if %s (Player %d) is required to beat the game.", + "check.item.location.true": "Yes, item is required.", + "check.item.location.false": "No, item is not required.", "cannot.reach.progression": "Not all progression items reachable. Something went terribly wrong here.", "cannot.reach.required": "Not all required items reachable. Something went terribly wrong here.", "patching.rom": "Patching ROM", "calc.playthrough": "Calculating playthrough", "done": "Done. Enjoy.", - "total.time": "Total Time", + "total.time": "Total Time: %s", "finished.run": "Finished run", "generation.failed": "Generation failed", "generation.fail.rate": "Generation fail rate", "generation.success.rate": "Generation success rate", "enemizer.not.found": "Enemizer not found at", "enemizer.nothing.applied": "No Enemizer options will be applied until this is resolved.", - "building.collection.spheres": "Building up collection spheres" + "building.collection.spheres": "Building up collection spheres", + "building.calculating.spheres": "Calculated sphere %i, containing %i of %i progress items.", + "building.final.spheres": "Calculated final sphere %i, containing %i of %i progress items." }, "help": { "lang": [ "App Language, if available, defaults to English" ], diff --git a/resources/app/cli/lang/es.json b/resources/app/cli/lang/es.json index fe9f3173..9dcdc2c0 100644 --- a/resources/app/cli/lang/es.json +++ b/resources/app/cli/lang/es.json @@ -1,25 +1,34 @@ { "cli": { - "app.title": "ALttP Puerta Aleatorizador", - "version": "Versión", - "seed": "Número", - "player": "Player", + "app.title": "ALttP Puerta Aleatorizador Versión %s - Número: %d", + "player": "Jugador", "shuffling.world": "Barajando el Mundo", "shuffling.dungeons": "Barajando Mazmorras", + "basic.traversal": "--Recorrido Básico", + "generating.dungeon": "Generando mazmorra", + "shuffling.keydoors": "Barajando Puertas Clave para", + + "keylock.detected": "Bloqueo de Teclas detectado", + "fill.world": "Llenar el Mundo", "balance.doors": "-Equilibriando Puertas", "re-balancing": "-Reequilibriando", "balancing": "--Equilibriando", "splitting.up": "División", - "basic.traversal": "--Recorrido Básico", - "generating.dungeon": "Generando mazmorra", - "shuffling.keydoors": "Barajando Puertas Clave para", - "placing.dungeon.prizes": "Placing Dungeon Prizes", - "placing.dungeon.items": "Placing Dungeon Items", - "keylock.detected": "Bloqueo de Teclas detectado", - "fill.world": "Llenar el Mundo", + + "cannot.beat.game": "No se puede vencer el juego. Algo salió terriblemente mal.", + "cannot.reach.items": "No se pudo llegar a los siguientes elementos: %s", + "cannot.reach.item": "%s (Jugador %d) at %s (Jugador %d)", + "check.item.location": "Comprobar si se requiere que %s (Jugador %d) gane el juego.", + "check.item.location.true": "Sí, se requiere artículo.", + "check.item.location.false": "No, no se requiere artículo.", + "patching.rom": "Parchear ROM", "calc.playthrough": "Cálculo de Juego", "generation.failed": "Generación Fallida", - "enemizer.not.found": "Enemizer no encontrado en" + "enemizer.not.found": "Enemizer no encontrado en", + + "building.collection.spheres": "Construyendo esferas de recolección.", + "building.calculating.spheres": "Esfera calculada %i, que contiene %i de %i elementos de progreso.", + "building.final.spheres": "Esfera final calculada %i, que contiene %i de %i elementos de progreso." } -} \ No newline at end of file +}