monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LttP: fix Ganon's Tower trash prefill ignoring item_rules (#648)

This commit is contained in:
Fabian Dill 2022-06-17 03:24:15 +02:00 committed by GitHub
parent 6c525e1fe6
commit 05a51346f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worlds/alttp/__init__.py
View File

@ -472,13 +472,14 @@ class ALTTPWorld(World):
while gtower_locations and gt_item_pool and trash_count > 0: while gtower_locations and gt_item_pool and trash_count > 0:
spot_to_fill = gtower_locations.pop() spot_to_fill = gtower_locations.pop()
item_to_place = gt_item_pool.pop() item_to_place = gt_item_pool.pop()
if item_to_place in localrest: if spot_to_fill.item_rule(item_to_place):
localrest.remove(item_to_place) if item_to_place in localrest:
else: localrest.remove(item_to_place)
restitempool.remove(item_to_place) else:
world.push_item(spot_to_fill, item_to_place, False) restitempool.remove(item_to_place)
fill_locations.remove(spot_to_fill) # very slow, unfortunately world.push_item(spot_to_fill, item_to_place, False)
trash_count -= 1 fill_locations.remove(spot_to_fill) # very slow, unfortunately
trash_count -= 1
def get_filler_item_name(self) -> str: def get_filler_item_name(self) -> str: