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

GT filler and smith locations fixes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

32
EntranceShuffle.py
View File

@@ -1034,6 +1034,10 @@ def link_entrances(world):
if world.get_entrance('Pyramid Hole').connected_region.name != 'Pyramid':
world.ganon_at_pyramid = False
# check for Ganon's Tower location
if world.get_entrance('Ganons Tower').connected_region.name != 'Ganons Tower (Entrance)':
world.ganonstower_vanilla = False
def connect_simple(world, exitname, regionname):
world.get_entrance(exitname).connect(world.get_region(regionname))
@@ -1424,24 +1428,22 @@ Bomb_Shop_Multi_Cave_Doors = ['Hyrule Castle Entrance (South)',
'Hyrule Castle Entrance (East)',
'Agahnims Tower',
'Desert Palace Entrance (West)',
'Desert Palace Entrance (North)',
'Old Man Cave (West)',
'Desert Palace Entrance (North)'
# all entrances below this line would be possible for blacksmith_hut
# if it were not for dwarf checking multi-entrance caves
'Eastern Palace',
'Elder House (East)',
'Elder House (West)',
'Two Brothers House (East)',
'Old Man Cave (West)',
'Sanctuary',
'Lumberjack Tree Cave',
'Lost Woods Hideout Stump',
'North Fairy Cave',
'Bat Cave Cave',
'Kakariko Well Cave']
]
#unfortunately blacksmith cannot occur in multi entrance caves, because the dwarf would refuse to enter.
Blacksmith_Multi_Cave_Doors = []
Blacksmith_Multi_Cave_Doors = ['Eastern Palace',
'Elder House (East)',
'Elder House (West)',
'Two Brothers House (East)',
'Old Man Cave (West)',
'Sanctuary',
'Lumberjack Tree Cave',
'Lost Woods Hideout Stump',
'North Fairy Cave',
'Bat Cave Cave',
'Kakariko Well Cave']
LW_Single_Cave_Doors = ['Blinds Hideout',
'Lake Hylia Fairy',