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

Allow fill_hook to remove things from the pool

Browse Source
This commit is contained in:
Brad Humphrey
2022-01-21 20:34:59 -07:00
committed by Fabian Dill
parent 102c1fecb6
commit 00ccecac9c
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Fill.py
View File

@@ -110,16 +110,6 @@ def distribute_items_restrictive(world: MultiWorld, fill_locations=None):
world.random.shuffle(fill_locations)
locations: dict[LocationProgressType, list[Location]] = {
type: [] for type in LocationProgressType}
for loc in fill_locations:
locations[loc.progress_type].append(loc)
prioritylocations = locations[LocationProgressType.PRIORITY]
defaultlocations = locations[LocationProgressType.DEFAULT]
excludedlocations = locations[LocationProgressType.EXCLUDED]
# get items to distribute
world.random.shuffle(world.itempool)
progitempool = []
@@ -143,6 +133,18 @@ def distribute_items_restrictive(world: MultiWorld, fill_locations=None):
call_all(world, "fill_hook", progitempool, nonexcludeditempool,
localrestitempool, nonlocalrestitempool, restitempool, fill_locations)
locations: dict[LocationProgressType, list[Location]] = {
type: [] for type in LocationProgressType}
for loc in fill_locations:
locations[loc.progress_type].append(loc)
logging.warning("Locations: " + str(len(fill_locations)))
logging.warning("Items: " + str(len(world.itempool)))
prioritylocations = locations[LocationProgressType.PRIORITY]
defaultlocations = locations[LocationProgressType.DEFAULT]
excludedlocations = locations[LocationProgressType.EXCLUDED]
locationDeficit = len(progitempool) - len(prioritylocations)
if locationDeficit > 0:
if locationDeficit > len(defaultlocations):
@@ -157,6 +159,9 @@ def distribute_items_restrictive(world: MultiWorld, fill_locations=None):
if progitempool:
fill_restrictive(world, world.state, defaultlocations, progitempool)
if(len(progitempool) > 0):
raise FillError(
f'Not enough locations for progress items. There are {len(progitempool)} more items than locations')
if nonexcludeditempool:
world.random.shuffle(defaultlocations)