Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MMBN3Client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion MultiServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ def _load(self, decoded_obj: MultiData, game_data_packages: typing.Dict[str, typ
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", {})
Expand Down
2 changes: 1 addition & 1 deletion Zelda1Client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion entrance_rando.py
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ def find_pairing(dead_end: bool, require_new_exits: bool) -> bool:

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
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,11 @@ def run(self) -> None:
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:
Expand Down
4 changes: 2 additions & 2 deletions worlds/LauncherComponents.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,11 @@ def _build_apworlds(*launch_args: str):
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:
Expand Down
2 changes: 1 addition & 1 deletion worlds/alttp/Rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions worlds/cv64/aesthetics.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
0x06: "Fresh off a Behemoth!\n"
"Those cows are weird.",
0x07: "Preserved with special\n"
" wall-based methods.",
"wall-based methods.",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the other one in this file are the ones I mentioned being unsure.

0x08: "Don't tell Geneva\n"
"about this...",
0x09: "If this existed in 1094,\n"
Expand Down Expand Up @@ -263,7 +263,7 @@
"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!"
}
Expand Down
2 changes: 1 addition & 1 deletion worlds/cv64/rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion worlds/cvcotm/rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion worlds/factorio/Client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.')
Expand Down
2 changes: 1 addition & 1 deletion worlds/jakanddaxter/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion worlds/kh1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion worlds/mlss/Client.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
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.")
Expand Down
2 changes: 1 addition & 1 deletion worlds/mmbn3/Rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion worlds/wargroove/Client.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def __init__(self, server_address, password):
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")
Expand Down
2 changes: 1 addition & 1 deletion worlds/yugioh06/rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading