reorder lttp tests to not override its overrides

worlds/alttp/test/dungeons/TestDungeon.py

@@ -18,8 +18,8 @@ class TestDungeon(unittest.TestCase):
         args = Namespace()
         for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
             setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
         self.multiworld.set_default_common_options()
+        self.multiworld.set_options(args)
         self.starting_regions = []  # Where to start exploring
         self.remove_exits = []      # Block dungeon exits
         self.multiworld.difficulty_requirements[1] = difficulties['normal']

worlds/alttp/test/inverted/TestInverted.py

@@ -18,8 +18,8 @@ class TestInverted(TestBase):
         args = Namespace()
         for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
             setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
         self.multiworld.set_default_common_options()
+        self.multiworld.set_options(args)
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.mode[1] = "inverted"
         create_inverted_regions(self.multiworld, 1)

worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py

@@ -4,11 +4,10 @@ from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
 from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
-from worlds.alttp.ItemPool import generate_itempool, difficulties
+from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
 from worlds.alttp.Regions import mark_light_world_regions
 from worlds.alttp.Shops import create_shops
-from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 
 from worlds import AutoWorld
@@ -19,8 +18,8 @@ class TestInvertedMinor(TestBase):
         args = Namespace()
         for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
             setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
         self.multiworld.set_default_common_options()
+        self.multiworld.set_options(args)
         self.multiworld.mode[1] = "inverted"
         self.multiworld.logic[1] = "minorglitches"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']

worlds/alttp/test/inverted_owg/TestInvertedOWG.py

@@ -4,11 +4,10 @@ from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
 from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
-from worlds.alttp.ItemPool import generate_itempool, difficulties
+from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
 from worlds.alttp.Regions import mark_light_world_regions
 from worlds.alttp.Shops import create_shops
-from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 
 from worlds import AutoWorld
@@ -20,8 +19,8 @@ class TestInvertedOWG(TestBase):
         args = Namespace()
         for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
             setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
         self.multiworld.set_default_common_options()
+        self.multiworld.set_options(args)
         self.multiworld.logic[1] = "owglitches"
         self.multiworld.mode[1] = "inverted"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']

worlds/alttp/test/minor_glitches/TestMinor.py

@@ -1,13 +1,10 @@
 from argparse import Namespace
 
 from BaseClasses import MultiWorld
-from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
-from worlds.alttp.EntranceShuffle import link_entrances
+from worlds.alttp.Dungeons import get_dungeon_item_pool
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
 from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions
-from worlds.alttp.Shops import create_shops
 from test.TestBase import TestBase
 
 from worlds import AutoWorld
@@ -19,8 +16,8 @@ class TestMinor(TestBase):
         args = Namespace()
         for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
             setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
         self.multiworld.set_default_common_options()
+        self.multiworld.set_options(args)
         self.multiworld.logic[1] = "minorglitches"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.worlds[1].er_seed = 0

worlds/alttp/test/owg/TestVanillaOWG.py

@@ -1,14 +1,10 @@
 from argparse import Namespace
 
 from BaseClasses import MultiWorld
-from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
-from worlds.alttp.EntranceShuffle import link_entrances
+from worlds.alttp.Dungeons import get_dungeon_item_pool
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
-from worlds.alttp.ItemPool import difficulties, generate_itempool
+from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions
-from worlds.alttp.Shops import create_shops
-from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 
 from worlds import AutoWorld
@@ -20,8 +16,8 @@ class TestVanillaOWG(TestBase):
         args = Namespace()
         for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
             setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
         self.multiworld.set_default_common_options()
+        self.multiworld.set_options(args)
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.logic[1] = "owglitches"
         self.multiworld.worlds[1].er_seed = 0

worlds/alttp/test/vanilla/TestVanilla.py

@@ -1,14 +1,10 @@
 from argparse import Namespace
 
 from BaseClasses import MultiWorld
-from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
-from worlds.alttp.EntranceShuffle import link_entrances
+from worlds.alttp.Dungeons import get_dungeon_item_pool
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
-from worlds.alttp.ItemPool import difficulties, generate_itempool
+from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions
-from worlds.alttp.Shops import create_shops
-from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 from worlds import AutoWorld
 
@@ -18,8 +14,8 @@ class TestVanilla(TestBase):
         args = Namespace()
         for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
             setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
         self.multiworld.set_default_common_options()
+        self.multiworld.set_options(args)
         self.multiworld.logic[1] = "noglitches"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.worlds[1].er_seed = 0