morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Process swaped items last

Browse Source
This commit is contained in:
Brad Humphrey
2021-12-21 22:55:10 -07:00
committed by Fabian Dill
parent dc82b384c5
commit e5fedb90a6
2 changed files with 163 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Fill.py
View File

@@ -2,7 +2,7 @@ import logging
import typing
import collections
import itertools
from collections import Counter
from collections import Counter, deque
from BaseClasses import CollectionState, Location, MultiWorld, Item
@@ -14,7 +14,7 @@ class FillError(RuntimeError):
pass
def sweep_from_pool(base_state: CollectionState, itempool: list[Item]):
def sweep_from_pool(base_state: CollectionState, itempool):
new_state = base_state.copy()
for item in itempool:
new_state.collect(item, True)
@@ -28,9 +28,9 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations,
placements = []
swapped_items = Counter()
reachable_items = {}
reachable_items: dict[str, deque] = {}
for item in itempool:
reachable_items.setdefault(item.player, []).append(item)
reachable_items.setdefault(item.player, deque()).append(item)
while any(reachable_items.values()) and locations:
# grab one item per player
@@ -75,8 +75,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations,
# add the old item to the back of the queue
spot_to_fill = placements.pop(i)
swapped_items[placed_item.player, placed_item.name] += 1
reachable_items.setdefault(
placed_item.player, []).append(placed_item)
reachable_items[placed_item.player].appendleft(placed_item)
itempool.append(placed_item)
break
else: