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

Merge branch 'main' into multishop

Browse Source
This commit is contained in:
CaitSith2
2021-01-13 10:40:52 -08:00
parent 67731d9e53 7bb115de72
commit 082a7b7e41
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Fill.py
View File

@@ -20,6 +20,7 @@ def fill_restrictive(world, base_state: CollectionState, locations, itempool, si
return new_state return new_state
unplaced_items = [] unplaced_items = []
placements = []
no_access_checks = {} no_access_checks = {}
reachable_items = {} reachable_items = {}
@@ -53,11 +54,6 @@ def fill_restrictive(world, base_state: CollectionState, locations, itempool, si
logging.warning( logging.warning(
f'Not all items placed. Game beatable anyway. (Could not place {item_to_place})') f'Not all items placed. Game beatable anyway. (Could not place {item_to_place})')
continue continue
placements = []
for region in world.regions:
for location in region.locations:
if location.item and not location.event:
placements.append(location)
# fill in name of world for item # fill in name of world for item
item_to_place.world = world item_to_place.world = world
raise FillError(f'No more spots to place {item_to_place}, locations {locations} are invalid. ' raise FillError(f'No more spots to place {item_to_place}, locations {locations} are invalid. '
@@ -67,6 +63,7 @@ def fill_restrictive(world, base_state: CollectionState, locations, itempool, si
if lock: if lock:
spot_to_fill.locked = True spot_to_fill.locked = True
locations.remove(spot_to_fill) locations.remove(spot_to_fill)
placements.append(spot_to_fill)
spot_to_fill.event = True spot_to_fill.event = True
itempool.extend(unplaced_items) itempool.extend(unplaced_items)