alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fixed problem with keyshuffle option without bigkeyshuffle - attmept 2

Browse Source
This commit is contained in:
aerinon
2020-03-07 09:29:32 -07:00
parent b0eb7fb85d
commit 2b8044d89d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fill.py
View File

@@ -225,7 +225,7 @@ def fill_restrictive(world, base_state, locations, itempool, single_player_place
itempool.extend(unplaced_items) itempool.extend(unplaced_items)
def valid_key_placement(item, location, itempool, world): def valid_key_placement(item, location, itempool, world):
if (not item.smallkey and not item.bigkey) or item.player != location.player or world.retro[item.player]: if (not item.smallkey and not item.bigkey) or item.player != location.player or world.retro[item.player]:
return True return True
dungeon = location.parent_region.dungeon dungeon = location.parent_region.dungeon
@@ -233,7 +233,7 @@ def valid_key_placement(item, location, itempool, world):
if dungeon.name not in item.name and (dungeon.name != 'Hyrule Castle' or 'Escape' not in item.name): if dungeon.name not in item.name and (dungeon.name != 'Hyrule Castle' or 'Escape' not in item.name):
return True return True
key_logic = world.key_logic[item.player][dungeon.name] key_logic = world.key_logic[item.player][dungeon.name]
unplaced_keys = len([x for x in world.itempool if x.name == key_logic.small_key_name and x.player == item.player]) unplaced_keys = len([x for x in itempool+world.itempool if x.name == key_logic.small_key_name and x.player == item.player])
return key_logic.check_placement(unplaced_keys) return key_logic.check_placement(unplaced_keys)
else: else:
inside_dungeon_item = ((item.smallkey and not world.keyshuffle[item.player]) inside_dungeon_item = ((item.smallkey and not world.keyshuffle[item.player])