Merge branch 'main' into mlss

jamesbrq · Apr 16, 2024 · 2835f67 · 2835f67
2 parents 2947f58 + 38c54ba
commit 2835f67
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git 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")

diff --git 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
diff --git 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))

diff --git 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
@@ -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.