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

Fix beatable-only prizes and dungeon items in multiworld

Browse Source
This commit is contained in:
Bonta-kun
2019-12-11 11:37:05 +01:00
parent abfb57af23
commit 6d50e905e1
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Fill.py
View File

@@ -161,7 +161,7 @@ def distribute_items_staleness(world):
logging.getLogger('').debug('Unplaced items: %s - Unfilled Locations: %s', [item.name for item in itempool], [location.name for location in fill_locations])
def fill_restrictive(world, base_state, locations, itempool):
def fill_restrictive(world, base_state, locations, itempool, single_player = False):
def sweep_from_pool():
new_state = base_state.copy()
for item in itempool:
@@ -184,12 +184,17 @@ def fill_restrictive(world, base_state, locations, itempool):
maximum_exploration_state = sweep_from_pool()
perform_access_check = True
if world.accessibility == 'none':
if world.accessibility == 'none' and not single_player:
perform_access_check = not world.has_beaten_game(maximum_exploration_state)
for item_to_place in items_to_place:
spot_to_fill = None
for location in locations:
if single_player:
if location.player != item_to_place.player:
continue
if world.accessibility == 'none':
perform_access_check = not world.has_beaten_game(maximum_exploration_state, location.player)
if location.can_fill(maximum_exploration_state, item_to_place, perform_access_check):
spot_to_fill = location
break