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

Include player information in swapped item count

This commit is contained in:
Brad Humphrey 2021-12-20 18:20:01 -07:00 committed by Fabian Dill
parent d719eb356f
commit 2f56e40fb7
1 changed files with 3 additions and 3 deletions

6
Fill.py
View File

@ -27,7 +27,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations,
unplaced_items = []
placements = []
swapped_items: Counter[Item] = Counter()
swapped_items = Counter()
reachable_items = {}
for item in itempool:
reachable_items.setdefault(item.player, []).append(item)
@ -62,7 +62,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations,
# try swaping this item with previously placed items
for(i, location) in enumerate(placements):
placed_item = location.item
if swapped_items[placed_item.name] > 0:
if swapped_items[placed_item.player, placed_item.name] > 0:
continue
location.item = None
placed_item.location = None
@ -72,7 +72,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations,
# Add this item to the exisiting placement, and
# add the old item to the back of the queue
spot_to_fill = placements.pop(i)
swapped_items[placed_item.name] += 1
swapped_items[placed_item.player, placed_item.name] += 1
reachable_items.setdefault(
placed_item.player, []).append(placed_item)
itempool.append(placed_item)