monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Require excluded locations to be reachable with full/locations accessibility (#3802) 

* Make excludeds reachable

* Update all_state tests
This commit is contained in:
Exempt-Medic 2024-08-16 14:49:37 -04:00 committed by GitHub
parent 56aabe51b8
commit 06df072095
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseClasses.py
View File

@ -616,8 +616,7 @@ class MultiWorld():
def location_relevant(location: Location) -> bool: def location_relevant(location: Location) -> bool:
"""Determine if this location is relevant to sweep.""" """Determine if this location is relevant to sweep."""
return location.progress_type != LocationProgressType.EXCLUDED \ return location.player in players["full"] or location.advancement
and (location.player in players["full"] or location.advancement)
def all_done() -> bool: def all_done() -> bool:
"""Check if all access rules are fulfilled""" """Check if all access rules are fulfilled"""

8
test/bases.py
View File

@ -293,13 +293,11 @@ class WorldTestBase(unittest.TestCase):
if not (self.run_default_tests and self.constructed): if not (self.run_default_tests and self.constructed):
return return
with self.subTest("Game", game=self.game, seed=self.multiworld.seed): with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
excluded = self.multiworld.worlds[self.player].options.exclude_locations.value
state = self.multiworld.get_all_state(False) state = self.multiworld.get_all_state(False)
for location in self.multiworld.get_locations(): for location in self.multiworld.get_locations():
if location.name not in excluded: with self.subTest("Location should be reached", location=location.name):
with self.subTest("Location should be reached", location=location.name): reachable = location.can_reach(state)
reachable = location.can_reach(state) self.assertTrue(reachable, f"{location.name} unreachable")
self.assertTrue(reachable, f"{location.name} unreachable")
with self.subTest("Beatable"): with self.subTest("Beatable"):
self.multiworld.state = state self.multiworld.state = state
self.assertBeatable(True) self.assertBeatable(True)

6
test/general/test_reachability.py
View File

@ -37,12 +37,10 @@ class TestBase(unittest.TestCase):
unreachable_regions = self.default_settings_unreachable_regions.get(game_name, set()) unreachable_regions = self.default_settings_unreachable_regions.get(game_name, set())
with self.subTest("Game", game=game_name): with self.subTest("Game", game=game_name):
multiworld = setup_solo_multiworld(world_type) multiworld = setup_solo_multiworld(world_type)
excluded = multiworld.worlds[1].options.exclude_locations.value
state = multiworld.get_all_state(False) state = multiworld.get_all_state(False)
for location in multiworld.get_locations(): for location in multiworld.get_locations():
if location.name not in excluded: with self.subTest("Location should be reached", location=location.name):
with self.subTest("Location should be reached", location=location.name): self.assertTrue(location.can_reach(state), f"{location.name} unreachable")
self.assertTrue(location.can_reach(state), f"{location.name} unreachable")
for region in multiworld.get_regions(): for region in multiworld.get_regions():
if region.name in unreachable_regions: if region.name in unreachable_regions: