GT filler and smith locations fixes

GT now pre-fills with junk if it's in the vanilla location regardless of the state of the shuffleganon flag.

The smith is now allowed to be in multi-entrance cave locations in the appropriate shuffles. A duplicate Old Man Cave (West) from bomb shop multis was also removed.
This commit is contained in:
AmazingAmpharos
2018-02-24 22:42:18 -06:00
committed by GitHub
parent f3e5e5faa5
commit caffd7e34c
4 changed files with 20 additions and 17 deletions

View File

@@ -207,7 +207,7 @@ def distribute_items_restrictive(world, gftower_trash_count=0, fill_locations=No
restitempool = [item for item in world.itempool if not item.advancement and not item.priority]
# fill in gtower locations with trash first
if not world.shuffle_ganon:
if world.ganonstower_vanilla:
gtower_locations = [location for location in fill_locations if 'Ganons Tower' in location.name]
random.shuffle(gtower_locations)
trashcnt = 0