From feb62b4af240d19e48550f28a1a67ab6770e6307 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 16 Apr 2024 02:53:12 +0200 Subject: [PATCH 1/4] Core: increment version (#3144) --- Utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utils.py b/Utils.py index 10e6e504b5c2..6d4462651c89 100644 --- a/Utils.py +++ b/Utils.py @@ -46,7 +46,7 @@ def as_simple_string(self) -> str: return ".".join(str(item) for item in self) -__version__ = "0.4.5" +__version__ = "0.4.6" version_tuple = tuplize_version(__version__) is_linux = sys.platform.startswith("linux") From a1ef25455bedd4320f6dac3ddf7cb49379ae1b44 Mon Sep 17 00:00:00 2001 From: Trevor L <80716066+TRPG0@users.noreply.github.com> Date: Mon, 15 Apr 2024 18:54:35 -0600 Subject: [PATCH 2/4] Hylics 2: Fix logic for medallions in vault (#3148) --- worlds/hylics2/Rules.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/worlds/hylics2/Rules.py b/worlds/hylics2/Rules.py index ff9544e0e843..5fd4671958ac 100644 --- a/worlds/hylics2/Rules.py +++ b/worlds/hylics2/Rules.py @@ -413,26 +413,31 @@ def set_rules(hylics2world): lambda state: ( enter_foglast(state, player) and bridge_key(state, player) + and air_dash(state, player) )) add_rule(world.get_location("New Muldul: Vault Rear Right Medallion", player), lambda state: ( enter_foglast(state, player) and bridge_key(state, player) + and air_dash(state, player) )) add_rule(world.get_location("New Muldul: Vault Center Medallion", player), lambda state: ( enter_foglast(state, player) and bridge_key(state, player) + and air_dash(state, player) )) add_rule(world.get_location("New Muldul: Vault Front Left Medallion", player), lambda state: ( enter_foglast(state, player) and bridge_key(state, player) + and air_dash(state, player) )) add_rule(world.get_location("New Muldul: Vault Front Right Medallion", player), lambda state: ( enter_foglast(state, player) and bridge_key(state, player) + and air_dash(state, player) )) add_rule(world.get_location("Viewax's Edifice: Fort Wall Medallion", player), lambda state: paddle(state, player)) From 5da3a40964c0d8e80fd4a8dc8cdfa306f7e368ce Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Tue, 16 Apr 2024 02:55:36 +0200 Subject: [PATCH 3/4] SC2 Documentation: Fix the page titles (#3074) --- worlds/sc2/docs/en_Starcraft 2.md | 2 +- worlds/sc2/docs/setup_en.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/sc2/docs/en_Starcraft 2.md b/worlds/sc2/docs/en_Starcraft 2.md index 43a7da89f24f..784d711319d8 100644 --- a/worlds/sc2/docs/en_Starcraft 2.md +++ b/worlds/sc2/docs/en_Starcraft 2.md @@ -1,4 +1,4 @@ -# Starcraft 2 Wings of Liberty +# Starcraft 2 ## What does randomization do to this game? diff --git a/worlds/sc2/docs/setup_en.md b/worlds/sc2/docs/setup_en.md index 10881e149c43..391d5c29c89c 100644 --- a/worlds/sc2/docs/setup_en.md +++ b/worlds/sc2/docs/setup_en.md @@ -1,4 +1,4 @@ -# StarCraft 2 Wings of Liberty Randomizer Setup Guide +# StarCraft 2 Randomizer Setup Guide This guide contains instructions on how to install and troubleshoot the StarCraft 2 Archipelago client, as well as where to obtain a config file for StarCraft 2. From 38c54ba39334edcb05d274998b4faf5add7bb542 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 16 Apr 2024 03:26:59 +0200 Subject: [PATCH 4/4] WebHost: check: display exception chain one layer deep (#3153) * WebHost: check: display exception chain one layer deep * Update WebHostLib/check.py --- WebHostLib/check.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/WebHostLib/check.py b/WebHostLib/check.py index da6bfe861a6c..97cb797f7a56 100644 --- a/WebHostLib/check.py +++ b/WebHostLib/check.py @@ -108,7 +108,10 @@ def roll_options(options: Dict[str, Union[dict, str]], rolled_results[f"{filename}/{i + 1}"] = roll_settings(yaml_data, plando_options=plando_options) except Exception as e: - results[filename] = f"Failed to generate options in {filename}: {e}" + if e.__cause__: + results[filename] = f"Failed to generate options in {filename}: {e} - {e.__cause__}" + else: + results[filename] = f"Failed to generate options in {filename}: {e}" else: results[filename] = True return results, rolled_results