Fix bugs

test/general/TestReachability.py

@@ -5,6 +5,7 @@ from worlds.AutoWorld import AutoWorldRegister
 
 from . import setup_default_world
 
+
 class TestBase(unittest.TestCase):
     gen_steps = ["generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill"]
 
@@ -14,10 +15,12 @@ class TestBase(unittest.TestCase):
             if game_name != "Ori and the Blind Forest" and game_name != "Final Fantasy":  # TODO: fix Ori Logic
                 with self.subTest("Game", game=game_name):
                     world = setup_default_world(world_type)
+                    excluded = world.exclude_locations[1].value
                     state = world.get_all_state(False)
                     for location in world.get_locations():
-                        with self.subTest("Location should be reached", location=location):
-                            self.assertTrue(location.can_reach(state))
+                        if location.name not in excluded:
+                            with self.subTest("Location should be reached", location=location):
+                                self.assertTrue(location.can_reach(state))
 
     def testEmptyStateCanReachSomething(self):
         for game_name, world_type in AutoWorldRegister.world_types.items():

worlds/hk/Options.py

@@ -2,9 +2,10 @@ import typing
 from .ExtractedData import logic_options, starts, pool_options
 from Options import Option, DefaultOnToggle, Toggle, Choice, Range
 
+locations = {"option_" + start: i for i, start in enumerate(starts)}
 # This way the dynamic start names are picked up by the MetaClass Choice belongs to
-StartLocation = type("StartLocation", (Choice,), {
-    "option_" + start: i for i, start in enumerate(starts)} | {"auto_display_name": False})
+StartLocation = type("StartLocation", (Choice,), {"auto_display_name": False, **locations})
+del (locations)
 
 default_on = {
     "RandomizeDreamers",