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

Individual settings: accessibility

Browse Source
This commit is contained in:
Bonta-kun
2019-12-17 12:14:29 +01:00
parent 642bf65843
commit d9281adc07
5 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Fill.py
View File

@@ -179,14 +179,12 @@ def fill_restrictive(world, base_state, locations, itempool, single_player_place
items_to_place = [[itempool.remove(items[-1]), items.pop()][-1] for items in player_items.values() if items]
maximum_exploration_state = sweep_from_pool()
perform_access_check = True
if world.accessibility == 'none' and not single_player_placement:
perform_access_check = not world.has_beaten_game(maximum_exploration_state)
has_beaten_game = world.has_beaten_game(maximum_exploration_state)
for item_to_place in items_to_place:
if single_player_placement and world.accessibility == 'none':
perform_access_check = not world.has_beaten_game(maximum_exploration_state, item_to_place.player)
perform_access_check = True
if world.accessibility[item_to_place.player] == 'none':
perform_access_check = not world.has_beaten_game(maximum_exploration_state, item_to_place.player) if single_player_placement else not has_beaten_game
spot_to_fill = None
for location in locations:
@@ -199,7 +197,7 @@ def fill_restrictive(world, base_state, locations, itempool, single_player_place
# we filled all reachable spots. Maybe the game can be beaten anyway?
unplaced_items.insert(0, item_to_place)
if world.can_beat_game():
if world.accessibility != 'none':
if world.accessibility[item_to_place.player] != 'none':
logging.getLogger('').warning('Not all items placed. Game beatable anyway. (Could not place %s)' % item_to_place)
continue
raise FillError('No more spots to place %s' % item_to_place)