mirror of
https://github.com/ArchipelagoMW/Archipelago.git
synced 2026-03-07 07:03:44 -08:00
Core: Add spaces in concatenated strings #5697
This commit is contained in:
@@ -493,7 +493,7 @@ class Context:
|
|||||||
self.read_data["race_mode"] = lambda: decoded_obj.get("race_mode", 0)
|
self.read_data["race_mode"] = lambda: decoded_obj.get("race_mode", 0)
|
||||||
mdata_ver = decoded_obj["minimum_versions"]["server"]
|
mdata_ver = decoded_obj["minimum_versions"]["server"]
|
||||||
if mdata_ver > version_tuple:
|
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}")
|
f"however this server is of version {version_tuple}")
|
||||||
self.generator_version = Version(*decoded_obj["version"])
|
self.generator_version = Version(*decoded_obj["version"])
|
||||||
clients_ver = decoded_obj["minimum_versions"].get("clients", {})
|
clients_ver = decoded_obj["minimum_versions"].get("clients", {})
|
||||||
|
|||||||
@@ -525,7 +525,7 @@ def randomize_entrances(
|
|||||||
|
|
||||||
running_time = time.perf_counter() - start_time
|
running_time = time.perf_counter() - start_time
|
||||||
if running_time > 1.0:
|
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]}")
|
f"named {world.multiworld.player_name[world.player]}")
|
||||||
|
|
||||||
return er_state
|
return er_state
|
||||||
|
|||||||
4
setup.py
4
setup.py
@@ -394,11 +394,11 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
|
|||||||
manifest = json.load(manifest_file)
|
manifest = json.load(manifest_file)
|
||||||
|
|
||||||
assert "game" in manifest, (
|
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\"."
|
"does not define a \"game\"."
|
||||||
)
|
)
|
||||||
assert manifest["game"] == worldtype.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})."
|
f"\"game\" field ({manifest['game']} does not equal the World class's game ({worldtype.game})."
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -291,11 +291,11 @@ if not is_frozen():
|
|||||||
manifest = json.load(manifest_file)
|
manifest = json.load(manifest_file)
|
||||||
|
|
||||||
assert "game" in manifest, (
|
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\"."
|
"does not define a \"game\"."
|
||||||
)
|
)
|
||||||
assert manifest["game"] == worldtype.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})."
|
f"\"game\" field ({manifest['game']} does not equal the World class's game ({worldtype.game})."
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user