From 2dcfbff751ea5b73c4cb6d516892f7f15f23cd73 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sun, 11 Dec 2022 13:15:23 +0100 Subject: [PATCH] Tests: now autoload tests from /worlds/*/test (#1318) Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> --- .github/workflows/unittests.yml | 2 +- Utils.py | 2 +- test/TestBase.py | 98 +- test/__init__.py | 1 + test/programs/TestGenerate.py | 24 +- test/worlds/__init__.py | 14 + test/worlds/test_base.py | 98 -- .../alttp/test}/__init__.py | 0 .../alttp/test}/dungeons/TestAgahnimsTower.py | 2 +- .../alttp/test}/dungeons/TestDarkPalace.py | 2 +- .../alttp/test}/dungeons/TestDesertPalace.py | 2 +- .../alttp/test}/dungeons/TestDungeon.py | 0 .../alttp/test}/dungeons/TestEasternPalace.py | 2 +- .../alttp/test}/dungeons/TestGanonsTower.py | 2 +- .../alttp/test}/dungeons/TestIcePalace.py | 2 +- .../alttp/test}/dungeons/TestMiseryMire.py | 2 +- .../alttp/test}/dungeons/TestSkullWoods.py | 2 +- .../alttp/test}/dungeons/TestSwampPalace.py | 2 +- .../alttp/test}/dungeons/TestThievesTown.py | 2 +- .../alttp/test}/dungeons/TestTowerOfHera.py | 2 +- .../alttp/test/dungeons}/__init__.py | 0 .../alttp/test}/inverted/TestInverted.py | 0 .../test}/inverted/TestInvertedBombRules.py | 0 .../test}/inverted/TestInvertedDarkWorld.py | 2 +- .../inverted/TestInvertedDeathMountain.py | 2 +- .../test}/inverted/TestInvertedEntrances.py | 2 +- .../test}/inverted/TestInvertedLightWorld.py | 2 +- .../test}/inverted/TestInvertedTurtleRock.py | 2 +- .../alttp/test/inverted}/__init__.py | 0 .../TestInvertedDarkWorld.py | 2 +- .../TestInvertedDeathMountain.py | 2 +- .../TestInvertedEntrances.py | 2 +- .../TestInvertedLightWorld.py | 2 +- .../TestInvertedMinor.py | 0 .../TestInvertedTurtleRock.py | 2 +- .../test/inverted_minor_glitches}/__init__.py | 0 .../alttp/test}/inverted_owg/TestDarkWorld.py | 2 +- .../test}/inverted_owg/TestDeathMountain.py | 2 +- .../alttp/test}/inverted_owg/TestDungeons.py | 3 +- .../test}/inverted_owg/TestInvertedOWG.py | 0 .../test}/inverted_owg/TestLightWorld.py | 2 +- .../alttp/test/inverted_owg}/__init__.py | 0 .../alttp/test}/items/TestDifficulty.py | 0 .../alttp/test/items}/__init__.py | 0 .../test}/minor_glitches/TestDarkWorld.py | 2 +- .../test}/minor_glitches/TestDeathMountain.py | 2 +- .../test}/minor_glitches/TestEntrances.py | 2 +- .../test}/minor_glitches/TestLightWorld.py | 2 +- .../alttp/test}/minor_glitches/TestMinor.py | 0 .../alttp/test}/minor_glitches/__init__.py | 0 .../alttp/test}/options/TestPlandoBosses.py | 0 .../alttp/test}/options/__init__.py | 0 .../alttp/test}/owg/TestDarkWorld.py | 2 +- .../alttp/test}/owg/TestDeathMountain.py | 2 +- .../alttp/test}/owg/TestDungeons.py | 2 +- .../alttp/test}/owg/TestLightWorld.py | 2 +- .../alttp/test}/owg/TestVanillaOWG.py | 0 .../alttp/test/owg}/__init__.py | 0 {test => worlds/alttp/test}/shops/TestSram.py | 0 .../alttp/test/shops}/__init__.py | 0 .../alttp/test}/vanilla/TestDarkWorld.py | 2 +- .../alttp/test}/vanilla/TestDeathMountain.py | 2 +- .../alttp/test}/vanilla/TestEntrances.py | 2 +- .../alttp/test}/vanilla/TestLightWorld.py | 2 +- .../alttp/test}/vanilla/TestVanilla.py | 0 .../alttp/test/vanilla}/__init__.py | 0 .../minecraft/test}/TestAdvancements.py | 1057 +++++++++-------- .../minecraft/test}/TestEntrances.py | 3 +- .../minecraft/test}/TestMinecraft.py | 13 +- .../minecraft/test}/__init__.py | 0 .../overcooked2/test}/TestOvercooked2.py | 1 - worlds/overcooked2/test/__init__.py | 0 .../rogue_legacy/test}/TestUnique.py | 0 .../rogue_legacy/test}/__init__.py | 2 +- .../soe => worlds/soe/test}/TestAccess.py | 0 .../soe => worlds/soe/test}/TestGoal.py | 0 .../soe => worlds/soe/test}/__init__.py | 2 +- .../zillion/test}/TestGoal.py | 0 .../zillion/test}/TestOptions.py | 2 +- .../zillion/test}/TestReproducibleRandom.py | 2 +- .../zillion/test}/__init__.py | 2 +- 81 files changed, 715 insertions(+), 683 deletions(-) delete mode 100644 test/worlds/test_base.py rename {test/dungeons => worlds/alttp/test}/__init__.py (100%) rename {test => worlds/alttp/test}/dungeons/TestAgahnimsTower.py (95%) rename {test => worlds/alttp/test}/dungeons/TestDarkPalace.py (98%) rename {test => worlds/alttp/test}/dungeons/TestDesertPalace.py (97%) rename {test => worlds/alttp/test}/dungeons/TestDungeon.py (100%) rename {test => worlds/alttp/test}/dungeons/TestEasternPalace.py (96%) rename {test => worlds/alttp/test}/dungeons/TestGanonsTower.py (99%) rename {test => worlds/alttp/test}/dungeons/TestIcePalace.py (99%) rename {test => worlds/alttp/test}/dungeons/TestMiseryMire.py (99%) rename {test => worlds/alttp/test}/dungeons/TestSkullWoods.py (98%) rename {test => worlds/alttp/test}/dungeons/TestSwampPalace.py (98%) rename {test => worlds/alttp/test}/dungeons/TestThievesTown.py (97%) rename {test => worlds/alttp/test}/dungeons/TestTowerOfHera.py (96%) rename {test/inverted => worlds/alttp/test/dungeons}/__init__.py (100%) rename {test => worlds/alttp/test}/inverted/TestInverted.py (100%) rename {test => worlds/alttp/test}/inverted/TestInvertedBombRules.py (100%) rename {test => worlds/alttp/test}/inverted/TestInvertedDarkWorld.py (98%) rename {test => worlds/alttp/test}/inverted/TestInvertedDeathMountain.py (99%) rename {test => worlds/alttp/test}/inverted/TestInvertedEntrances.py (99%) rename {test => worlds/alttp/test}/inverted/TestInvertedLightWorld.py (99%) rename {test => worlds/alttp/test}/inverted/TestInvertedTurtleRock.py (99%) rename {test/inverted_minor_glitches => worlds/alttp/test/inverted}/__init__.py (100%) rename {test => worlds/alttp/test}/inverted_minor_glitches/TestInvertedDarkWorld.py (98%) rename {test => worlds/alttp/test}/inverted_minor_glitches/TestInvertedDeathMountain.py (99%) rename {test => worlds/alttp/test}/inverted_minor_glitches/TestInvertedEntrances.py (98%) rename {test => worlds/alttp/test}/inverted_minor_glitches/TestInvertedLightWorld.py (99%) rename {test => worlds/alttp/test}/inverted_minor_glitches/TestInvertedMinor.py (100%) rename {test => worlds/alttp/test}/inverted_minor_glitches/TestInvertedTurtleRock.py (99%) rename {test/inverted_owg => worlds/alttp/test/inverted_minor_glitches}/__init__.py (100%) rename {test => worlds/alttp/test}/inverted_owg/TestDarkWorld.py (97%) rename {test => worlds/alttp/test}/inverted_owg/TestDeathMountain.py (98%) rename {test => worlds/alttp/test}/inverted_owg/TestDungeons.py (98%) rename {test => worlds/alttp/test}/inverted_owg/TestInvertedOWG.py (100%) rename {test => worlds/alttp/test}/inverted_owg/TestLightWorld.py (99%) rename {test/items => worlds/alttp/test/inverted_owg}/__init__.py (100%) rename {test => worlds/alttp/test}/items/TestDifficulty.py (100%) rename {test/minecraft => worlds/alttp/test/items}/__init__.py (100%) rename {test => worlds/alttp/test}/minor_glitches/TestDarkWorld.py (99%) rename {test => worlds/alttp/test}/minor_glitches/TestDeathMountain.py (99%) rename {test => worlds/alttp/test}/minor_glitches/TestEntrances.py (99%) rename {test => worlds/alttp/test}/minor_glitches/TestLightWorld.py (99%) rename {test => worlds/alttp/test}/minor_glitches/TestMinor.py (100%) rename {test => worlds/alttp/test}/minor_glitches/__init__.py (100%) rename {test => worlds/alttp/test}/options/TestPlandoBosses.py (100%) rename {test => worlds/alttp/test}/options/__init__.py (100%) rename {test => worlds/alttp/test}/owg/TestDarkWorld.py (99%) rename {test => worlds/alttp/test}/owg/TestDeathMountain.py (99%) rename {test => worlds/alttp/test}/owg/TestDungeons.py (99%) rename {test => worlds/alttp/test}/owg/TestLightWorld.py (99%) rename {test => worlds/alttp/test}/owg/TestVanillaOWG.py (100%) rename {test/overcooked2 => worlds/alttp/test/owg}/__init__.py (100%) rename {test => worlds/alttp/test}/shops/TestSram.py (100%) rename {test/owg => worlds/alttp/test/shops}/__init__.py (100%) rename {test => worlds/alttp/test}/vanilla/TestDarkWorld.py (99%) rename {test => worlds/alttp/test}/vanilla/TestDeathMountain.py (99%) rename {test => worlds/alttp/test}/vanilla/TestEntrances.py (99%) rename {test => worlds/alttp/test}/vanilla/TestLightWorld.py (99%) rename {test => worlds/alttp/test}/vanilla/TestVanilla.py (100%) rename {test/shops => worlds/alttp/test/vanilla}/__init__.py (100%) rename {test/minecraft => worlds/minecraft/test}/TestAdvancements.py (78%) rename {test/minecraft => worlds/minecraft/test}/TestEntrances.py (99%) rename {test/minecraft => worlds/minecraft/test}/TestMinecraft.py (92%) rename {test/vanilla => worlds/minecraft/test}/__init__.py (100%) rename {test/overcooked2 => worlds/overcooked2/test}/TestOvercooked2.py (99%) create mode 100644 worlds/overcooked2/test/__init__.py rename {test/worlds/rogue_legacy => worlds/rogue_legacy/test}/TestUnique.py (100%) rename {test/worlds/rogue_legacy => worlds/rogue_legacy/test}/__init__.py (55%) rename {test/worlds/soe => worlds/soe/test}/TestAccess.py (100%) rename {test/worlds/soe => worlds/soe/test}/TestGoal.py (100%) rename {test/worlds/soe => worlds/soe/test}/__init__.py (58%) rename {test/worlds/zillion => worlds/zillion/test}/TestGoal.py (100%) rename {test/worlds/zillion => worlds/zillion/test}/TestOptions.py (95%) rename {test/worlds/zillion => worlds/zillion/test}/TestReproducibleRandom.py (94%) rename {test/worlds/zillion => worlds/zillion/test}/__init__.py (93%) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 4d0ceaec..c86d6372 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -37,4 +37,4 @@ jobs: python ModuleUpdate.py --yes --force --append "WebHostLib/requirements.txt" - name: Unittests run: | - pytest test + pytest diff --git a/Utils.py b/Utils.py index 46948641..074316ee 100644 --- a/Utils.py +++ b/Utils.py @@ -99,7 +99,7 @@ def local_path(*path: str) -> str: local_path.cached_path = os.path.dirname(os.path.abspath(sys.argv[0])) else: import __main__ - if hasattr(__main__, "__file__"): + if hasattr(__main__, "__file__") and os.path.isfile(__main__.__file__): # we are running in a normal Python environment local_path.cached_path = os.path.dirname(os.path.abspath(__main__.__file__)) else: diff --git a/test/TestBase.py b/test/TestBase.py index 754f38db..8a17232b 100644 --- a/test/TestBase.py +++ b/test/TestBase.py @@ -1,12 +1,17 @@ +import typing import unittest import pathlib +from argparse import Namespace import Utils +from test.general import gen_steps +from worlds import AutoWorld +from worlds.AutoWorld import call_all file_path = pathlib.Path(__file__).parent.parent Utils.local_path.cached_path = file_path -from BaseClasses import MultiWorld, CollectionState, ItemClassification +from BaseClasses import MultiWorld, CollectionState, ItemClassification, Item from worlds.alttp.Items import ItemFactory @@ -92,3 +97,94 @@ class TestBase(unittest.TestCase): new_items.remove(missing_item) items = ItemFactory(new_items, 1) return self.get_state(items) + + +class WorldTestBase(unittest.TestCase): + options: typing.Dict[str, typing.Any] = {} + multiworld: MultiWorld + + game: typing.ClassVar[str] # define game name in subclass, example "Secret of Evermore" + auto_construct: typing.ClassVar[bool] = True + """ automatically set up a world for each test in this class """ + + def setUp(self) -> None: + if self.auto_construct: + self.world_setup() + + def world_setup(self, seed: typing.Optional[int] = None) -> None: + if not hasattr(self, "game"): + raise NotImplementedError("didn't define game name") + self.multiworld = MultiWorld(1) + self.multiworld.game[1] = self.game + self.multiworld.player_name = {1: "Tester"} + self.multiworld.set_seed(seed) + args = Namespace() + for name, option in AutoWorld.AutoWorldRegister.world_types[self.game].option_definitions.items(): + setattr(args, name, { + 1: option.from_any(self.options.get(name, getattr(option, "default"))) + }) + self.multiworld.set_options(args) + self.multiworld.set_default_common_options() + for step in gen_steps: + call_all(self.multiworld, step) + + def collect_all_but(self, item_names: typing.Union[str, typing.Iterable[str]]) -> None: + if isinstance(item_names, str): + item_names = (item_names,) + for item in self.multiworld.get_items(): + if item.name not in item_names: + self.multiworld.state.collect(item) + + def get_item_by_name(self, item_name: str) -> Item: + for item in self.multiworld.get_items(): + if item.name == item_name: + return item + raise ValueError("No such item") + + def get_items_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]: + if isinstance(item_names, str): + item_names = (item_names,) + return [item for item in self.multiworld.itempool if item.name in item_names] + + def collect_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]: + """ collect all of the items in the item pool that have the given names """ + items = self.get_items_by_name(item_names) + self.collect(items) + return items + + def collect(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None: + if isinstance(items, Item): + items = (items,) + for item in items: + self.multiworld.state.collect(item) + + def remove(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None: + if isinstance(items, Item): + items = (items,) + for item in items: + if item.location and item.location.event and item.location in self.multiworld.state.events: + self.multiworld.state.events.remove(item.location) + self.multiworld.state.remove(item) + + def can_reach_location(self, location: str) -> bool: + return self.multiworld.state.can_reach(location, "Location", 1) + + def count(self, item_name: str) -> int: + return self.multiworld.state.count(item_name, 1) + + def assertAccessDependency(self, + locations: typing.List[str], + possible_items: typing.Iterable[typing.Iterable[str]]) -> None: + all_items = [item_name for item_names in possible_items for item_name in item_names] + + self.collect_all_but(all_items) + for location in self.multiworld.get_locations(): + self.assertEqual(self.multiworld.state.can_reach(location), location.name not in locations) + for item_names in possible_items: + items = self.collect_by_name(item_names) + for location in locations: + self.assertTrue(self.can_reach_location(location)) + self.remove(items) + + def assertBeatable(self, beatable: bool): + self.assertEqual(self.multiworld.can_beat_game(self.multiworld.state), beatable) diff --git a/test/__init__.py b/test/__init__.py index 059c4556..438a0a04 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,2 +1,3 @@ import warnings warnings.simplefilter("always") + diff --git a/test/programs/TestGenerate.py b/test/programs/TestGenerate.py index da227df5..1418ec05 100644 --- a/test/programs/TestGenerate.py +++ b/test/programs/TestGenerate.py @@ -9,14 +9,13 @@ import os import ModuleUpdate ModuleUpdate.update_ran = True # don't upgrade import Generate -import Utils class TestGenerateMain(unittest.TestCase): """This tests Generate.py (ArchipelagoGenerate.exe) main""" generate_dir = Path(Generate.__file__).parent - run_dir = generate_dir / 'test' # reproducible cwd that's neither __file__ nor Generate.__file__ + run_dir = generate_dir / "test" # reproducible cwd that's neither __file__ nor Generate.__file__ abs_input_dir = Path(__file__).parent / 'data' / 'OnePlayer' rel_input_dir = abs_input_dir.relative_to(run_dir) # directly supplied relative paths are relative to cwd yaml_input_dir = abs_input_dir.relative_to(generate_dir) # yaml paths are relative to user_path @@ -30,12 +29,29 @@ class TestGenerateMain(unittest.TestCase): f"{list(output_path.glob('*'))}") def setUp(self): - Utils.local_path.cached_path = str(self.generate_dir) + self.original_argv = sys.argv.copy() + self.original_cwd = os.getcwd() + self.original_local_path = Generate.Utils.local_path.cached_path + self.original_user_path = Generate.Utils.user_path.cached_path + + # Force both user_path and local_path to a specific path. They have independent caches. + Generate.Utils.user_path.cached_path = Generate.Utils.local_path.cached_path = str(self.generate_dir) os.chdir(self.run_dir) self.output_tempdir = TemporaryDirectory(prefix='AP_out_') def tearDown(self): self.output_tempdir.cleanup() + os.chdir(self.original_cwd) + sys.argv = self.original_argv + Generate.Utils.local_path.cached_path = self.original_local_path + Generate.Utils.user_path.cached_path = self.original_user_path + + def test_paths(self): + self.assertTrue(os.path.exists(self.generate_dir)) + self.assertTrue(os.path.exists(self.run_dir)) + self.assertTrue(os.path.exists(self.abs_input_dir)) + self.assertTrue(os.path.exists(self.rel_input_dir)) + self.assertFalse(os.path.exists(self.yaml_input_dir)) # relative to user_path, not cwd def test_generate_absolute(self): sys.argv = [sys.argv[0], '--seed', '0', @@ -57,7 +73,7 @@ class TestGenerateMain(unittest.TestCase): def test_generate_yaml(self): # override host.yaml - defaults = Utils.get_options()["generator"] + defaults = Generate.Utils.get_options()["generator"] defaults["player_files_path"] = str(self.yaml_input_dir) defaults["players"] = 0 diff --git a/test/worlds/__init__.py b/test/worlds/__init__.py index e69de29b..84e08a00 100644 --- a/test/worlds/__init__.py +++ b/test/worlds/__init__.py @@ -0,0 +1,14 @@ +def load_tests(loader, standard_tests, pattern): + import os + import unittest + from ..TestBase import file_path + from worlds.AutoWorld import AutoWorldRegister + + suite = unittest.TestSuite() + suite.addTests(standard_tests) + folders = [os.path.join(os.path.split(world.__file__)[0], "test") + for world in AutoWorldRegister.world_types.values()] + for folder in folders: + if os.path.exists(folder): + suite.addTests(loader.discover(folder, top_level_dir=file_path)) + return suite diff --git a/test/worlds/test_base.py b/test/worlds/test_base.py deleted file mode 100644 index 82c3d167..00000000 --- a/test/worlds/test_base.py +++ /dev/null @@ -1,98 +0,0 @@ -import typing -import unittest -from argparse import Namespace -from test.general import gen_steps -from BaseClasses import MultiWorld, Item -from worlds import AutoWorld -from worlds.AutoWorld import call_all - - -class WorldTestBase(unittest.TestCase): - options: typing.Dict[str, typing.Any] = {} - multiworld: MultiWorld - - game: typing.ClassVar[str] # define game name in subclass, example "Secret of Evermore" - auto_construct: typing.ClassVar[bool] = True - """ automatically set up a world for each test in this class """ - - def setUp(self) -> None: - if self.auto_construct: - self.world_setup() - - def world_setup(self, seed: typing.Optional[int] = None) -> None: - if not hasattr(self, "game"): - raise NotImplementedError("didn't define game name") - self.multiworld = MultiWorld(1) - self.multiworld.game[1] = self.game - self.multiworld.player_name = {1: "Tester"} - self.multiworld.set_seed(seed) - args = Namespace() - for name, option in AutoWorld.AutoWorldRegister.world_types[self.game].option_definitions.items(): - setattr(args, name, { - 1: option.from_any(self.options.get(name, getattr(option, "default"))) - }) - self.multiworld.set_options(args) - self.multiworld.set_default_common_options() - for step in gen_steps: - call_all(self.multiworld, step) - - def collect_all_but(self, item_names: typing.Union[str, typing.Iterable[str]]) -> None: - if isinstance(item_names, str): - item_names = (item_names,) - for item in self.multiworld.get_items(): - if item.name not in item_names: - self.multiworld.state.collect(item) - - def get_item_by_name(self, item_name: str) -> Item: - for item in self.multiworld.get_items(): - if item.name == item_name: - return item - raise ValueError("No such item") - - def get_items_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]: - if isinstance(item_names, str): - item_names = (item_names,) - return [item for item in self.multiworld.itempool if item.name in item_names] - - def collect_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]: - """ collect all of the items in the item pool that have the given names """ - items = self.get_items_by_name(item_names) - self.collect(items) - return items - - def collect(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None: - if isinstance(items, Item): - items = (items,) - for item in items: - self.multiworld.state.collect(item) - - def remove(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None: - if isinstance(items, Item): - items = (items,) - for item in items: - if item.location and item.location.event and item.location in self.multiworld.state.events: - self.multiworld.state.events.remove(item.location) - self.multiworld.state.remove(item) - - def can_reach_location(self, location: str) -> bool: - return self.multiworld.state.can_reach(location, "Location", 1) - - def count(self, item_name: str) -> int: - return self.multiworld.state.count(item_name, 1) - - def assertAccessDependency(self, - locations: typing.List[str], - possible_items: typing.Iterable[typing.Iterable[str]]) -> None: - all_items = [item_name for item_names in possible_items for item_name in item_names] - - self.collect_all_but(all_items) - for location in self.multiworld.get_locations(): - self.assertEqual(self.multiworld.state.can_reach(location), location.name not in locations) - for item_names in possible_items: - items = self.collect_by_name(item_names) - for location in locations: - self.assertTrue(self.can_reach_location(location)) - self.remove(items) - - def assertBeatable(self, beatable: bool): - self.assertEqual(self.multiworld.can_beat_game(self.multiworld.state), beatable) diff --git a/test/dungeons/__init__.py b/worlds/alttp/test/__init__.py similarity index 100% rename from test/dungeons/__init__.py rename to worlds/alttp/test/__init__.py diff --git a/test/dungeons/TestAgahnimsTower.py b/worlds/alttp/test/dungeons/TestAgahnimsTower.py similarity index 95% rename from test/dungeons/TestAgahnimsTower.py rename to worlds/alttp/test/dungeons/TestAgahnimsTower.py index 1c71d51b..6d0e1085 100644 --- a/test/dungeons/TestAgahnimsTower.py +++ b/worlds/alttp/test/dungeons/TestAgahnimsTower.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestAgahnimsTower(TestDungeon): diff --git a/test/dungeons/TestDarkPalace.py b/worlds/alttp/test/dungeons/TestDarkPalace.py similarity index 98% rename from test/dungeons/TestDarkPalace.py rename to worlds/alttp/test/dungeons/TestDarkPalace.py index 48c1928e..e3974e77 100644 --- a/test/dungeons/TestDarkPalace.py +++ b/worlds/alttp/test/dungeons/TestDarkPalace.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestDarkPalace(TestDungeon): diff --git a/test/dungeons/TestDesertPalace.py b/worlds/alttp/test/dungeons/TestDesertPalace.py similarity index 97% rename from test/dungeons/TestDesertPalace.py rename to worlds/alttp/test/dungeons/TestDesertPalace.py index 82255146..8423e681 100644 --- a/test/dungeons/TestDesertPalace.py +++ b/worlds/alttp/test/dungeons/TestDesertPalace.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestDesertPalace(TestDungeon): diff --git a/test/dungeons/TestDungeon.py b/worlds/alttp/test/dungeons/TestDungeon.py similarity index 100% rename from test/dungeons/TestDungeon.py rename to worlds/alttp/test/dungeons/TestDungeon.py diff --git a/test/dungeons/TestEasternPalace.py b/worlds/alttp/test/dungeons/TestEasternPalace.py similarity index 96% rename from test/dungeons/TestEasternPalace.py rename to worlds/alttp/test/dungeons/TestEasternPalace.py index 775fa8a1..0497a113 100644 --- a/test/dungeons/TestEasternPalace.py +++ b/worlds/alttp/test/dungeons/TestEasternPalace.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestEasternPalace(TestDungeon): diff --git a/test/dungeons/TestGanonsTower.py b/worlds/alttp/test/dungeons/TestGanonsTower.py similarity index 99% rename from test/dungeons/TestGanonsTower.py rename to worlds/alttp/test/dungeons/TestGanonsTower.py index 1517dc25..f8150927 100644 --- a/test/dungeons/TestGanonsTower.py +++ b/worlds/alttp/test/dungeons/TestGanonsTower.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestGanonsTower(TestDungeon): diff --git a/test/dungeons/TestIcePalace.py b/worlds/alttp/test/dungeons/TestIcePalace.py similarity index 99% rename from test/dungeons/TestIcePalace.py rename to worlds/alttp/test/dungeons/TestIcePalace.py index e415c5d0..3c075fe5 100644 --- a/test/dungeons/TestIcePalace.py +++ b/worlds/alttp/test/dungeons/TestIcePalace.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestIcePalace(TestDungeon): diff --git a/test/dungeons/TestMiseryMire.py b/worlds/alttp/test/dungeons/TestMiseryMire.py similarity index 99% rename from test/dungeons/TestMiseryMire.py rename to worlds/alttp/test/dungeons/TestMiseryMire.py index 5f0a354c..ea5fb288 100644 --- a/test/dungeons/TestMiseryMire.py +++ b/worlds/alttp/test/dungeons/TestMiseryMire.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestMiseryMire(TestDungeon): diff --git a/test/dungeons/TestSkullWoods.py b/worlds/alttp/test/dungeons/TestSkullWoods.py similarity index 98% rename from test/dungeons/TestSkullWoods.py rename to worlds/alttp/test/dungeons/TestSkullWoods.py index f7103cf2..2dab840c 100644 --- a/test/dungeons/TestSkullWoods.py +++ b/worlds/alttp/test/dungeons/TestSkullWoods.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestSkullWoods(TestDungeon): diff --git a/test/dungeons/TestSwampPalace.py b/worlds/alttp/test/dungeons/TestSwampPalace.py similarity index 98% rename from test/dungeons/TestSwampPalace.py rename to worlds/alttp/test/dungeons/TestSwampPalace.py index 534939c9..51440f6c 100644 --- a/test/dungeons/TestSwampPalace.py +++ b/worlds/alttp/test/dungeons/TestSwampPalace.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestSwampPalace(TestDungeon): diff --git a/test/dungeons/TestThievesTown.py b/worlds/alttp/test/dungeons/TestThievesTown.py similarity index 97% rename from test/dungeons/TestThievesTown.py rename to worlds/alttp/test/dungeons/TestThievesTown.py index 5fdf9037..a7e20bc5 100644 --- a/test/dungeons/TestThievesTown.py +++ b/worlds/alttp/test/dungeons/TestThievesTown.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestThievesTown(TestDungeon): diff --git a/test/dungeons/TestTowerOfHera.py b/worlds/alttp/test/dungeons/TestTowerOfHera.py similarity index 96% rename from test/dungeons/TestTowerOfHera.py rename to worlds/alttp/test/dungeons/TestTowerOfHera.py index 9762d208..04685a66 100644 --- a/test/dungeons/TestTowerOfHera.py +++ b/worlds/alttp/test/dungeons/TestTowerOfHera.py @@ -1,4 +1,4 @@ -from test.dungeons.TestDungeon import TestDungeon +from .TestDungeon import TestDungeon class TestTowerOfHera(TestDungeon): diff --git a/test/inverted/__init__.py b/worlds/alttp/test/dungeons/__init__.py similarity index 100% rename from test/inverted/__init__.py rename to worlds/alttp/test/dungeons/__init__.py diff --git a/test/inverted/TestInverted.py b/worlds/alttp/test/inverted/TestInverted.py similarity index 100% rename from test/inverted/TestInverted.py rename to worlds/alttp/test/inverted/TestInverted.py diff --git a/test/inverted/TestInvertedBombRules.py b/worlds/alttp/test/inverted/TestInvertedBombRules.py similarity index 100% rename from test/inverted/TestInvertedBombRules.py rename to worlds/alttp/test/inverted/TestInvertedBombRules.py diff --git a/test/inverted/TestInvertedDarkWorld.py b/worlds/alttp/test/inverted/TestInvertedDarkWorld.py similarity index 98% rename from test/inverted/TestInvertedDarkWorld.py rename to worlds/alttp/test/inverted/TestInvertedDarkWorld.py index e7d5a007..710ee07f 100644 --- a/test/inverted/TestInvertedDarkWorld.py +++ b/worlds/alttp/test/inverted/TestInvertedDarkWorld.py @@ -1,4 +1,4 @@ -from test.inverted.TestInverted import TestInverted +from .TestInverted import TestInverted class TestInvertedDarkWorld(TestInverted): diff --git a/test/inverted/TestInvertedDeathMountain.py b/worlds/alttp/test/inverted/TestInvertedDeathMountain.py similarity index 99% rename from test/inverted/TestInvertedDeathMountain.py rename to worlds/alttp/test/inverted/TestInvertedDeathMountain.py index 77fdb8ac..aedec2a1 100644 --- a/test/inverted/TestInvertedDeathMountain.py +++ b/worlds/alttp/test/inverted/TestInvertedDeathMountain.py @@ -1,4 +1,4 @@ -from test.inverted.TestInverted import TestInverted +from .TestInverted import TestInverted class TestInvertedDeathMountain(TestInverted): diff --git a/test/inverted/TestInvertedEntrances.py b/worlds/alttp/test/inverted/TestInvertedEntrances.py similarity index 99% rename from test/inverted/TestInvertedEntrances.py rename to worlds/alttp/test/inverted/TestInvertedEntrances.py index 3e884adc..06a82de2 100644 --- a/test/inverted/TestInvertedEntrances.py +++ b/worlds/alttp/test/inverted/TestInvertedEntrances.py @@ -1,4 +1,4 @@ -from test.inverted.TestInverted import TestInverted +from .TestInverted import TestInverted class TestEntrances(TestInverted): diff --git a/test/inverted/TestInvertedLightWorld.py b/worlds/alttp/test/inverted/TestInvertedLightWorld.py similarity index 99% rename from test/inverted/TestInvertedLightWorld.py rename to worlds/alttp/test/inverted/TestInvertedLightWorld.py index 890fa08b..9d4b9099 100644 --- a/test/inverted/TestInvertedLightWorld.py +++ b/worlds/alttp/test/inverted/TestInvertedLightWorld.py @@ -1,4 +1,4 @@ -from test.inverted.TestInverted import TestInverted +from .TestInverted import TestInverted class TestInvertedLightWorld(TestInverted): diff --git a/test/inverted/TestInvertedTurtleRock.py b/worlds/alttp/test/inverted/TestInvertedTurtleRock.py similarity index 99% rename from test/inverted/TestInvertedTurtleRock.py rename to worlds/alttp/test/inverted/TestInvertedTurtleRock.py index df55143c..533e3c65 100644 --- a/test/inverted/TestInvertedTurtleRock.py +++ b/worlds/alttp/test/inverted/TestInvertedTurtleRock.py @@ -1,4 +1,4 @@ -from test.inverted.TestInverted import TestInverted +from .TestInverted import TestInverted class TestInvertedTurtleRock(TestInverted): diff --git a/test/inverted_minor_glitches/__init__.py b/worlds/alttp/test/inverted/__init__.py similarity index 100% rename from test/inverted_minor_glitches/__init__.py rename to worlds/alttp/test/inverted/__init__.py diff --git a/test/inverted_minor_glitches/TestInvertedDarkWorld.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedDarkWorld.py similarity index 98% rename from test/inverted_minor_glitches/TestInvertedDarkWorld.py rename to worlds/alttp/test/inverted_minor_glitches/TestInvertedDarkWorld.py index e8015df8..69f56448 100644 --- a/test/inverted_minor_glitches/TestInvertedDarkWorld.py +++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedDarkWorld.py @@ -1,4 +1,4 @@ -from test.inverted_minor_glitches.TestInvertedMinor import TestInvertedMinor +from .TestInvertedMinor import TestInvertedMinor class TestInvertedDarkWorld(TestInvertedMinor): diff --git a/test/inverted_minor_glitches/TestInvertedDeathMountain.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedDeathMountain.py similarity index 99% rename from test/inverted_minor_glitches/TestInvertedDeathMountain.py rename to worlds/alttp/test/inverted_minor_glitches/TestInvertedDeathMountain.py index 179f1d7f..c68a8e5f 100644 --- a/test/inverted_minor_glitches/TestInvertedDeathMountain.py +++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedDeathMountain.py @@ -1,4 +1,4 @@ -from test.inverted_minor_glitches.TestInvertedMinor import TestInvertedMinor +from .TestInvertedMinor import TestInvertedMinor class TestInvertedDeathMountain(TestInvertedMinor): diff --git a/test/inverted_minor_glitches/TestInvertedEntrances.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedEntrances.py similarity index 98% rename from test/inverted_minor_glitches/TestInvertedEntrances.py rename to worlds/alttp/test/inverted_minor_glitches/TestInvertedEntrances.py index 24ba74e3..6dcd5907 100644 --- a/test/inverted_minor_glitches/TestInvertedEntrances.py +++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedEntrances.py @@ -1,4 +1,4 @@ -from test.inverted_minor_glitches.TestInvertedMinor import TestInvertedMinor +from .TestInvertedMinor import TestInvertedMinor class TestEntrances(TestInvertedMinor): diff --git a/test/inverted_minor_glitches/TestInvertedLightWorld.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedLightWorld.py similarity index 99% rename from test/inverted_minor_glitches/TestInvertedLightWorld.py rename to worlds/alttp/test/inverted_minor_glitches/TestInvertedLightWorld.py index cada88cc..376e7b4b 100644 --- a/test/inverted_minor_glitches/TestInvertedLightWorld.py +++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedLightWorld.py @@ -1,4 +1,4 @@ -from test.inverted_minor_glitches.TestInvertedMinor import TestInvertedMinor +from .TestInvertedMinor import TestInvertedMinor class TestInvertedLightWorld(TestInvertedMinor): diff --git a/test/inverted_minor_glitches/TestInvertedMinor.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py similarity index 100% rename from test/inverted_minor_glitches/TestInvertedMinor.py rename to worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py diff --git a/test/inverted_minor_glitches/TestInvertedTurtleRock.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py similarity index 99% rename from test/inverted_minor_glitches/TestInvertedTurtleRock.py rename to worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py index f176bec4..a25d89a6 100644 --- a/test/inverted_minor_glitches/TestInvertedTurtleRock.py +++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py @@ -1,4 +1,4 @@ -from test.inverted_minor_glitches.TestInvertedMinor import TestInvertedMinor +from .TestInvertedMinor import TestInvertedMinor class TestInvertedTurtleRock(TestInvertedMinor): diff --git a/test/inverted_owg/__init__.py b/worlds/alttp/test/inverted_minor_glitches/__init__.py similarity index 100% rename from test/inverted_owg/__init__.py rename to worlds/alttp/test/inverted_minor_glitches/__init__.py diff --git a/test/inverted_owg/TestDarkWorld.py b/worlds/alttp/test/inverted_owg/TestDarkWorld.py similarity index 97% rename from test/inverted_owg/TestDarkWorld.py rename to worlds/alttp/test/inverted_owg/TestDarkWorld.py index 753f7d65..e7e720d2 100644 --- a/test/inverted_owg/TestDarkWorld.py +++ b/worlds/alttp/test/inverted_owg/TestDarkWorld.py @@ -1,4 +1,4 @@ -from test.inverted_owg.TestInvertedOWG import TestInvertedOWG +from .TestInvertedOWG import TestInvertedOWG class TestDarkWorld(TestInvertedOWG): diff --git a/test/inverted_owg/TestDeathMountain.py b/worlds/alttp/test/inverted_owg/TestDeathMountain.py similarity index 98% rename from test/inverted_owg/TestDeathMountain.py rename to worlds/alttp/test/inverted_owg/TestDeathMountain.py index 346e3981..79796a7a 100644 --- a/test/inverted_owg/TestDeathMountain.py +++ b/worlds/alttp/test/inverted_owg/TestDeathMountain.py @@ -1,4 +1,4 @@ -from test.inverted_owg.TestInvertedOWG import TestInvertedOWG +from .TestInvertedOWG import TestInvertedOWG class TestDeathMountain(TestInvertedOWG): diff --git a/test/inverted_owg/TestDungeons.py b/worlds/alttp/test/inverted_owg/TestDungeons.py similarity index 98% rename from test/inverted_owg/TestDungeons.py rename to worlds/alttp/test/inverted_owg/TestDungeons.py index abd9d193..f5d07544 100644 --- a/test/inverted_owg/TestDungeons.py +++ b/worlds/alttp/test/inverted_owg/TestDungeons.py @@ -1,4 +1,5 @@ -from test.inverted_owg.TestInvertedOWG import TestInvertedOWG +from .TestInvertedOWG import TestInvertedOWG + class TestDungeons(TestInvertedOWG): diff --git a/test/inverted_owg/TestInvertedOWG.py b/worlds/alttp/test/inverted_owg/TestInvertedOWG.py similarity index 100% rename from test/inverted_owg/TestInvertedOWG.py rename to worlds/alttp/test/inverted_owg/TestInvertedOWG.py diff --git a/test/inverted_owg/TestLightWorld.py b/worlds/alttp/test/inverted_owg/TestLightWorld.py similarity index 99% rename from test/inverted_owg/TestLightWorld.py rename to worlds/alttp/test/inverted_owg/TestLightWorld.py index 848122b3..de92b4ef 100644 --- a/test/inverted_owg/TestLightWorld.py +++ b/worlds/alttp/test/inverted_owg/TestLightWorld.py @@ -1,4 +1,4 @@ -from test.inverted_owg.TestInvertedOWG import TestInvertedOWG +from .TestInvertedOWG import TestInvertedOWG class TestLightWorld(TestInvertedOWG): diff --git a/test/items/__init__.py b/worlds/alttp/test/inverted_owg/__init__.py similarity index 100% rename from test/items/__init__.py rename to worlds/alttp/test/inverted_owg/__init__.py diff --git a/test/items/TestDifficulty.py b/worlds/alttp/test/items/TestDifficulty.py similarity index 100% rename from test/items/TestDifficulty.py rename to worlds/alttp/test/items/TestDifficulty.py diff --git a/test/minecraft/__init__.py b/worlds/alttp/test/items/__init__.py similarity index 100% rename from test/minecraft/__init__.py rename to worlds/alttp/test/items/__init__.py diff --git a/test/minor_glitches/TestDarkWorld.py b/worlds/alttp/test/minor_glitches/TestDarkWorld.py similarity index 99% rename from test/minor_glitches/TestDarkWorld.py rename to worlds/alttp/test/minor_glitches/TestDarkWorld.py index 10c8f89e..3a6f9725 100644 --- a/test/minor_glitches/TestDarkWorld.py +++ b/worlds/alttp/test/minor_glitches/TestDarkWorld.py @@ -1,4 +1,4 @@ -from test.minor_glitches.TestMinor import TestMinor +from .TestMinor import TestMinor class TestDarkWorld(TestMinor): diff --git a/test/minor_glitches/TestDeathMountain.py b/worlds/alttp/test/minor_glitches/TestDeathMountain.py similarity index 99% rename from test/minor_glitches/TestDeathMountain.py rename to worlds/alttp/test/minor_glitches/TestDeathMountain.py index 14f5dae4..2603aaeb 100644 --- a/test/minor_glitches/TestDeathMountain.py +++ b/worlds/alttp/test/minor_glitches/TestDeathMountain.py @@ -1,4 +1,4 @@ -from test.minor_glitches.TestMinor import TestMinor +from .TestMinor import TestMinor class TestDeathMountain(TestMinor): diff --git a/test/minor_glitches/TestEntrances.py b/worlds/alttp/test/minor_glitches/TestEntrances.py similarity index 99% rename from test/minor_glitches/TestEntrances.py rename to worlds/alttp/test/minor_glitches/TestEntrances.py index 828b05b7..29dec862 100644 --- a/test/minor_glitches/TestEntrances.py +++ b/worlds/alttp/test/minor_glitches/TestEntrances.py @@ -1,4 +1,4 @@ -from test.minor_glitches.TestMinor import TestMinor +from .TestMinor import TestMinor class TestEntrances(TestMinor): diff --git a/test/minor_glitches/TestLightWorld.py b/worlds/alttp/test/minor_glitches/TestLightWorld.py similarity index 99% rename from test/minor_glitches/TestLightWorld.py rename to worlds/alttp/test/minor_glitches/TestLightWorld.py index bcabf562..bdfdc234 100644 --- a/test/minor_glitches/TestLightWorld.py +++ b/worlds/alttp/test/minor_glitches/TestLightWorld.py @@ -1,4 +1,4 @@ -from test.minor_glitches.TestMinor import TestMinor +from .TestMinor import TestMinor class TestLightWorld(TestMinor): diff --git a/test/minor_glitches/TestMinor.py b/worlds/alttp/test/minor_glitches/TestMinor.py similarity index 100% rename from test/minor_glitches/TestMinor.py rename to worlds/alttp/test/minor_glitches/TestMinor.py diff --git a/test/minor_glitches/__init__.py b/worlds/alttp/test/minor_glitches/__init__.py similarity index 100% rename from test/minor_glitches/__init__.py rename to worlds/alttp/test/minor_glitches/__init__.py diff --git a/test/options/TestPlandoBosses.py b/worlds/alttp/test/options/TestPlandoBosses.py similarity index 100% rename from test/options/TestPlandoBosses.py rename to worlds/alttp/test/options/TestPlandoBosses.py diff --git a/test/options/__init__.py b/worlds/alttp/test/options/__init__.py similarity index 100% rename from test/options/__init__.py rename to worlds/alttp/test/options/__init__.py diff --git a/test/owg/TestDarkWorld.py b/worlds/alttp/test/owg/TestDarkWorld.py similarity index 99% rename from test/owg/TestDarkWorld.py rename to worlds/alttp/test/owg/TestDarkWorld.py index 80104379..93324656 100644 --- a/test/owg/TestDarkWorld.py +++ b/worlds/alttp/test/owg/TestDarkWorld.py @@ -1,4 +1,4 @@ -from test.owg.TestVanillaOWG import TestVanillaOWG +from .TestVanillaOWG import TestVanillaOWG class TestDarkWorld(TestVanillaOWG): diff --git a/test/owg/TestDeathMountain.py b/worlds/alttp/test/owg/TestDeathMountain.py similarity index 99% rename from test/owg/TestDeathMountain.py rename to worlds/alttp/test/owg/TestDeathMountain.py index 83dd2c54..41031c65 100644 --- a/test/owg/TestDeathMountain.py +++ b/worlds/alttp/test/owg/TestDeathMountain.py @@ -1,4 +1,4 @@ -from test.owg.TestVanillaOWG import TestVanillaOWG +from .TestVanillaOWG import TestVanillaOWG class TestDeathMountain(TestVanillaOWG): diff --git a/test/owg/TestDungeons.py b/worlds/alttp/test/owg/TestDungeons.py similarity index 99% rename from test/owg/TestDungeons.py rename to worlds/alttp/test/owg/TestDungeons.py index cb4dc075..284b489b 100644 --- a/test/owg/TestDungeons.py +++ b/worlds/alttp/test/owg/TestDungeons.py @@ -1,4 +1,4 @@ -from test.owg.TestVanillaOWG import TestVanillaOWG +from .TestVanillaOWG import TestVanillaOWG class TestDungeons(TestVanillaOWG): diff --git a/test/owg/TestLightWorld.py b/worlds/alttp/test/owg/TestLightWorld.py similarity index 99% rename from test/owg/TestLightWorld.py rename to worlds/alttp/test/owg/TestLightWorld.py index e58553fb..f3f1ba0c 100644 --- a/test/owg/TestLightWorld.py +++ b/worlds/alttp/test/owg/TestLightWorld.py @@ -1,4 +1,4 @@ -from test.owg.TestVanillaOWG import TestVanillaOWG +from .TestVanillaOWG import TestVanillaOWG class TestLightWorld(TestVanillaOWG): diff --git a/test/owg/TestVanillaOWG.py b/worlds/alttp/test/owg/TestVanillaOWG.py similarity index 100% rename from test/owg/TestVanillaOWG.py rename to worlds/alttp/test/owg/TestVanillaOWG.py diff --git a/test/overcooked2/__init__.py b/worlds/alttp/test/owg/__init__.py similarity index 100% rename from test/overcooked2/__init__.py rename to worlds/alttp/test/owg/__init__.py diff --git a/test/shops/TestSram.py b/worlds/alttp/test/shops/TestSram.py similarity index 100% rename from test/shops/TestSram.py rename to worlds/alttp/test/shops/TestSram.py diff --git a/test/owg/__init__.py b/worlds/alttp/test/shops/__init__.py similarity index 100% rename from test/owg/__init__.py rename to worlds/alttp/test/shops/__init__.py diff --git a/test/vanilla/TestDarkWorld.py b/worlds/alttp/test/vanilla/TestDarkWorld.py similarity index 99% rename from test/vanilla/TestDarkWorld.py rename to worlds/alttp/test/vanilla/TestDarkWorld.py index 885af449..ecb3e558 100644 --- a/test/vanilla/TestDarkWorld.py +++ b/worlds/alttp/test/vanilla/TestDarkWorld.py @@ -1,4 +1,4 @@ -from test.vanilla.TestVanilla import TestVanilla +from .TestVanilla import TestVanilla class TestDarkWorld(TestVanilla): diff --git a/test/vanilla/TestDeathMountain.py b/worlds/alttp/test/vanilla/TestDeathMountain.py similarity index 99% rename from test/vanilla/TestDeathMountain.py rename to worlds/alttp/test/vanilla/TestDeathMountain.py index 821dd7bc..ecb3831f 100644 --- a/test/vanilla/TestDeathMountain.py +++ b/worlds/alttp/test/vanilla/TestDeathMountain.py @@ -1,4 +1,4 @@ -from test.vanilla.TestVanilla import TestVanilla +from .TestVanilla import TestVanilla class TestDeathMountain(TestVanilla): diff --git a/test/vanilla/TestEntrances.py b/worlds/alttp/test/vanilla/TestEntrances.py similarity index 99% rename from test/vanilla/TestEntrances.py rename to worlds/alttp/test/vanilla/TestEntrances.py index 5bcd557f..dbbebbd1 100644 --- a/test/vanilla/TestEntrances.py +++ b/worlds/alttp/test/vanilla/TestEntrances.py @@ -1,4 +1,4 @@ -from test.vanilla.TestVanilla import TestVanilla +from .TestVanilla import TestVanilla class TestEntrances(TestVanilla): diff --git a/test/vanilla/TestLightWorld.py b/worlds/alttp/test/vanilla/TestLightWorld.py similarity index 99% rename from test/vanilla/TestLightWorld.py rename to worlds/alttp/test/vanilla/TestLightWorld.py index c3a03bc0..977e8072 100644 --- a/test/vanilla/TestLightWorld.py +++ b/worlds/alttp/test/vanilla/TestLightWorld.py @@ -1,4 +1,4 @@ -from test.vanilla.TestVanilla import TestVanilla +from .TestVanilla import TestVanilla class TestLightWorld(TestVanilla): diff --git a/test/vanilla/TestVanilla.py b/worlds/alttp/test/vanilla/TestVanilla.py similarity index 100% rename from test/vanilla/TestVanilla.py rename to worlds/alttp/test/vanilla/TestVanilla.py diff --git a/test/shops/__init__.py b/worlds/alttp/test/vanilla/__init__.py similarity index 100% rename from test/shops/__init__.py rename to worlds/alttp/test/vanilla/__init__.py diff --git a/test/minecraft/TestAdvancements.py b/worlds/minecraft/test/TestAdvancements.py similarity index 78% rename from test/minecraft/TestAdvancements.py rename to worlds/minecraft/test/TestAdvancements.py index f86d5a73..5fc64f76 100644 --- a/test/minecraft/TestAdvancements.py +++ b/worlds/minecraft/test/TestAdvancements.py @@ -1,6 +1,7 @@ -from test.minecraft.TestMinecraft import TestMinecraft +from .TestMinecraft import TestMinecraft -# Format: + +# Format: # [location, expected_result, given_items, [excluded_items]] # Every advancement has its own test, named by its internal ID number. class TestAdvancements(TestMinecraft): @@ -18,12 +19,12 @@ class TestAdvancements(TestMinecraft): def test_42001(self): self.run_location_tests([ - ["Oh Shiny", False, []], - ["Oh Shiny", False, [], ['Progressive Resource Crafting']], - ["Oh Shiny", False, [], ['Flint and Steel']], - ["Oh Shiny", False, [], ['Progressive Tools']], - ["Oh Shiny", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Oh Shiny", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Oh Shiny", False, []], + ["Oh Shiny", False, [], ['Progressive Resource Crafting']], + ["Oh Shiny", False, [], ['Flint and Steel']], + ["Oh Shiny", False, [], ['Progressive Tools']], + ["Oh Shiny", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Oh Shiny", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], ["Oh Shiny", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) @@ -44,55 +45,55 @@ class TestAdvancements(TestMinecraft): ["Very Very Frightening", False, [], ['Enchanting']], ["Very Very Frightening", False, [], ['Progressive Tools']], ["Very Very Frightening", False, [], ['Progressive Weapons']], - ["Very Very Frightening", True, ['Progressive Weapons', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', + ["Very Very Frightening", True, ['Progressive Weapons', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Enchanting', 'Progressive Resource Crafting', 'Progressive Resource Crafting', 'Channeling Book']], ]) def test_42004(self): self.run_location_tests([ - ["Hot Stuff", False, []], + ["Hot Stuff", False, []], ["Hot Stuff", False, [], ["Bucket"]], ["Hot Stuff", False, [], ["Progressive Resource Crafting"]], ["Hot Stuff", False, [], ["Progressive Tools"]], - ["Hot Stuff", True, ["Bucket", "Progressive Resource Crafting", "Progressive Tools"]], + ["Hot Stuff", True, ["Bucket", "Progressive Resource Crafting", "Progressive Tools"]], ]) def test_42005(self): self.run_location_tests([ - ["Free the End", False, []], - ["Free the End", False, [], ['Progressive Resource Crafting']], - ["Free the End", False, [], ['Flint and Steel']], - ["Free the End", False, [], ['Progressive Tools']], - ["Free the End", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], - ["Free the End", False, [], ['Progressive Armor']], - ["Free the End", False, [], ['Brewing']], - ["Free the End", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Free the End", False, []], + ["Free the End", False, [], ['Progressive Resource Crafting']], + ["Free the End", False, [], ['Flint and Steel']], + ["Free the End", False, [], ['Progressive Tools']], + ["Free the End", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], + ["Free the End", False, [], ['Progressive Armor']], + ["Free the End", False, [], ['Brewing']], + ["Free the End", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Free the End", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Free the End", False, [], ['Archery']], + ["Free the End", False, [], ['Archery']], ["Free the End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Free the End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', + 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Free the End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) - def test_42006(self): + def test_42006(self): self.run_location_tests([ - ["A Furious Cocktail", False, []], - ["A Furious Cocktail", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], - ["A Furious Cocktail", False, [], ['Flint and Steel']], - ["A Furious Cocktail", False, [], ['Progressive Tools']], - ["A Furious Cocktail", False, [], ['Progressive Weapons']], - ["A Furious Cocktail", False, [], ['Progressive Armor', 'Shield']], - ["A Furious Cocktail", False, [], ['Brewing']], - ["A Furious Cocktail", False, [], ['Bottles']], - ["A Furious Cocktail", False, [], ['Fishing Rod']], - ["A Furious Cocktail", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["A Furious Cocktail", False, []], + ["A Furious Cocktail", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], + ["A Furious Cocktail", False, [], ['Flint and Steel']], + ["A Furious Cocktail", False, [], ['Progressive Tools']], + ["A Furious Cocktail", False, [], ['Progressive Weapons']], + ["A Furious Cocktail", False, [], ['Progressive Armor', 'Shield']], + ["A Furious Cocktail", False, [], ['Brewing']], + ["A Furious Cocktail", False, [], ['Bottles']], + ["A Furious Cocktail", False, [], ['Fishing Rod']], + ["A Furious Cocktail", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["A Furious Cocktail", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', - 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', - 'Progressive Armor', 'Progressive Armor', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', + 'Progressive Armor', 'Progressive Armor', 'Enchanting', 'Brewing', 'Bottles', 'Fishing Rod']], ]) @@ -103,80 +104,80 @@ class TestAdvancements(TestMinecraft): def test_42008(self): self.run_location_tests([ - ["Bring Home the Beacon", False, []], - ["Bring Home the Beacon", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], - ["Bring Home the Beacon", False, [], ['Flint and Steel']], - ["Bring Home the Beacon", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Bring Home the Beacon", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], - ["Bring Home the Beacon", False, ['Progressive Armor'], ['Progressive Armor']], - ["Bring Home the Beacon", False, [], ['Enchanting']], + ["Bring Home the Beacon", False, []], + ["Bring Home the Beacon", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], + ["Bring Home the Beacon", False, [], ['Flint and Steel']], + ["Bring Home the Beacon", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Bring Home the Beacon", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], + ["Bring Home the Beacon", False, ['Progressive Armor'], ['Progressive Armor']], + ["Bring Home the Beacon", False, [], ['Enchanting']], ["Bring Home the Beacon", False, [], ['Brewing']], - ["Bring Home the Beacon", False, [], ['Bottles']], + ["Bring Home the Beacon", False, [], ['Bottles']], ["Bring Home the Beacon", True, [], ['Bucket']], - ["Bring Home the Beacon", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', - 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', - 'Progressive Armor', 'Progressive Armor', + ["Bring Home the Beacon", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', + 'Progressive Armor', 'Progressive Armor', 'Enchanting', 'Brewing', 'Bottles']], ]) def test_42009(self): self.run_location_tests([ - ["Not Today, Thank You", False, []], - ["Not Today, Thank You", False, [], ["Shield"]], - ["Not Today, Thank You", False, [], ["Progressive Resource Crafting"]], - ["Not Today, Thank You", False, [], ["Progressive Tools"]], - ["Not Today, Thank You", True, ["Shield", "Progressive Resource Crafting", "Progressive Tools"]], + ["Not Today, Thank You", False, []], + ["Not Today, Thank You", False, [], ["Shield"]], + ["Not Today, Thank You", False, [], ["Progressive Resource Crafting"]], + ["Not Today, Thank You", False, [], ["Progressive Tools"]], + ["Not Today, Thank You", True, ["Shield", "Progressive Resource Crafting", "Progressive Tools"]], ]) def test_42010(self): self.run_location_tests([ - ["Isn't It Iron Pick", False, []], - ["Isn't It Iron Pick", True, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], - ["Isn't It Iron Pick", False, [], ["Progressive Tools", "Progressive Tools"]], - ["Isn't It Iron Pick", False, [], ["Progressive Resource Crafting"]], - ["Isn't It Iron Pick", False, ["Progressive Tools", "Progressive Resource Crafting"]], - ["Isn't It Iron Pick", True, ["Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], + ["Isn't It Iron Pick", False, []], + ["Isn't It Iron Pick", True, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], + ["Isn't It Iron Pick", False, [], ["Progressive Tools", "Progressive Tools"]], + ["Isn't It Iron Pick", False, [], ["Progressive Resource Crafting"]], + ["Isn't It Iron Pick", False, ["Progressive Tools", "Progressive Resource Crafting"]], + ["Isn't It Iron Pick", True, ["Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], ]) - def test_42011(self): + def test_42011(self): self.run_location_tests([ - ["Local Brewery", False, []], - ["Local Brewery", False, [], ['Progressive Resource Crafting']], - ["Local Brewery", False, [], ['Flint and Steel']], - ["Local Brewery", False, [], ['Progressive Tools']], - ["Local Brewery", False, [], ['Progressive Weapons']], - ["Local Brewery", False, [], ['Progressive Armor', 'Shield']], - ["Local Brewery", False, [], ['Brewing']], + ["Local Brewery", False, []], + ["Local Brewery", False, [], ['Progressive Resource Crafting']], + ["Local Brewery", False, [], ['Flint and Steel']], + ["Local Brewery", False, [], ['Progressive Tools']], + ["Local Brewery", False, [], ['Progressive Weapons']], + ["Local Brewery", False, [], ['Progressive Armor', 'Shield']], + ["Local Brewery", False, [], ['Brewing']], ["Local Brewery", False, [], ['Bottles']], - ["Local Brewery", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Local Brewery", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], - ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], ]) def test_42012(self): self.run_location_tests([ - ["The Next Generation", False, []], - ["The Next Generation", False, [], ['Progressive Resource Crafting']], - ["The Next Generation", False, [], ['Flint and Steel']], - ["The Next Generation", False, [], ['Progressive Tools']], - ["The Next Generation", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], - ["The Next Generation", False, [], ['Progressive Armor']], - ["The Next Generation", False, [], ['Brewing']], - ["The Next Generation", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["The Next Generation", False, []], + ["The Next Generation", False, [], ['Progressive Resource Crafting']], + ["The Next Generation", False, [], ['Flint and Steel']], + ["The Next Generation", False, [], ['Progressive Tools']], + ["The Next Generation", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], + ["The Next Generation", False, [], ['Progressive Armor']], + ["The Next Generation", False, [], ['Brewing']], + ["The Next Generation", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The Next Generation", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The Next Generation", False, [], ['Archery']], - ["The Next Generation", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The Next Generation", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', + ["The Next Generation", False, [], ['Archery']], + ["The Next Generation", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The Next Generation", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -189,33 +190,33 @@ class TestAdvancements(TestMinecraft): def test_42014(self): self.run_location_tests([ - ["Hot Tourist Destinations", False, []], - ["Hot Tourist Destinations", False, [], ['Progressive Resource Crafting']], - ["Hot Tourist Destinations", False, [], ['Flint and Steel']], - ["Hot Tourist Destinations", False, [], ['Progressive Tools']], - ["Hot Tourist Destinations", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Hot Tourist Destinations", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Hot Tourist Destinations", False, []], + ["Hot Tourist Destinations", False, [], ['Progressive Resource Crafting']], + ["Hot Tourist Destinations", False, [], ['Flint and Steel']], + ["Hot Tourist Destinations", False, [], ['Progressive Tools']], + ["Hot Tourist Destinations", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Hot Tourist Destinations", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], ["Hot Tourist Destinations", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42015(self): self.run_location_tests([ - ["This Boat Has Legs", False, []], - ["This Boat Has Legs", False, [], ['Progressive Resource Crafting']], - ["This Boat Has Legs", False, [], ['Flint and Steel']], - ["This Boat Has Legs", False, [], ['Progressive Tools']], - ["This Boat Has Legs", False, [], ['Progressive Weapons']], - ["This Boat Has Legs", False, [], ['Progressive Armor', 'Shield']], + ["This Boat Has Legs", False, []], + ["This Boat Has Legs", False, [], ['Progressive Resource Crafting']], + ["This Boat Has Legs", False, [], ['Flint and Steel']], + ["This Boat Has Legs", False, [], ['Progressive Tools']], + ["This Boat Has Legs", False, [], ['Progressive Weapons']], + ["This Boat Has Legs", False, [], ['Progressive Armor', 'Shield']], ["This Boat Has Legs", False, [], ['Fishing Rod']], ["This Boat Has Legs", False, [], ['Saddle']], - ["This Boat Has Legs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']], + ["This Boat Has Legs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']], ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']], - ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Bucket', 'Fishing Rod']], + ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Bucket', 'Fishing Rod']], ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']], ]) - def test_42016(self): + def test_42016(self): self.run_location_tests([ ["Sniper Duel", False, []], ["Sniper Duel", False, [], ['Archery']], @@ -224,60 +225,60 @@ class TestAdvancements(TestMinecraft): def test_42017(self): self.run_location_tests([ - ["Nether", False, []], - ["Nether", False, [], ['Progressive Resource Crafting']], - ["Nether", False, [], ['Flint and Steel']], - ["Nether", False, [], ['Progressive Tools']], - ["Nether", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Nether", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Nether", False, []], + ["Nether", False, [], ['Progressive Resource Crafting']], + ["Nether", False, [], ['Flint and Steel']], + ["Nether", False, [], ['Progressive Tools']], + ["Nether", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Nether", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], ["Nether", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42018(self): self.run_location_tests([ - ["Great View From Up Here", False, []], - ["Great View From Up Here", False, [], ['Progressive Resource Crafting']], - ["Great View From Up Here", False, [], ['Flint and Steel']], - ["Great View From Up Here", False, [], ['Progressive Tools']], - ["Great View From Up Here", False, [], ['Progressive Weapons']], - ["Great View From Up Here", False, [], ['Progressive Armor', 'Shield']], - ["Great View From Up Here", False, [], ['Brewing']], - ["Great View From Up Here", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Great View From Up Here", False, []], + ["Great View From Up Here", False, [], ['Progressive Resource Crafting']], + ["Great View From Up Here", False, [], ['Flint and Steel']], + ["Great View From Up Here", False, [], ['Progressive Tools']], + ["Great View From Up Here", False, [], ['Progressive Weapons']], + ["Great View From Up Here", False, [], ['Progressive Armor', 'Shield']], + ["Great View From Up Here", False, [], ['Brewing']], + ["Great View From Up Here", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Great View From Up Here", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42019(self): self.run_location_tests([ - ["How Did We Get Here?", False, []], - ["How Did We Get Here?", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], - ["How Did We Get Here?", False, [], ['Flint and Steel']], - ["How Did We Get Here?", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["How Did We Get Here?", False, ['Progressive Weapons', 'Progressive Weapons'], ['Progressive Weapons']], - ["How Did We Get Here?", False, ['Progressive Armor'], ['Progressive Armor']], - ["How Did We Get Here?", False, [], ['Shield']], - ["How Did We Get Here?", False, [], ['Enchanting']], - ["How Did We Get Here?", False, [], ['Brewing']], - ["How Did We Get Here?", False, [], ['Bottles']], - ["How Did We Get Here?", False, [], ['Archery']], - ["How Did We Get Here?", False, [], ['Fishing Rod']], + ["How Did We Get Here?", False, []], + ["How Did We Get Here?", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], + ["How Did We Get Here?", False, [], ['Flint and Steel']], + ["How Did We Get Here?", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["How Did We Get Here?", False, ['Progressive Weapons', 'Progressive Weapons'], ['Progressive Weapons']], + ["How Did We Get Here?", False, ['Progressive Armor'], ['Progressive Armor']], + ["How Did We Get Here?", False, [], ['Shield']], + ["How Did We Get Here?", False, [], ['Enchanting']], + ["How Did We Get Here?", False, [], ['Brewing']], + ["How Did We Get Here?", False, [], ['Bottles']], + ["How Did We Get Here?", False, [], ['Archery']], + ["How Did We Get Here?", False, [], ['Fishing Rod']], ["How Did We Get Here?", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["How Did We Get Here?", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Flint and Steel', - 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', - 'Progressive Armor', 'Progressive Armor', 'Shield', - 'Enchanting', 'Brewing', 'Archery', 'Bottles', 'Fishing Rod', + ["How Did We Get Here?", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Flint and Steel', + 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', + 'Progressive Armor', 'Progressive Armor', 'Shield', + 'Enchanting', 'Brewing', 'Archery', 'Bottles', 'Fishing Rod', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -292,30 +293,30 @@ class TestAdvancements(TestMinecraft): def test_42021(self): self.run_location_tests([ - ["Spooky Scary Skeleton", False, []], - ["Spooky Scary Skeleton", False, [], ['Progressive Resource Crafting']], - ["Spooky Scary Skeleton", False, [], ['Flint and Steel']], - ["Spooky Scary Skeleton", False, [], ['Progressive Tools']], - ["Spooky Scary Skeleton", False, [], ['Progressive Weapons']], - ["Spooky Scary Skeleton", False, [], ['Progressive Armor', 'Shield']], - ["Spooky Scary Skeleton", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], + ["Spooky Scary Skeleton", False, []], + ["Spooky Scary Skeleton", False, [], ['Progressive Resource Crafting']], + ["Spooky Scary Skeleton", False, [], ['Flint and Steel']], + ["Spooky Scary Skeleton", False, [], ['Progressive Tools']], + ["Spooky Scary Skeleton", False, [], ['Progressive Weapons']], + ["Spooky Scary Skeleton", False, [], ['Progressive Armor', 'Shield']], + ["Spooky Scary Skeleton", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']], - ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], + ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], ]) def test_42022(self): self.run_location_tests([ ["Two by Two", False, []], - ["Two by Two", False, [], ['Progressive Resource Crafting']], - ["Two by Two", False, [], ['Flint and Steel']], - ["Two by Two", False, [], ['Progressive Tools']], + ["Two by Two", False, [], ['Progressive Resource Crafting']], + ["Two by Two", False, [], ['Flint and Steel']], + ["Two by Two", False, [], ['Progressive Tools']], ["Two by Two", False, [], ['Progressive Weapons']], ["Two by Two", False, [], ['Bucket']], ["Two by Two", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Two by Two", False, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], - ["Two by Two", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], + ["Two by Two", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], ]) def test_42023(self): @@ -335,12 +336,12 @@ class TestAdvancements(TestMinecraft): def test_42025(self): self.run_location_tests([ - ["We Need to Go Deeper", False, []], - ["We Need to Go Deeper", False, [], ['Progressive Resource Crafting']], - ["We Need to Go Deeper", False, [], ['Flint and Steel']], - ["We Need to Go Deeper", False, [], ['Progressive Tools']], - ["We Need to Go Deeper", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["We Need to Go Deeper", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["We Need to Go Deeper", False, []], + ["We Need to Go Deeper", False, [], ['Progressive Resource Crafting']], + ["We Need to Go Deeper", False, [], ['Flint and Steel']], + ["We Need to Go Deeper", False, [], ['Progressive Tools']], + ["We Need to Go Deeper", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["We Need to Go Deeper", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], ["We Need to Go Deeper", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) @@ -371,53 +372,53 @@ class TestAdvancements(TestMinecraft): def test_42029(self): self.run_location_tests([ - ["Zombie Doctor", False, []], - ["Zombie Doctor", False, [], ['Progressive Resource Crafting']], - ["Zombie Doctor", False, [], ['Flint and Steel']], - ["Zombie Doctor", False, [], ['Progressive Tools']], - ["Zombie Doctor", False, [], ['Progressive Weapons']], - ["Zombie Doctor", False, [], ['Progressive Armor', 'Shield']], - ["Zombie Doctor", False, [], ['Brewing']], + ["Zombie Doctor", False, []], + ["Zombie Doctor", False, [], ['Progressive Resource Crafting']], + ["Zombie Doctor", False, [], ['Flint and Steel']], + ["Zombie Doctor", False, [], ['Progressive Tools']], + ["Zombie Doctor", False, [], ['Progressive Weapons']], + ["Zombie Doctor", False, [], ['Progressive Armor', 'Shield']], + ["Zombie Doctor", False, [], ['Brewing']], ["Zombie Doctor", False, [], ['Bottles']], - ["Zombie Doctor", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Zombie Doctor", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], - ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], ]) def test_42030(self): self.run_location_tests([ - ["The City at the End of the Game", False, []], - ["The City at the End of the Game", False, [], ['Progressive Resource Crafting']], - ["The City at the End of the Game", False, [], ['Flint and Steel']], - ["The City at the End of the Game", False, [], ['Progressive Tools']], - ["The City at the End of the Game", False, [], ['Progressive Weapons']], - ["The City at the End of the Game", False, [], ['Progressive Armor', 'Shield']], - ["The City at the End of the Game", False, [], ['Brewing']], - ["The City at the End of the Game", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["The City at the End of the Game", False, []], + ["The City at the End of the Game", False, [], ['Progressive Resource Crafting']], + ["The City at the End of the Game", False, [], ['Flint and Steel']], + ["The City at the End of the Game", False, [], ['Progressive Tools']], + ["The City at the End of the Game", False, [], ['Progressive Weapons']], + ["The City at the End of the Game", False, [], ['Progressive Armor', 'Shield']], + ["The City at the End of the Game", False, [], ['Brewing']], + ["The City at the End of the Game", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The City at the End of the Game", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42031(self): self.run_location_tests([ - ["Ice Bucket Challenge", False, []], + ["Ice Bucket Challenge", False, []], ["Ice Bucket Challenge", False, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], ["Ice Bucket Challenge", False, [], ["Progressive Resource Crafting"]], ["Ice Bucket Challenge", True, ["Progressive Tools", "Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], @@ -425,54 +426,54 @@ class TestAdvancements(TestMinecraft): def test_42032(self): self.run_location_tests([ - ["Remote Getaway", False, []], - ["Remote Getaway", False, [], ['Progressive Resource Crafting']], - ["Remote Getaway", False, [], ['Flint and Steel']], - ["Remote Getaway", False, [], ['Progressive Tools']], - ["Remote Getaway", False, [], ['Progressive Weapons']], - ["Remote Getaway", False, [], ['Progressive Armor', 'Shield']], - ["Remote Getaway", False, [], ['Brewing']], - ["Remote Getaway", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Remote Getaway", False, []], + ["Remote Getaway", False, [], ['Progressive Resource Crafting']], + ["Remote Getaway", False, [], ['Flint and Steel']], + ["Remote Getaway", False, [], ['Progressive Tools']], + ["Remote Getaway", False, [], ['Progressive Weapons']], + ["Remote Getaway", False, [], ['Progressive Armor', 'Shield']], + ["Remote Getaway", False, [], ['Brewing']], + ["Remote Getaway", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Remote Getaway", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42033(self): self.run_location_tests([ - ["Into Fire", False, []], - ["Into Fire", False, [], ['Progressive Resource Crafting']], - ["Into Fire", False, [], ['Flint and Steel']], - ["Into Fire", False, [], ['Progressive Tools']], - ["Into Fire", False, [], ['Progressive Weapons']], - ["Into Fire", False, [], ['Progressive Armor', 'Shield']], - ["Into Fire", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], + ["Into Fire", False, []], + ["Into Fire", False, [], ['Progressive Resource Crafting']], + ["Into Fire", False, [], ['Flint and Steel']], + ["Into Fire", False, [], ['Progressive Tools']], + ["Into Fire", False, [], ['Progressive Weapons']], + ["Into Fire", False, [], ['Progressive Armor', 'Shield']], + ["Into Fire", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']], - ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], + ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], ]) def test_42034(self): self.run_location_tests([ - ["War Pigs", False, []], - ["War Pigs", False, [], ['Progressive Resource Crafting']], - ["War Pigs", False, [], ['Flint and Steel']], - ["War Pigs", False, [], ['Progressive Tools']], - ["War Pigs", False, [], ['Progressive Weapons']], - ["War Pigs", False, [], ['Progressive Armor', 'Shield']], - ["War Pigs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["War Pigs", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], + ["War Pigs", False, []], + ["War Pigs", False, [], ['Progressive Resource Crafting']], + ["War Pigs", False, [], ['Flint and Steel']], + ["War Pigs", False, [], ['Progressive Tools']], + ["War Pigs", False, [], ['Progressive Weapons']], + ["War Pigs", False, [], ['Progressive Armor', 'Shield']], + ["War Pigs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["War Pigs", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], ["War Pigs", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], ]) @@ -490,7 +491,7 @@ class TestAdvancements(TestMinecraft): ["Total Beelocation", False, [], ['Silk Touch Book']], ["Total Beelocation", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Total Beelocation", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Total Beelocation", True, ['Enchanting', 'Silk Touch Book', 'Progressive Resource Crafting', 'Progressive Resource Crafting', + ["Total Beelocation", True, ['Enchanting', 'Silk Touch Book', 'Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools']], ]) @@ -501,34 +502,34 @@ class TestAdvancements(TestMinecraft): ["Arbalistic", False, [], ['Piercing IV Book']], ["Arbalistic", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Arbalistic", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Arbalistic", False, [], ['Archery']], - ["Arbalistic", True, ['Enchanting', 'Piercing IV Book', 'Progressive Resource Crafting', 'Progressive Resource Crafting', + ["Arbalistic", False, [], ['Archery']], + ["Arbalistic", True, ['Enchanting', 'Piercing IV Book', 'Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Archery']], ]) - def test_42038(self): + def test_42038(self): self.run_location_tests([ - ["The End... Again...", False, []], - ["The End... Again...", False, [], ['Progressive Resource Crafting']], - ["The End... Again...", False, [], ['Flint and Steel']], - ["The End... Again...", False, [], ['Progressive Tools']], - ["The End... Again...", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], - ["The End... Again...", False, [], ['Progressive Armor']], - ["The End... Again...", False, [], ['Brewing']], - ["The End... Again...", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["The End... Again...", False, []], + ["The End... Again...", False, [], ['Progressive Resource Crafting']], + ["The End... Again...", False, [], ['Flint and Steel']], + ["The End... Again...", False, [], ['Progressive Tools']], + ["The End... Again...", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], + ["The End... Again...", False, [], ['Progressive Armor']], + ["The End... Again...", False, [], ['Brewing']], + ["The End... Again...", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The End... Again...", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The End... Again...", False, [], ['Archery']], - ["The End... Again...", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End... Again...", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', + ["The End... Again...", False, [], ['Archery']], + ["The End... Again...", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The End... Again...", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42039(self): self.run_location_tests([ - ["Acquire Hardware", False, []], + ["Acquire Hardware", False, []], ["Acquire Hardware", False, [], ["Progressive Tools"]], ["Acquire Hardware", False, [], ["Progressive Resource Crafting"]], ["Acquire Hardware", True, ["Progressive Tools", "Progressive Resource Crafting"]], @@ -536,12 +537,12 @@ class TestAdvancements(TestMinecraft): def test_42040(self): self.run_location_tests([ - ["Not Quite \"Nine\" Lives", False, []], - ["Not Quite \"Nine\" Lives", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], - ["Not Quite \"Nine\" Lives", False, [], ['Flint and Steel']], - ["Not Quite \"Nine\" Lives", False, [], ['Progressive Tools']], - ["Not Quite \"Nine\" Lives", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Not Quite \"Nine\" Lives", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Not Quite \"Nine\" Lives", False, []], + ["Not Quite \"Nine\" Lives", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], + ["Not Quite \"Nine\" Lives", False, [], ['Flint and Steel']], + ["Not Quite \"Nine\" Lives", False, [], ['Progressive Tools']], + ["Not Quite \"Nine\" Lives", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Not Quite \"Nine\" Lives", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], ["Not Quite \"Nine\" Lives", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) @@ -556,26 +557,26 @@ class TestAdvancements(TestMinecraft): def test_42042(self): self.run_location_tests([ - ["Sky's the Limit", False, []], - ["Sky's the Limit", False, [], ['Progressive Resource Crafting']], - ["Sky's the Limit", False, [], ['Flint and Steel']], - ["Sky's the Limit", False, [], ['Progressive Tools']], - ["Sky's the Limit", False, [], ['Progressive Weapons']], - ["Sky's the Limit", False, [], ['Progressive Armor', 'Shield']], - ["Sky's the Limit", False, [], ['Brewing']], - ["Sky's the Limit", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Sky's the Limit", False, []], + ["Sky's the Limit", False, [], ['Progressive Resource Crafting']], + ["Sky's the Limit", False, [], ['Flint and Steel']], + ["Sky's the Limit", False, [], ['Progressive Tools']], + ["Sky's the Limit", False, [], ['Progressive Weapons']], + ["Sky's the Limit", False, [], ['Progressive Armor', 'Shield']], + ["Sky's the Limit", False, [], ['Brewing']], + ["Sky's the Limit", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Sky's the Limit", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -589,12 +590,12 @@ class TestAdvancements(TestMinecraft): def test_42044(self): self.run_location_tests([ - ["Return to Sender", False, []], - ["Return to Sender", False, [], ['Progressive Resource Crafting']], - ["Return to Sender", False, [], ['Flint and Steel']], - ["Return to Sender", False, [], ['Progressive Tools']], - ["Return to Sender", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Return to Sender", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Return to Sender", False, []], + ["Return to Sender", False, [], ['Progressive Resource Crafting']], + ["Return to Sender", False, [], ['Flint and Steel']], + ["Return to Sender", False, [], ['Progressive Tools']], + ["Return to Sender", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Return to Sender", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], ["Return to Sender", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) @@ -610,27 +611,27 @@ class TestAdvancements(TestMinecraft): def test_42046(self): self.run_location_tests([ - ["You Need a Mint", False, []], - ["You Need a Mint", False, [], ['Progressive Resource Crafting']], - ["You Need a Mint", False, [], ['Flint and Steel']], - ["You Need a Mint", False, [], ['Progressive Tools']], - ["You Need a Mint", False, [], ['Progressive Weapons']], - ["You Need a Mint", False, [], ['Progressive Armor', 'Shield']], - ["You Need a Mint", False, [], ['Brewing']], - ["You Need a Mint", False, [], ['Bottles']], - ["You Need a Mint", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["You Need a Mint", False, []], + ["You Need a Mint", False, [], ['Progressive Resource Crafting']], + ["You Need a Mint", False, [], ['Flint and Steel']], + ["You Need a Mint", False, [], ['Progressive Tools']], + ["You Need a Mint", False, [], ['Progressive Weapons']], + ["You Need a Mint", False, [], ['Progressive Armor', 'Shield']], + ["You Need a Mint", False, [], ['Brewing']], + ["You Need a Mint", False, [], ['Bottles']], + ["You Need a Mint", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["You Need a Mint", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', - '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], - ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', + '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], + ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Brewing', - '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], - ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', 'Brewing', + 'Progressive Weapons', 'Shield', 'Brewing', + '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], + ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], ]) @@ -641,22 +642,22 @@ class TestAdvancements(TestMinecraft): def test_42048(self): self.run_location_tests([ - ["Monsters Hunted", False, []], - ["Monsters Hunted", False, [], ['Progressive Resource Crafting']], - ["Monsters Hunted", False, [], ['Flint and Steel']], - ["Monsters Hunted", False, [], ['Progressive Tools']], - ["Monsters Hunted", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], - ["Monsters Hunted", False, [], ['Progressive Armor']], - ["Monsters Hunted", False, [], ['Brewing']], - ["Monsters Hunted", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Monsters Hunted", False, []], + ["Monsters Hunted", False, [], ['Progressive Resource Crafting']], + ["Monsters Hunted", False, [], ['Flint and Steel']], + ["Monsters Hunted", False, [], ['Progressive Tools']], + ["Monsters Hunted", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], + ["Monsters Hunted", False, [], ['Progressive Armor']], + ["Monsters Hunted", False, [], ['Brewing']], + ["Monsters Hunted", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Monsters Hunted", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Monsters Hunted", False, [], ['Archery']], - ["Monsters Hunted", False, [], ['Enchanting']], - ["Monsters Hunted", False, [], ['Fishing Rod']], - ["Monsters Hunted", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Archery', - 'Progressive Armor', 'Progressive Armor', 'Enchanting', - 'Fishing Rod', 'Brewing', 'Bottles', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["Monsters Hunted", False, [], ['Archery']], + ["Monsters Hunted", False, [], ['Enchanting']], + ["Monsters Hunted", False, [], ['Fishing Rod']], + ["Monsters Hunted", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Archery', + 'Progressive Armor', 'Progressive Armor', 'Enchanting', + 'Fishing Rod', 'Brewing', 'Bottles', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42049(self): @@ -681,64 +682,64 @@ class TestAdvancements(TestMinecraft): def test_42051(self): self.run_location_tests([ - ["Eye Spy", False, []], - ["Eye Spy", False, [], ['Progressive Resource Crafting']], - ["Eye Spy", False, [], ['Flint and Steel']], - ["Eye Spy", False, [], ['Progressive Tools']], - ["Eye Spy", False, [], ['Progressive Weapons']], - ["Eye Spy", False, [], ['Progressive Armor', 'Shield']], - ["Eye Spy", False, [], ['Brewing']], - ["Eye Spy", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Eye Spy", False, []], + ["Eye Spy", False, [], ['Progressive Resource Crafting']], + ["Eye Spy", False, [], ['Flint and Steel']], + ["Eye Spy", False, [], ['Progressive Tools']], + ["Eye Spy", False, [], ['Progressive Weapons']], + ["Eye Spy", False, [], ['Progressive Armor', 'Shield']], + ["Eye Spy", False, [], ['Brewing']], + ["Eye Spy", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Eye Spy", False, [], ['3 Ender Pearls']], - ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls']], - ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls']], - ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls']], - ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls']], + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls']], + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls']], ]) def test_42052(self): self.run_location_tests([ - ["The End", False, []], - ["The End", False, [], ['Progressive Resource Crafting']], - ["The End", False, [], ['Flint and Steel']], - ["The End", False, [], ['Progressive Tools']], - ["The End", False, [], ['Progressive Weapons']], - ["The End", False, [], ['Progressive Armor', 'Shield']], - ["The End", False, [], ['Brewing']], - ["The End", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["The End", False, []], + ["The End", False, [], ['Progressive Resource Crafting']], + ["The End", False, [], ['Flint and Steel']], + ["The End", False, [], ['Progressive Tools']], + ["The End", False, [], ['Progressive Weapons']], + ["The End", False, [], ['Progressive Armor', 'Shield']], + ["The End", False, [], ['Brewing']], + ["The End", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The End", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42053(self): self.run_location_tests([ - ["Serious Dedication", False, []], - ["Serious Dedication", False, [], ['Progressive Resource Crafting']], - ["Serious Dedication", False, [], ['Flint and Steel']], - ["Serious Dedication", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Serious Dedication", False, [], ['Progressive Weapons']], - ["Serious Dedication", False, [], ['Progressive Armor', 'Shield']], - ["Serious Dedication", False, [], ['Brewing']], + ["Serious Dedication", False, []], + ["Serious Dedication", False, [], ['Progressive Resource Crafting']], + ["Serious Dedication", False, [], ['Flint and Steel']], + ["Serious Dedication", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Serious Dedication", False, [], ['Progressive Weapons']], + ["Serious Dedication", False, [], ['Progressive Armor', 'Shield']], + ["Serious Dedication", False, [], ['Brewing']], ["Serious Dedication", False, [], ['Bottles']], ["Serious Dedication", False, [], ['Bed']], - ["Serious Dedication", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Serious Dedication", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed']], - ["Serious Dedication", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Serious Dedication", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Bed']], ]) @@ -749,7 +750,7 @@ class TestAdvancements(TestMinecraft): ["Postmortal", False, [], ['Progressive Armor']], ["Postmortal", False, [], ['Shield']], ["Postmortal", False, [], ['Progressive Resource Crafting']], - ["Postmortal", False, [], ['Progressive Tools']], + ["Postmortal", False, [], ['Progressive Tools']], ["Postmortal", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Progressive Resource Crafting', 'Progressive Tools']], ]) @@ -774,13 +775,13 @@ class TestAdvancements(TestMinecraft): def test_42058(self): self.run_location_tests([ - ["Those Were the Days", False, []], - ["Those Were the Days", False, [], ['Progressive Resource Crafting']], - ["Those Were the Days", False, [], ['Flint and Steel']], - ["Those Were the Days", False, [], ['Progressive Tools']], - ["Those Were the Days", False, [], ['Progressive Weapons']], - ["Those Were the Days", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Those Were the Days", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], + ["Those Were the Days", False, []], + ["Those Were the Days", False, [], ['Progressive Resource Crafting']], + ["Those Were the Days", False, [], ['Flint and Steel']], + ["Those Were the Days", False, [], ['Progressive Tools']], + ["Those Were the Days", False, [], ['Progressive Weapons']], + ["Those Were the Days", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Those Were the Days", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], ["Those Were the Days", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], ]) @@ -791,59 +792,59 @@ class TestAdvancements(TestMinecraft): ["Hero of the Village", False, [], ['Progressive Armor']], ["Hero of the Village", False, [], ['Shield']], ["Hero of the Village", False, [], ['Progressive Resource Crafting']], - ["Hero of the Village", False, [], ['Progressive Tools']], + ["Hero of the Village", False, [], ['Progressive Tools']], ["Hero of the Village", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Progressive Resource Crafting', 'Progressive Tools']], ]) def test_42060(self): self.run_location_tests([ - ["Hidden in the Depths", False, []], - ["Hidden in the Depths", False, [], ['Progressive Resource Crafting']], - ["Hidden in the Depths", False, [], ['Flint and Steel']], - ["Hidden in the Depths", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Hidden in the Depths", False, [], ['Progressive Weapons']], - ["Hidden in the Depths", False, [], ['Progressive Armor', 'Shield']], - ["Hidden in the Depths", False, [], ['Brewing']], + ["Hidden in the Depths", False, []], + ["Hidden in the Depths", False, [], ['Progressive Resource Crafting']], + ["Hidden in the Depths", False, [], ['Flint and Steel']], + ["Hidden in the Depths", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Hidden in the Depths", False, [], ['Progressive Weapons']], + ["Hidden in the Depths", False, [], ['Progressive Armor', 'Shield']], + ["Hidden in the Depths", False, [], ['Brewing']], ["Hidden in the Depths", False, [], ['Bottles']], ["Hidden in the Depths", False, [], ['Bed']], - ["Hidden in the Depths", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Hidden in the Depths", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed']], - ["Hidden in the Depths", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Hidden in the Depths", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Bed']], ]) def test_42061(self): self.run_location_tests([ - ["Beaconator", False, []], - ["Beaconator", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], - ["Beaconator", False, [], ['Flint and Steel']], - ["Beaconator", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Beaconator", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], - ["Beaconator", False, ['Progressive Armor'], ['Progressive Armor']], + ["Beaconator", False, []], + ["Beaconator", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], + ["Beaconator", False, [], ['Flint and Steel']], + ["Beaconator", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Beaconator", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], + ["Beaconator", False, ['Progressive Armor'], ['Progressive Armor']], ["Beaconator", False, [], ['Brewing']], - ["Beaconator", False, [], ['Bottles']], - ["Beaconator", False, [], ['Enchanting']], + ["Beaconator", False, [], ['Bottles']], + ["Beaconator", False, [], ['Enchanting']], ["Beaconator", True, [], ['Bucket']], - ["Beaconator", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', - 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', + ["Beaconator", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', 'Brewing', 'Bottles', 'Enchanting']], ]) def test_42062(self): self.run_location_tests([ - ["Withering Heights", False, []], - ["Withering Heights", False, [], ['Progressive Resource Crafting']], - ["Withering Heights", False, [], ['Flint and Steel']], - ["Withering Heights", False, [], ['Progressive Tools']], - ["Withering Heights", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], - ["Withering Heights", False, ['Progressive Armor'], ['Progressive Armor']], - ["Withering Heights", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Withering Heights", False, []], + ["Withering Heights", False, [], ['Progressive Resource Crafting']], + ["Withering Heights", False, [], ['Flint and Steel']], + ["Withering Heights", False, [], ['Progressive Tools']], + ["Withering Heights", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], + ["Withering Heights", False, ['Progressive Armor'], ['Progressive Armor']], + ["Withering Heights", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Withering Heights", False, [], ['Brewing']], - ["Withering Heights", False, [], ['Bottles']], - ["Withering Heights", False, [], ['Enchanting']], - ["Withering Heights", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', + ["Withering Heights", False, [], ['Bottles']], + ["Withering Heights", False, [], ['Enchanting']], + ["Withering Heights", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', 'Brewing', 'Bottles', 'Enchanting']], ]) @@ -852,38 +853,38 @@ class TestAdvancements(TestMinecraft): ["A Balanced Diet", False, []], ["A Balanced Diet", False, [], ['Bottles']], ["A Balanced Diet", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], - ["A Balanced Diet", False, [], ['Flint and Steel']], - ["A Balanced Diet", False, [], ['Progressive Tools']], - ["A Balanced Diet", False, [], ['Progressive Weapons']], - ["A Balanced Diet", False, [], ['Progressive Armor', 'Shield']], - ["A Balanced Diet", False, [], ['Brewing']], - ["A Balanced Diet", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["A Balanced Diet", False, [], ['Flint and Steel']], + ["A Balanced Diet", False, [], ['Progressive Tools']], + ["A Balanced Diet", False, [], ['Progressive Weapons']], + ["A Balanced Diet", False, [], ['Progressive Armor', 'Shield']], + ["A Balanced Diet", False, [], ['Brewing']], + ["A Balanced Diet", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["A Balanced Diet", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', - 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Bottles', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', - 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', 'Bottles', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', - 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Bottles', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', - 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', 'Bottles', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Bottles', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Bottles', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', 'Bottles', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Bottles', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42064(self): self.run_location_tests([ - ["Subspace Bubble", False, []], - ["Subspace Bubble", False, [], ['Progressive Resource Crafting']], - ["Subspace Bubble", False, [], ['Flint and Steel']], - ["Subspace Bubble", False, [], ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Subspace Bubble", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Resource Crafting']], + ["Subspace Bubble", False, []], + ["Subspace Bubble", False, [], ['Progressive Resource Crafting']], + ["Subspace Bubble", False, [], ['Flint and Steel']], + ["Subspace Bubble", False, [], ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Subspace Bubble", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Resource Crafting']], ]) def test_42065(self): @@ -893,18 +894,18 @@ class TestAdvancements(TestMinecraft): def test_42066(self): self.run_location_tests([ - ["Country Lode, Take Me Home", False, []], - ["Country Lode, Take Me Home", False, [], ['Progressive Resource Crafting']], - ["Country Lode, Take Me Home", False, [], ['Flint and Steel']], - ["Country Lode, Take Me Home", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Country Lode, Take Me Home", False, [], ['Progressive Weapons']], - ["Country Lode, Take Me Home", False, [], ['Progressive Armor', 'Shield']], - ["Country Lode, Take Me Home", False, [], ['Brewing']], + ["Country Lode, Take Me Home", False, []], + ["Country Lode, Take Me Home", False, [], ['Progressive Resource Crafting']], + ["Country Lode, Take Me Home", False, [], ['Flint and Steel']], + ["Country Lode, Take Me Home", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Country Lode, Take Me Home", False, [], ['Progressive Weapons']], + ["Country Lode, Take Me Home", False, [], ['Progressive Armor', 'Shield']], + ["Country Lode, Take Me Home", False, [], ['Brewing']], ["Country Lode, Take Me Home", False, [], ['Bottles']], ["Country Lode, Take Me Home", False, [], ['Bed']], - ["Country Lode, Take Me Home", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Country Lode, Take Me Home", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed']], - ["Country Lode, Take Me Home", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Country Lode, Take Me Home", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Bed']], ]) @@ -928,33 +929,33 @@ class TestAdvancements(TestMinecraft): def test_42069(self): self.run_location_tests([ - ["Uneasy Alliance", False, []], - ["Uneasy Alliance", False, [], ['Progressive Resource Crafting']], - ["Uneasy Alliance", False, [], ['Flint and Steel']], - ["Uneasy Alliance", False, [], ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Uneasy Alliance", False, [], ['Fishing Rod']], - ["Uneasy Alliance", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Resource Crafting', 'Fishing Rod']], + ["Uneasy Alliance", False, []], + ["Uneasy Alliance", False, [], ['Progressive Resource Crafting']], + ["Uneasy Alliance", False, [], ['Flint and Steel']], + ["Uneasy Alliance", False, [], ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Uneasy Alliance", False, [], ['Fishing Rod']], + ["Uneasy Alliance", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Resource Crafting', 'Fishing Rod']], ]) def test_42070(self): self.run_location_tests([ - ["Diamonds!", False, []], - ["Diamonds!", True, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], - ["Diamonds!", False, [], ["Progressive Tools", "Progressive Tools"]], - ["Diamonds!", False, [], ["Progressive Resource Crafting"]], - ["Diamonds!", False, ["Progressive Tools", "Progressive Resource Crafting"]], - ["Diamonds!", True, ["Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], + ["Diamonds!", False, []], + ["Diamonds!", True, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], + ["Diamonds!", False, [], ["Progressive Tools", "Progressive Tools"]], + ["Diamonds!", False, [], ["Progressive Resource Crafting"]], + ["Diamonds!", False, ["Progressive Tools", "Progressive Resource Crafting"]], + ["Diamonds!", True, ["Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], ]) def test_42071(self): self.run_location_tests([ - ["A Terrible Fortress", False, []], - ["A Terrible Fortress", False, [], ['Progressive Resource Crafting']], - ["A Terrible Fortress", False, [], ['Flint and Steel']], - ["A Terrible Fortress", False, [], ['Progressive Tools']], - ["A Terrible Fortress", False, [], ['Progressive Weapons']], - ["A Terrible Fortress", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["A Terrible Fortress", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], + ["A Terrible Fortress", False, []], + ["A Terrible Fortress", False, [], ['Progressive Resource Crafting']], + ["A Terrible Fortress", False, [], ['Flint and Steel']], + ["A Terrible Fortress", False, [], ['Progressive Tools']], + ["A Terrible Fortress", False, [], ['Progressive Weapons']], + ["A Terrible Fortress", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["A Terrible Fortress", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], ["A Terrible Fortress", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], ]) @@ -992,43 +993,43 @@ class TestAdvancements(TestMinecraft): def test_42076(self): self.run_location_tests([ - ["Cover Me in Debris", False, []], - ["Cover Me in Debris", False, [], ['Progressive Resource Crafting']], - ["Cover Me in Debris", False, [], ['Flint and Steel']], - ["Cover Me in Debris", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Cover Me in Debris", False, [], ['Progressive Weapons']], - ["Cover Me in Debris", False, ['Progressive Armor'], ['Progressive Armor']], - ["Cover Me in Debris", False, [], ['Brewing']], + ["Cover Me in Debris", False, []], + ["Cover Me in Debris", False, [], ['Progressive Resource Crafting']], + ["Cover Me in Debris", False, [], ['Flint and Steel']], + ["Cover Me in Debris", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], + ["Cover Me in Debris", False, [], ['Progressive Weapons']], + ["Cover Me in Debris", False, ['Progressive Armor'], ['Progressive Armor']], + ["Cover Me in Debris", False, [], ['Brewing']], ["Cover Me in Debris", False, [], ['Bottles']], ["Cover Me in Debris", False, [], ['Bed']], ["Cover Me in Debris", False, ['8 Netherite Scrap'], ['8 Netherite Scrap']], - ["Cover Me in Debris", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', + ["Cover Me in Debris", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed', '8 Netherite Scrap', '8 Netherite Scrap']], ]) def test_42077(self): self.run_location_tests([ - ["The End?", False, []], - ["The End?", False, [], ['Progressive Resource Crafting']], - ["The End?", False, [], ['Flint and Steel']], - ["The End?", False, [], ['Progressive Tools']], - ["The End?", False, [], ['Progressive Weapons']], - ["The End?", False, [], ['Progressive Armor', 'Shield']], - ["The End?", False, [], ['Brewing']], - ["The End?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["The End?", False, []], + ["The End?", False, [], ['Progressive Resource Crafting']], + ["The End?", False, [], ['Flint and Steel']], + ["The End?", False, [], ['Progressive Tools']], + ["The End?", False, [], ['Progressive Weapons']], + ["The End?", False, [], ['Progressive Armor', 'Shield']], + ["The End?", False, [], ['Brewing']], + ["The End?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The End?", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', - 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', + 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -1096,40 +1097,40 @@ class TestAdvancements(TestMinecraft): def test_42088(self): self.run_location_tests([ - ["When Pigs Fly", False, []], - ["When Pigs Fly", False, [], ['Progressive Resource Crafting']], - ["When Pigs Fly", False, [], ['Progressive Tools']], - ["When Pigs Fly", False, [], ['Progressive Weapons']], - ["When Pigs Fly", False, [], ['Progressive Armor', 'Shield']], - ["When Pigs Fly", False, [], ['Fishing Rod']], - ["When Pigs Fly", False, [], ['Saddle']], - ["When Pigs Fly", False, ['Progressive Weapons'], ['Flint and Steel', 'Progressive Weapons', 'Progressive Weapons']], - ["When Pigs Fly", False, ['Progressive Tools', 'Progressive Tools', 'Progressive Weapons'], ['Bucket', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons']], - ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], + ["When Pigs Fly", False, []], + ["When Pigs Fly", False, [], ['Progressive Resource Crafting']], + ["When Pigs Fly", False, [], ['Progressive Tools']], + ["When Pigs Fly", False, [], ['Progressive Weapons']], + ["When Pigs Fly", False, [], ['Progressive Armor', 'Shield']], + ["When Pigs Fly", False, [], ['Fishing Rod']], + ["When Pigs Fly", False, [], ['Saddle']], + ["When Pigs Fly", False, ['Progressive Weapons'], ['Flint and Steel', 'Progressive Weapons', 'Progressive Weapons']], + ["When Pigs Fly", False, ['Progressive Tools', 'Progressive Tools', 'Progressive Weapons'], ['Bucket', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons']], + ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], - ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Fishing Rod']], + ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Fishing Rod']], ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Fishing Rod']], ["When Pigs Fly", True, ['Saddle', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Progressive Resource Crafting', 'Progressive Tools', 'Fishing Rod']], ]) def test_42089(self): self.run_location_tests([ - ["Overkill", False, []], - ["Overkill", False, [], ['Progressive Resource Crafting']], - ["Overkill", False, [], ['Flint and Steel']], - ["Overkill", False, [], ['Progressive Tools']], - ["Overkill", False, [], ['Progressive Weapons']], - ["Overkill", False, [], ['Progressive Armor', 'Shield']], - ["Overkill", False, [], ['Brewing']], + ["Overkill", False, []], + ["Overkill", False, [], ['Progressive Resource Crafting']], + ["Overkill", False, [], ['Flint and Steel']], + ["Overkill", False, [], ['Progressive Tools']], + ["Overkill", False, [], ['Progressive Weapons']], + ["Overkill", False, [], ['Progressive Armor', 'Shield']], + ["Overkill", False, [], ['Brewing']], ["Overkill", False, [], ['Bottles']], - ["Overkill", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Overkill", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], - ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], ]) @@ -1158,7 +1159,7 @@ class TestAdvancements(TestMinecraft): ["Wax On", False, []], ["Wax On", False, [], ["Progressive Tools"]], ["Wax On", False, [], ["Campfire"]], - ["Wax On", False, ["Progressive Resource Crafting"], ["Progressive Resource Crafting"]], + ["Wax On", False, ["Progressive Resource Crafting"], ["Progressive Resource Crafting"]], ["Wax On", True, ["Progressive Tools", "Progressive Resource Crafting", "Progressive Resource Crafting", "Campfire"]], ]) @@ -1167,7 +1168,7 @@ class TestAdvancements(TestMinecraft): ["Wax Off", False, []], ["Wax Off", False, [], ["Progressive Tools"]], ["Wax Off", False, [], ["Campfire"]], - ["Wax Off", False, ["Progressive Resource Crafting"], ["Progressive Resource Crafting"]], + ["Wax Off", False, ["Progressive Resource Crafting"], ["Progressive Resource Crafting"]], ["Wax Off", True, ["Progressive Tools", "Progressive Resource Crafting", "Progressive Resource Crafting", "Campfire"]], ]) @@ -1201,40 +1202,40 @@ class TestAdvancements(TestMinecraft): def test_42097(self): self.run_location_tests([ - ["Is It a Balloon?", False, []], - ["Is It a Balloon?", False, [], ['Progressive Resource Crafting']], - ["Is It a Balloon?", False, [], ['Flint and Steel']], - ["Is It a Balloon?", False, [], ['Progressive Tools']], + ["Is It a Balloon?", False, []], + ["Is It a Balloon?", False, [], ['Progressive Resource Crafting']], + ["Is It a Balloon?", False, [], ['Flint and Steel']], + ["Is It a Balloon?", False, [], ['Progressive Tools']], ["Is It a Balloon?", False, [], ['Progressive Weapons']], ["Is It a Balloon?", False, [], ['Spyglass']], - ["Is It a Balloon?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Is It a Balloon?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Spyglass']], + ["Is It a Balloon?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Is It a Balloon?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Spyglass']], ["Is It a Balloon?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Spyglass']], ]) def test_42098(self): self.run_location_tests([ - ["Is It a Plane?", False, []], - ["Is It a Plane?", False, [], ['Progressive Resource Crafting']], - ["Is It a Plane?", False, [], ['Flint and Steel']], - ["Is It a Plane?", False, [], ['Progressive Tools']], - ["Is It a Plane?", False, [], ['Progressive Weapons']], - ["Is It a Plane?", False, [], ['Progressive Armor', 'Shield']], - ["Is It a Plane?", False, [], ['Brewing']], - ["Is It a Plane?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], + ["Is It a Plane?", False, []], + ["Is It a Plane?", False, [], ['Progressive Resource Crafting']], + ["Is It a Plane?", False, [], ['Flint and Steel']], + ["Is It a Plane?", False, [], ['Progressive Tools']], + ["Is It a Plane?", False, [], ['Progressive Weapons']], + ["Is It a Plane?", False, [], ['Progressive Armor', 'Shield']], + ["Is It a Plane?", False, [], ['Brewing']], + ["Is It a Plane?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Is It a Plane?", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ["Is It a Plane?", False, [], ['Spyglass']], ["Is It a Plane?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', - '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Spyglass']], - ["Is It a Plane?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', 'Brewing', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', + '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Spyglass']], + ["Is It a Plane?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Spyglass']], ["Is It a Plane?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Brewing', - '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Spyglass']], - ["Is It a Plane?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', 'Brewing', + 'Progressive Weapons', 'Shield', 'Brewing', + '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Spyglass']], + ["Is It a Plane?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Spyglass']], ]) @@ -1246,7 +1247,7 @@ class TestAdvancements(TestMinecraft): ["Surge Protector", False, [], ['Enchanting']], ["Surge Protector", False, [], ['Progressive Tools']], ["Surge Protector", False, [], ['Progressive Weapons']], - ["Surge Protector", True, ['Progressive Weapons', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', + ["Surge Protector", True, ['Progressive Weapons', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Enchanting', 'Progressive Resource Crafting', 'Progressive Resource Crafting', 'Channeling Book']], ]) diff --git a/test/minecraft/TestEntrances.py b/worlds/minecraft/test/TestEntrances.py similarity index 99% rename from test/minecraft/TestEntrances.py rename to worlds/minecraft/test/TestEntrances.py index 460199fc..8e80a135 100644 --- a/test/minecraft/TestEntrances.py +++ b/worlds/minecraft/test/TestEntrances.py @@ -1,4 +1,5 @@ -from test.minecraft.TestMinecraft import TestMinecraft +from .TestMinecraft import TestMinecraft + class TestEntrances(TestMinecraft): diff --git a/test/minecraft/TestMinecraft.py b/worlds/minecraft/test/TestMinecraft.py similarity index 92% rename from test/minecraft/TestMinecraft.py rename to worlds/minecraft/test/TestMinecraft.py index cd87296c..dc5c81c0 100644 --- a/test/minecraft/TestMinecraft.py +++ b/worlds/minecraft/test/TestMinecraft.py @@ -1,11 +1,12 @@ -import worlds.minecraft.Options from test.TestBase import TestBase from BaseClasses import MultiWorld, ItemClassification from worlds import AutoWorld from worlds.minecraft import MinecraftWorld from worlds.minecraft.Items import MinecraftItem, item_table -from worlds.minecraft.Options import * -from Options import Toggle, Range +from Options import Toggle +from worlds.minecraft.Options import AdvancementGoal, EggShardsRequired, EggShardsAvailable, BossGoal, BeeTraps, \ + ShuffleStructures, CombatDifficulty + # Converts the name of an item into an item object def MCItemFactory(items, player: int): @@ -27,6 +28,7 @@ def MCItemFactory(items, player: int): return ret[0] return ret + class TestMinecraft(TestBase): def setUp(self): @@ -39,10 +41,10 @@ class TestMinecraft(TestBase): setattr(self.multiworld, "advancement_goal", {1: AdvancementGoal(30)}) setattr(self.multiworld, "egg_shards_required", {1: EggShardsRequired(0)}) setattr(self.multiworld, "egg_shards_available", {1: EggShardsAvailable(0)}) - setattr(self.multiworld, "required_bosses", {1: BossGoal(1)}) # ender dragon + setattr(self.multiworld, "required_bosses", {1: BossGoal(1)}) # ender dragon setattr(self.multiworld, "shuffle_structures", {1: ShuffleStructures(False)}) setattr(self.multiworld, "bee_traps", {1: BeeTraps(0)}) - setattr(self.multiworld, "combat_difficulty", {1: CombatDifficulty(1)}) # normal + setattr(self.multiworld, "combat_difficulty", {1: CombatDifficulty(1)}) # normal setattr(self.multiworld, "structure_compasses", {1: Toggle(False)}) setattr(self.multiworld, "death_link", {1: Toggle(False)}) AutoWorld.call_single(self.multiworld, "create_regions", 1) @@ -64,4 +66,3 @@ class TestMinecraft(TestBase): new_items.remove(missing_item) items = MCItemFactory(new_items, 1) return self.get_state(items) - diff --git a/test/vanilla/__init__.py b/worlds/minecraft/test/__init__.py similarity index 100% rename from test/vanilla/__init__.py rename to worlds/minecraft/test/__init__.py diff --git a/test/overcooked2/TestOvercooked2.py b/worlds/overcooked2/test/TestOvercooked2.py similarity index 99% rename from test/overcooked2/TestOvercooked2.py rename to worlds/overcooked2/test/TestOvercooked2.py index ec9efd1f..8f5ea9d4 100644 --- a/test/overcooked2/TestOvercooked2.py +++ b/worlds/overcooked2/test/TestOvercooked2.py @@ -1,5 +1,4 @@ import unittest -import json from random import Random diff --git a/worlds/overcooked2/test/__init__.py b/worlds/overcooked2/test/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/worlds/rogue_legacy/TestUnique.py b/worlds/rogue_legacy/test/TestUnique.py similarity index 100% rename from test/worlds/rogue_legacy/TestUnique.py rename to worlds/rogue_legacy/test/TestUnique.py diff --git a/test/worlds/rogue_legacy/__init__.py b/worlds/rogue_legacy/test/__init__.py similarity index 55% rename from test/worlds/rogue_legacy/__init__.py rename to worlds/rogue_legacy/test/__init__.py index 41ddcde1..2639e618 100644 --- a/test/worlds/rogue_legacy/__init__.py +++ b/worlds/rogue_legacy/test/__init__.py @@ -1,4 +1,4 @@ -from test.worlds.test_base import WorldTestBase +from test.TestBase import WorldTestBase class RLTestBase(WorldTestBase): diff --git a/test/worlds/soe/TestAccess.py b/worlds/soe/test/TestAccess.py similarity index 100% rename from test/worlds/soe/TestAccess.py rename to worlds/soe/test/TestAccess.py diff --git a/test/worlds/soe/TestGoal.py b/worlds/soe/test/TestGoal.py similarity index 100% rename from test/worlds/soe/TestGoal.py rename to worlds/soe/test/TestGoal.py diff --git a/test/worlds/soe/__init__.py b/worlds/soe/test/__init__.py similarity index 58% rename from test/worlds/soe/__init__.py rename to worlds/soe/test/__init__.py index c79544e0..3c2a0dc1 100644 --- a/test/worlds/soe/__init__.py +++ b/worlds/soe/test/__init__.py @@ -1,4 +1,4 @@ -from test.worlds.test_base import WorldTestBase +from test.TestBase import WorldTestBase class SoETestBase(WorldTestBase): diff --git a/test/worlds/zillion/TestGoal.py b/worlds/zillion/test/TestGoal.py similarity index 100% rename from test/worlds/zillion/TestGoal.py rename to worlds/zillion/test/TestGoal.py diff --git a/test/worlds/zillion/TestOptions.py b/worlds/zillion/test/TestOptions.py similarity index 95% rename from test/worlds/zillion/TestOptions.py rename to worlds/zillion/test/TestOptions.py index b00c70f7..1ec186da 100644 --- a/test/worlds/zillion/TestOptions.py +++ b/worlds/zillion/test/TestOptions.py @@ -1,4 +1,4 @@ -from test.worlds.zillion import ZillionTestBase +from . import ZillionTestBase from worlds.zillion.options import ZillionJumpLevels, ZillionGunLevels, validate from zilliandomizer.options import VBLR_CHOICES diff --git a/test/worlds/zillion/TestReproducibleRandom.py b/worlds/zillion/test/TestReproducibleRandom.py similarity index 94% rename from test/worlds/zillion/TestReproducibleRandom.py rename to worlds/zillion/test/TestReproducibleRandom.py index 707f2635..392db657 100644 --- a/test/worlds/zillion/TestReproducibleRandom.py +++ b/worlds/zillion/test/TestReproducibleRandom.py @@ -1,5 +1,5 @@ from typing import cast -from test.worlds.zillion import ZillionTestBase +from . import ZillionTestBase from worlds.zillion import ZillionWorld diff --git a/test/worlds/zillion/__init__.py b/worlds/zillion/test/__init__.py similarity index 93% rename from test/worlds/zillion/__init__.py rename to worlds/zillion/test/__init__.py index 1b3c2b42..3b7edebe 100644 --- a/test/worlds/zillion/__init__.py +++ b/worlds/zillion/test/__init__.py @@ -1,5 +1,5 @@ from typing import cast -from test.worlds.test_base import WorldTestBase +from test.TestBase import WorldTestBase from worlds.zillion import ZillionWorld