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

Main: Fill: more opportunities for swapping

This commit is contained in:
black-sliver 2022-10-16 14:32:13 +02:00
parent f7fc6fa7aa
commit acf7fda26a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Fill.py
View File

@ -82,13 +82,14 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
location.item = None location.item = None
placed_item.location = None placed_item.location = None
swap_state = sweep_from_pool(base_state) swap_state = sweep_from_pool(base_state, [placed_item])
# swap_state assumes we can collect placed item before item_to_place
if (not single_player_placement or location.player == item_to_place.player) \ if (not single_player_placement or location.player == item_to_place.player) \
and location.can_fill(swap_state, item_to_place, perform_access_check): and location.can_fill(swap_state, item_to_place, perform_access_check):
# Verify that placing this item won't reduce available locations # Verify that placing this item won't reduce available locations, which could happen with rules
# that want to not have both items. Left in until removal is proven useful.
prev_state = swap_state.copy() prev_state = swap_state.copy()
prev_state.collect(placed_item)
prev_loc_count = len( prev_loc_count = len(
world.get_reachable_locations(prev_state)) world.get_reachable_locations(prev_state))