Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle

This commit is contained in:
2022-03-31 16:29:04 -07:00
7 changed files with 146 additions and 116 deletions

6
Rom.py
View File

@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '4fe27f1d5b874373e48233b7dffe4a6a'
RANDOMIZERBASEHASH = '38e4f15742c28f0f9528233bfb064806'
class JsonRom(object):
@@ -2473,7 +2473,7 @@ def write_strings(rom, world, player, team):
this_location = world.find_items_not_key_only(flute_item, player)
if this_location:
this_hint = this_location[0].item.hint_text + ' can be found ' + hint_text(this_location[0]) + '.'
this_hint = this_hint.capitalize()
this_hint = this_hint[0].upper() + this_hint[1:]
tt[hint_locations.pop(0)] = this_hint
items_to_hint.remove(flute_item)
if world.keyshuffle[player]:
@@ -2490,7 +2490,7 @@ def write_strings(rom, world, player, team):
random.shuffle(this_location)
if this_location:
this_hint = this_location[0].item.hint_text + ' can be found ' + hint_text(this_location[0]) + '.'
this_hint = this_hint.capitalize()
this_hint = this_hint[0].upper() + this_hint[1:]
tt[hint_locations.pop(0)] = this_hint
hint_count -= 1