From 82be86191faa70d1ce097c61fc8556e03da1a72e Mon Sep 17 00:00:00 2001 From: duckboycool Date: Fri, 17 Oct 2025 14:24:22 -0600 Subject: [PATCH] Add them --- MMBN3Client.py | 4 ++-- MultiServer.py | 2 +- Zelda1Client.py | 2 +- entrance_rando.py | 2 +- setup.py | 4 ++-- worlds/LauncherComponents.py | 4 ++-- worlds/alttp/Rom.py | 2 +- worlds/cv64/aesthetics.py | 4 ++-- worlds/cv64/rom.py | 2 +- worlds/cvcotm/rom.py | 2 +- worlds/factorio/Client.py | 2 +- worlds/jakanddaxter/client.py | 2 +- worlds/kh1/__init__.py | 2 +- worlds/mlss/Client.py | 2 +- worlds/mmbn3/Rom.py | 2 +- worlds/wargroove/Client.py | 2 +- worlds/yugioh06/rom.py | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/MMBN3Client.py b/MMBN3Client.py index 31c6b309b8..bd36fae4b8 100644 --- a/MMBN3Client.py +++ b/MMBN3Client.py @@ -241,8 +241,8 @@ async def gba_sync_task(ctx: MMBN3Context): await ctx.server_auth(False) else: if not ctx.version_warning: - logger.warning(f"Your Lua script is version {reported_version}, expected {script_version}." - "Please update to the latest version." + logger.warning(f"Your Lua script is version {reported_version}, expected {script_version}. " + "Please update to the latest version. " "Your connection to the Archipelago server will not be accepted.") ctx.version_warning = True except asyncio.TimeoutError: diff --git a/MultiServer.py b/MultiServer.py index 1de44caddc..5e370d1717 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -493,7 +493,7 @@ class Context: self.read_data["race_mode"] = lambda: decoded_obj.get("race_mode", 0) mdata_ver = decoded_obj["minimum_versions"]["server"] if mdata_ver > version_tuple: - raise RuntimeError(f"Supplied Multidata (.archipelago) requires a server of at least version {mdata_ver}," + raise RuntimeError(f"Supplied Multidata (.archipelago) requires a server of at least version {mdata_ver}, " f"however this server is of version {version_tuple}") self.generator_version = Version(*decoded_obj["version"]) clients_ver = decoded_obj["minimum_versions"].get("clients", {}) diff --git a/Zelda1Client.py b/Zelda1Client.py index 6dd7a36165..b4292ecf75 100644 --- a/Zelda1Client.py +++ b/Zelda1Client.py @@ -289,7 +289,7 @@ async def nes_sync_task(ctx: ZeldaContext): if not ctx.auth: ctx.auth = ''.join([chr(i) for i in data_decoded['playerName'] if i != 0]) if ctx.auth == '': - logger.info("Invalid ROM detected. No player name built into the ROM. Please regenerate" + logger.info("Invalid ROM detected. No player name built into the ROM. Please regenerate " "the ROM using the same link but adding your slot name") if ctx.awaiting_rom: await ctx.server_auth(False) diff --git a/entrance_rando.py b/entrance_rando.py index 578059ae6f..a417767036 100644 --- a/entrance_rando.py +++ b/entrance_rando.py @@ -525,7 +525,7 @@ def randomize_entrances( running_time = time.perf_counter() - start_time if running_time > 1.0: - logging.info(f"Took {running_time:.4f} seconds during entrance randomization for player {world.player}," + logging.info(f"Took {running_time:.4f} seconds during entrance randomization for player {world.player}, " f"named {world.multiworld.player_name[world.player]}") return er_state diff --git a/setup.py b/setup.py index 1a39857b8e..01697129e7 100644 --- a/setup.py +++ b/setup.py @@ -385,11 +385,11 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe): manifest = json.load(manifest_file) assert "game" in manifest, ( - f"World directory {world_directory} has an archipelago.json manifest file, but it" + f"World directory {world_directory} has an archipelago.json manifest file, but it " "does not define a \"game\"." ) assert manifest["game"] == worldtype.game, ( - f"World directory {world_directory} has an archipelago.json manifest file, but value of the" + f"World directory {world_directory} has an archipelago.json manifest file, but value of the " f"\"game\" field ({manifest['game']} does not equal the World class's game ({worldtype.game})." ) else: diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py index 2ec70832c0..59e6e355dd 100644 --- a/worlds/LauncherComponents.py +++ b/worlds/LauncherComponents.py @@ -275,11 +275,11 @@ if not is_frozen(): manifest = json.load(manifest_file) assert "game" in manifest, ( - f"World directory {world_directory} has an archipelago.json manifest file, but it" + f"World directory {world_directory} has an archipelago.json manifest file, but it " "does not define a \"game\"." ) assert manifest["game"] == worldtype.game, ( - f"World directory {world_directory} has an archipelago.json manifest file, but value of the" + f"World directory {world_directory} has an archipelago.json manifest file, but value of the " f"\"game\" field ({manifest['game']} does not equal the World class's game ({worldtype.game})." ) else: diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py index 6a5792d21a..9bf857178a 100644 --- a/worlds/alttp/Rom.py +++ b/worlds/alttp/Rom.py @@ -183,7 +183,7 @@ def check_enemizer(enemizercli): if getattr(check_enemizer, "done", None): return if not os.path.exists(enemizercli) and not os.path.exists(enemizercli + ".exe"): - raise Exception(f"Enemizer not found at {enemizercli}, please install it." + raise Exception(f"Enemizer not found at {enemizercli}, please install it. " f"Such as https://github.com/Ijwu/Enemizer/releases") with check_lock: diff --git a/worlds/cv64/aesthetics.py b/worlds/cv64/aesthetics.py index 66709174d8..7f7c159dc2 100644 --- a/worlds/cv64/aesthetics.py +++ b/worlds/cv64/aesthetics.py @@ -195,7 +195,7 @@ renon_item_dialogue = { 0x06: "Fresh off a Behemoth!\n" "Those cows are weird.", 0x07: "Preserved with special\n" - " wall-based methods.", + "wall-based methods.", 0x08: "Don't tell Geneva\n" "about this...", 0x09: "If this existed in 1094,\n" @@ -263,7 +263,7 @@ renon_item_dialogue = { "common": "Every last little bit\n" "helps, right?", "trap": "I'll teach this fool\n" - " a lesson for a price!", + "a lesson for a price!", "dlc coin": "1 coin out of... wha!?\n" "You imp, why I oughta!" } diff --git a/worlds/cv64/rom.py b/worlds/cv64/rom.py index a40d3ab300..bc27369b65 100644 --- a/worlds/cv64/rom.py +++ b/worlds/cv64/rom.py @@ -1030,7 +1030,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes: basemd5 = hashlib.md5() basemd5.update(base_rom_bytes) if CV64_US_10_HASH != basemd5.hexdigest(): - raise Exception("Supplied Base Rom does not match known MD5 for Castlevania 64 US 1.0." + raise Exception("Supplied Base Rom does not match known MD5 for Castlevania 64 US 1.0. " "Get the correct game and version, then dump it.") setattr(get_base_rom_bytes, "base_rom_bytes", base_rom_bytes) return base_rom_bytes diff --git a/worlds/cvcotm/rom.py b/worlds/cvcotm/rom.py index 350829292b..a1b41ba31d 100644 --- a/worlds/cvcotm/rom.py +++ b/worlds/cvcotm/rom.py @@ -586,7 +586,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes: basemd5.update(base_rom_bytes) # if basemd5.hexdigest() not in [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]: if basemd5.hexdigest() not in [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH]: - raise Exception("Supplied Base ROM does not match known MD5s for Castlevania: Circle of the Moon USA." + raise Exception("Supplied Base ROM does not match known MD5s for Castlevania: Circle of the Moon USA. " "Get the correct game and version, then dump it.") setattr(get_base_rom_bytes, "base_rom_bytes", base_rom_bytes) return base_rom_bytes diff --git a/worlds/factorio/Client.py b/worlds/factorio/Client.py index 51eb487f84..7e3481bd01 100644 --- a/worlds/factorio/Client.py +++ b/worlds/factorio/Client.py @@ -566,7 +566,7 @@ def launch(*new_args: str): # args handling parser = get_base_parser(description="Optional arguments to Factorio Client follow. " - "Remaining arguments get passed into bound Factorio instance." + "Remaining arguments get passed into bound Factorio instance. " "Refer to Factorio --help for those.") parser.add_argument('--rcon-port', default='24242', type=int, help='Port to use to communicate with Factorio') parser.add_argument('--rcon-password', help='Password to authenticate with RCON.') diff --git a/worlds/jakanddaxter/client.py b/worlds/jakanddaxter/client.py index fa2aea5495..7cb8cb8ea9 100644 --- a/worlds/jakanddaxter/client.py +++ b/worlds/jakanddaxter/client.py @@ -601,7 +601,7 @@ async def run_game(ctx: JakAndDaxterContext): f"Please check your host.yaml file.\n" f"If the value of 'jakanddaxter_options > auto_detect_root_directory' is true, verify that OpenGOAL " f"is installed properly.\n" - f"If it is false, check the value of 'jakanddaxter_options > root_directory'." + f"If it is false, check the value of 'jakanddaxter_options > root_directory'. " f"Verify it is a valid existing path, and all backslashes have been replaced with forward slashes.") ctx.on_log_error(logger, msg) return diff --git a/worlds/kh1/__init__.py b/worlds/kh1/__init__.py index fbdc99206a..593a612bbd 100644 --- a/worlds/kh1/__init__.py +++ b/worlds/kh1/__init__.py @@ -30,7 +30,7 @@ class KH1Web(WebWorld): theme = "ocean" tutorials = [Tutorial( "Multiworld Setup Guide", - "A guide to setting up the Kingdom Hearts Randomizer software on your computer." + "A guide to setting up the Kingdom Hearts Randomizer software on your computer. " "This guide covers single-player, multiworld, and related software.", "English", "kh1_en.md", diff --git a/worlds/mlss/Client.py b/worlds/mlss/Client.py index 17d87197ca..7944442b2a 100644 --- a/worlds/mlss/Client.py +++ b/worlds/mlss/Client.py @@ -88,7 +88,7 @@ class MLSSClient(BizHawkClient): if seed not in ctx.seed_name: logger.info( "ERROR: The ROM you loaded is for a different game of AP. " - "Please make sure the host has sent you the correct patch file," + "Please make sure the host has sent you the correct patch file, " "and that you have opened the correct ROM." ) raise bizhawk.ConnectorError("Loaded ROM is for Incorrect lobby.") diff --git a/worlds/mmbn3/Rom.py b/worlds/mmbn3/Rom.py index 347375c503..7cb26455a9 100644 --- a/worlds/mmbn3/Rom.py +++ b/worlds/mmbn3/Rom.py @@ -341,7 +341,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes: basemd5 = hashlib.md5() basemd5.update(base_rom_bytes) if CHECKSUM_BLUE != basemd5.hexdigest(): - raise Exception('Supplied Base Rom does not match US GBA Blue Version.' + raise Exception('Supplied Base Rom does not match US GBA Blue Version. ' 'Please provide the correct ROM version') get_base_rom_bytes.base_rom_bytes = base_rom_bytes diff --git a/worlds/wargroove/Client.py b/worlds/wargroove/Client.py index 0627c7e9f2..ac80e85005 100644 --- a/worlds/wargroove/Client.py +++ b/worlds/wargroove/Client.py @@ -178,7 +178,7 @@ class WargrooveContext(CommonContext): self.remove_communication_files() atexit.register(self.remove_communication_files) if not os.path.isdir(appdata_wargroove): - print_error_and_close("WargrooveClient couldn't find Wargoove in appdata!" + print_error_and_close("WargrooveClient couldn't find Wargoove in appdata! " "Boot Wargroove and then close it to attempt to fix this error") mods_directory = os.path.join(appdata_wargroove, "mods", "ArchipelagoMod") save_directory = os.path.join(appdata_wargroove, "save") diff --git a/worlds/yugioh06/rom.py b/worlds/yugioh06/rom.py index 3ac10f9ea4..a61c3a6f42 100644 --- a/worlds/yugioh06/rom.py +++ b/worlds/yugioh06/rom.py @@ -145,7 +145,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes: md5hash = basemd5.hexdigest() if MD5Europe != md5hash and MD5America != md5hash: raise Exception( - "Supplied Base Rom does not match known MD5 for" + "Supplied Base Rom does not match known MD5 for " "Yu-Gi-Oh! World Championship 2006 America or Europe " "Get the correct game and version, then dump it" )