Skip to content

Commit 7878553

Browse files
alwaysintrebleFlySniper
authored andcommitted
The Messenger: Fix items accessibility region rule (ArchipelagoMW#2263)
1 parent b3cb9b2 commit 7878553

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

worlds/messenger/Rules.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -263,5 +263,6 @@ def set_self_locking_items(multiworld: MultiWorld, player: int) -> None:
263263
allow_self_locking_items(multiworld.get_location("Elemental Skylands Seal - Water", player), "Currents Master")
264264
# add these locations when seals and shards aren't shuffled
265265
elif not multiworld.shuffle_shards[player]:
266-
allow_self_locking_items(multiworld.get_region("Cloud Ruins Right", player), "Ruxxtin's Amulet")
266+
for entrance in multiworld.get_region("Cloud Ruins", player).entrances:
267+
entrance.access_rule = lambda state: state.has("Wingsuit", player) or state.has("Rope Dart", player)
267268
allow_self_locking_items(multiworld.get_region("Forlorn Temple", player), *PHOBEKINS)

worlds/messenger/test/TestAccess.py

+2
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ def testSelfLockingItems(self) -> None:
163163
"Forlorn Temple - Demon King": PHOBEKINS
164164
}
165165

166+
self.multiworld.state = self.multiworld.get_all_state(True)
167+
self.remove_by_name(location_lock_pairs.values())
166168
for loc in location_lock_pairs:
167169
for item_name in location_lock_pairs[loc]:
168170
item = self.get_item_by_name(item_name)

0 commit comments

Comments
 (0)