Skip to content

Commit

Permalink
change game name to 'Outer Wilds (Logic Options Experiment)' so this …
Browse files Browse the repository at this point in the history
…can be maintained in parallel for a while
  • Loading branch information
Ixrec committed Feb 24, 2025
1 parent 9e9f14e commit 1eff676
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion test/benchmark/locations.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def location_test(self, test_location: Location, state: CollectionState, state_n

def main(self):
for game in sorted(AutoWorld.AutoWorldRegister.world_types):
if game != "Outer Wilds":
if game != "Outer Wilds (Logic Options Experiment)":
continue
summary_data: typing.Dict[str, collections.Counter[str]] = {
"empty_state": collections.Counter(),
Expand Down
14 changes: 7 additions & 7 deletions test/general/test_ids.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class TestIDs(unittest.TestCase):
def test_range_items(self):
"""There are Javascript clients, which are limited to Number.MAX_SAFE_INTEGER due to 64bit float precision."""
for gamename, world_type in AutoWorldRegister.world_types.items():
if gamename != "Outer Wilds":
if gamename != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game=gamename):
for item_id in world_type.item_id_to_name:
Expand All @@ -19,7 +19,7 @@ def test_range_items(self):
def test_range_locations(self):
"""There are Javascript clients, which are limited to Number.MAX_SAFE_INTEGER due to 64bit float precision."""
for gamename, world_type in AutoWorldRegister.world_types.items():
if gamename != "Outer Wilds":
if gamename != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game=gamename):
for location_id in world_type.location_id_to_name:
Expand All @@ -28,7 +28,7 @@ def test_range_locations(self):
def test_reserved_items(self):
"""negative item IDs are reserved to the special "Archipelago" world."""
for gamename, world_type in AutoWorldRegister.world_types.items():
if gamename != "Outer Wilds":
if gamename != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game=gamename):
if gamename == "Archipelago":
Expand All @@ -41,7 +41,7 @@ def test_reserved_items(self):
def test_reserved_locations(self):
"""negative location IDs are reserved to the special "Archipelago" world."""
for gamename, world_type in AutoWorldRegister.world_types.items():
if gamename != "Outer Wilds":
if gamename != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game=gamename):
if gamename == "Archipelago":
Expand All @@ -54,23 +54,23 @@ def test_reserved_locations(self):
def test_duplicate_item_ids(self):
"""Test that a game doesn't have item id overlap within its own datapackage"""
for gamename, world_type in AutoWorldRegister.world_types.items():
if gamename != "Outer Wilds":
if gamename != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game=gamename):
self.assertEqual(len(world_type.item_id_to_name), len(world_type.item_name_to_id))

def test_duplicate_location_ids(self):
"""Test that a game doesn't have location id overlap within its own datapackage"""
for gamename, world_type in AutoWorldRegister.world_types.items():
if gamename != "Outer Wilds":
if gamename != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game=gamename):
self.assertEqual(len(world_type.location_id_to_name), len(world_type.location_name_to_id))

def test_postgen_datapackage(self):
"""Generates a solo multiworld and checks that the datapackage is still valid"""
for gamename, world_type in AutoWorldRegister.world_types.items():
if gamename != "Outer Wilds":
if gamename != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game=gamename):
multiworld = setup_solo_multiworld(world_type)
Expand Down
8 changes: 4 additions & 4 deletions test/general/test_implemented.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class TestImplemented(unittest.TestCase):
def test_completion_condition(self):
"""Ensure a completion condition is set that has requirements."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
if not world_type.hidden and game_name not in {"Sudoku"}:
with self.subTest(game_name):
Expand All @@ -21,7 +21,7 @@ def test_completion_condition(self):
def test_entrance_parents(self):
"""Tests that the parents of created Entrances match the exiting Region."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
if not world_type.hidden:
with self.subTest(game_name):
Expand All @@ -33,7 +33,7 @@ def test_entrance_parents(self):
def test_stage_methods(self):
"""Tests that worlds don't try to implement certain steps that are only ever called as stage."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
if not world_type.hidden:
with self.subTest(game_name):
Expand All @@ -44,7 +44,7 @@ def test_stage_methods(self):
def test_slot_data(self):
"""Tests that if a world creates slot data, it's json serializable."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
# has an await for generate_output which isn't being called
if game_name in {"Ocarina of Time", "Zillion"}:
Expand Down
12 changes: 6 additions & 6 deletions test/general/test_items.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class TestBase(unittest.TestCase):
def test_create_item(self):
"""Test that a world can successfully create all items in its datapackage"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
proxy_world = setup_solo_multiworld(world_type, ()).worlds[1]
for item_name in world_type.item_name_to_id:
Expand All @@ -31,7 +31,7 @@ def test_item_name_group_has_valid_item(self):
{"Campaign Boss Beaten"}
}
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game_name, game_name=game_name):
exclusions = exclusion_dict.get(game_name, frozenset())
Expand All @@ -44,7 +44,7 @@ def test_item_name_group_has_valid_item(self):
def test_item_name_group_conflict(self):
"""Test that all item name groups aren't also item names."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game_name, game_name=game_name):
for group_name in world_type.item_name_groups:
Expand All @@ -54,7 +54,7 @@ def test_item_name_group_conflict(self):
def test_item_count_equal_locations(self):
"""Test that by the pre_fill step under default settings, each game submits items == locations"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest("Game", game=game_name):
multiworld = setup_solo_multiworld(world_type)
Expand All @@ -67,7 +67,7 @@ def test_item_count_equal_locations(self):
def test_items_in_datapackage(self):
"""Test that any created items in the itempool are in the datapackage"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest("Game", game=game_name):
multiworld = setup_solo_multiworld(world_type)
Expand All @@ -82,7 +82,7 @@ def test_itempool_not_modified(self):
worlds_to_test = {game: world
for game, world in AutoWorldRegister.world_types.items() if game not in excluded_games}
for game_name, world_type in worlds_to_test.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest("Game", game=game_name):
multiworld = setup_solo_multiworld(world_type, gen_steps)
Expand Down
8 changes: 4 additions & 4 deletions test/general/test_locations.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class TestBase(unittest.TestCase):
def test_create_duplicate_locations(self):
"""Tests that no two Locations share a name or ID."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
multiworld = setup_solo_multiworld(world_type)
locations = Counter(location.name for location in multiworld.get_locations())
Expand All @@ -25,7 +25,7 @@ def test_create_duplicate_locations(self):
def test_locations_in_datapackage(self):
"""Tests that created locations not filled before fill starts exist in the datapackage."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest("Game", game_name=game_name):
multiworld = setup_solo_multiworld(world_type)
Expand All @@ -38,7 +38,7 @@ def test_location_creation_steps(self):
"""Tests that Regions and Locations aren't created after `create_items`."""
gen_steps = ("generate_early", "create_regions", "create_items")
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest("Game", game_name=game_name):
multiworld = setup_solo_multiworld(world_type, gen_steps)
Expand Down Expand Up @@ -66,7 +66,7 @@ def test_location_creation_steps(self):
def test_location_group(self):
"""Test that all location name groups contain valid locations and don't share names."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest(game_name, game_name=game_name):
for group_name, locations in world_type.location_name_groups.items():
Expand Down
2 changes: 1 addition & 1 deletion test/general/test_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def test_leak(self):
import gc
import weakref
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest("Game", game_name=game_name):
weak = weakref.ref(setup_solo_multiworld(world_type))
Expand Down
4 changes: 2 additions & 2 deletions test/general/test_reachability.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class TestBase(unittest.TestCase):
def test_default_all_state_can_reach_everything(self):
"""Ensure all state can reach everything and complete the game with the defined options"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
unreachable_regions = self.default_settings_unreachable_regions.get(game_name, set())
with self.subTest("Game", game=game_name):
Expand All @@ -60,7 +60,7 @@ def test_default_all_state_can_reach_everything(self):
def test_default_empty_state_can_reach_something(self):
"""Ensure empty state can reach at least one location with the defined options"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
with self.subTest("Game", game=game_name):
multiworld = setup_solo_multiworld(world_type)
Expand Down
4 changes: 2 additions & 2 deletions test/multiworld/test_multiworlds.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def assertSteps(self, steps: Tuple[str, ...]) -> None:
class TestAllGamesMultiworld(MultiworldTestBase):
def test_fills(self) -> None:
"""Tests that a multiworld with one of every registered game world can generate."""
all_worlds = list(w for w in AutoWorldRegister.world_types.values() if w.game == "Outer Wilds")
all_worlds = list(w for w in AutoWorldRegister.world_types.values() if w.game == "Outer Wilds (Logic Options Experiment)")
self.multiworld = setup_multiworld(all_worlds, ())
for world in self.multiworld.worlds.values():
world.options.accessibility.value = Accessibility.option_full
Expand All @@ -66,7 +66,7 @@ class TestTwoPlayerMulti(MultiworldTestBase):
def test_two_player_single_game_fills(self) -> None:
"""Tests that a multiworld of two players for each registered game world can generate."""
for world_type in AutoWorldRegister.world_types.values():
if world_type.game != "Outer Wilds":
if world_type.game != "Outer Wilds (Logic Options Experiment)":
continue
self.multiworld = setup_multiworld([world_type, world_type], ())
for world in self.multiworld.worlds.values():
Expand Down
4 changes: 2 additions & 2 deletions test/webhost/test_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class TestWebDescriptions(unittest.TestCase):
def test_item_descriptions_have_valid_names(self) -> None:
"""Ensure all item descriptions match an item name or item group name"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
valid_names = world_type.item_names.union(world_type.item_name_groups)
for name in world_type.web.item_descriptions:
Expand All @@ -18,7 +18,7 @@ def test_item_descriptions_have_valid_names(self) -> None:
def test_location_descriptions_have_valid_names(self) -> None:
"""Ensure all location descriptions match a location name or location group name"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
valid_names = world_type.location_names.union(world_type.location_name_groups)
for name in world_type.web.location_descriptions:
Expand Down
2 changes: 1 addition & 1 deletion test/webhost/test_file_generation.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_options(self):
from WebHostLib.check import roll_options
file: os.DirEntry
for file in os.scandir(target):
if file.is_file() and file.name.endswith(".yaml") and file.name.startswith("Outer Wilds"):
if file.is_file() and file.name.endswith(".yaml") and file.name.startswith("Outer Wilds (Logic Options Experiment)"):
with self.subTest(file=file.name):
with open(file, encoding="utf-8-sig") as f:
for value in roll_options({file.name: f.read()})[0].values():
Expand Down
4 changes: 2 additions & 2 deletions test/webhost/test_option_presets.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class TestOptionPresets(unittest.TestCase):
def test_option_presets_have_valid_options(self):
"""Test that all predefined option presets are valid options."""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
presets = world_type.web.options_presets
for preset_name, preset in presets.items():
Expand All @@ -33,7 +33,7 @@ def test_option_preset_values_are_explicitly_defined(self):
value.
"""
for game_name, world_type in AutoWorldRegister.world_types.items():
if game_name != "Outer Wilds":
if game_name != "Outer Wilds (Logic Options Experiment)":
continue
presets = world_type.web.options_presets
for preset_name, preset in presets.items():
Expand Down
2 changes: 1 addition & 1 deletion test/worlds/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def load_tests(loader, standard_tests, pattern):
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() if world.game == "Outer Wilds"]
for world in AutoWorldRegister.world_types.values() if world.game == "Outer Wilds (Logic Options Experiment)"]

