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

Fix bug with Swamp hint and remove some debug code

This commit is contained in:
AmazingAmpharos 2019-02-21 00:22:46 -06:00 committed by GitHub
parent 25976e9f44
commit 6294d5f831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EntranceShuffle.py
View File

@ -288,9 +288,8 @@ def link_entrances(world):
try: try:
caves.remove(old_man_house[0]) caves.remove(old_man_house[0])
except ValueError: except ValueError:
print("Old man at desert") pass
else: #if the cave wasn't placed we get here else: #if the cave wasn't placed we get here
print("Normal Old Man")
connect_caves(world, lw_entrances, [], old_man_house) connect_caves(world, lw_entrances, [], old_man_house)
connect_mandatory_exits(world, dw_entrances, caves, dw_must_exits) connect_mandatory_exits(world, dw_entrances, caves, dw_must_exits)
else: else:
@ -300,9 +299,8 @@ def link_entrances(world):
try: try:
caves.remove(old_man_house[0]) caves.remove(old_man_house[0])
except ValueError: except ValueError:
print("Old man at desert") pass
else: #if the cave wasn't placed we get here else: #if the cave wasn't placed we get here
print("Normal Old Man")
connect_caves(world, lw_entrances, [], old_man_house) connect_caves(world, lw_entrances, [], old_man_house)
if world.mode == 'standard': if world.mode == 'standard':
# rest of hyrule castle must be in light world # rest of hyrule castle must be in light world

2
Rom.py
View File

@ -1057,7 +1057,7 @@ def write_strings(rom, world):
del locations_to_hint[hint_count:] del locations_to_hint[hint_count:]
for location in locations_to_hint: for location in locations_to_hint:
if location == 'Swamp Left': if location == 'Swamp Left':
this_hint = ('The westmost chests in Swamp Palace contain ' + (world.get_location('Swamp Palace - Compass Chest').item.pedestal_credit_text[4:] if world.get_location('Swamp Palace - Compass Chest').item.pedestal_credit_text[0] == 'a' else world.get_location('Swamp Palace - Compass Chest').item.pedestal_credit_text) + this_hint = ('The westmost chests in Swamp Palace contain ' + (world.get_location('Swamp Palace - West Chest').item.pedestal_credit_text[4:] if world.get_location('Swamp Palace - West Chest').item.pedestal_credit_text[0] == 'a' else world.get_location('Swamp Palace - West Chest').item.pedestal_credit_text) +
' and ' + (world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text[4:] if world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text[0] == 'a' else world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text) + '.') ' and ' + (world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text[4:] if world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text[0] == 'a' else world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text) + '.')
tt[hint_locations.pop(0)] = this_hint tt[hint_locations.pop(0)] = this_hint
elif location == 'Mire Left': elif location == 'Mire Left':