all_tests = [
test_case for folder in folders if os.path.exists(folder)
Expand Down
6 changes: 3 additions & 3 deletions worlds/outer_wilds/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class OuterWildsWebWorld(WebWorld):


class OuterWildsWorld(World):
game = "Outer Wilds"
game = "Outer Wilds (Logic Options Experiment)"
web = OuterWildsWebWorld()

eotu_coordinates = 'vanilla'
Expand Down Expand Up @@ -78,8 +78,8 @@ def generate_early(self) -> None:
# implement Universal Tracker support
if hasattr(self.multiworld, "generation_is_fake"):
if hasattr(self.multiworld, "re_gen_passthrough"):
if "Outer Wilds" in self.multiworld.re_gen_passthrough:
slot_data = self.multiworld.re_gen_passthrough["Outer Wilds"]
if "Outer Wilds (Logic Options Experiment)" in self.multiworld.re_gen_passthrough:
slot_data = self.multiworld.re_gen_passthrough["Outer Wilds (Logic Options Experiment)"]
self.warps = slot_data["warps"]
self.spawn = slot_data["spawn"]
return
Expand Down
2 changes: 1 addition & 1 deletion worlds/outer_wilds/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class OuterWildsItem(Item):
game = "Outer Wilds"
game = "Outer Wilds (Logic Options Experiment)"


class OuterWildsItemData(NamedTuple):
Expand Down
2 changes: 1 addition & 1 deletion worlds/outer_wilds/locations_and_regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


class OuterWildsLocation(Location):
game = "Outer Wilds"
game = "Outer Wilds (Logic Options Experiment)"


class OuterWildsLocationData(NamedTuple):
Expand Down
2 changes: 1 addition & 1 deletion worlds/outer_wilds/test/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


class OuterWildsTestBase(WorldTestBase):
game = "Outer Wilds"
game = "Outer Wilds (Logic Options Experiment)"
player: int = 1

def makeStateWith(self, item_names: List[str]) -> CollectionState:
Expand Down

0 comments on commit 1eff676

Please sign in to comment.