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

update hint writing a bit

This commit is contained in:
Fabian Dill 2021-02-13 06:53:27 +01:00
parent 71dd1da24d
commit 2fd0c96369
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Rom.py
View File

@ -2037,7 +2037,7 @@ def write_strings(rom, world, player, team):
hint_count = 4 hint_count = 4
for entrance in all_entrances: for entrance in all_entrances:
if entrance.name in entrances_to_hint: if entrance.name in entrances_to_hint:
if hint_count > 0: if hint_count:
this_hint = entrances_to_hint[entrance.name] + ' leads to ' + hint_text( this_hint = entrances_to_hint[entrance.name] + ' leads to ' + hint_text(
entrance.connected_region) + '.' entrance.connected_region) + '.'
tt[hint_locations.pop(0)] = this_hint tt[hint_locations.pop(0)] = this_hint
@ -2074,7 +2074,7 @@ def write_strings(rom, world, player, team):
hint_count = 4 if world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] else 0 hint_count = 4 if world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] else 0
for entrance in all_entrances: for entrance in all_entrances:
if entrance.name in entrances_to_hint: if entrance.name in entrances_to_hint:
if hint_count > 0: if hint_count:
this_hint = entrances_to_hint[entrance.name] + ' leads to ' + hint_text( this_hint = entrances_to_hint[entrance.name] + ' leads to ' + hint_text(
entrance.connected_region) + '.' entrance.connected_region) + '.'
tt[hint_locations.pop(0)] = this_hint tt[hint_locations.pop(0)] = this_hint
@ -2089,8 +2089,7 @@ def write_strings(rom, world, player, team):
locations_to_hint.extend(InconvenientVanillaLocations) locations_to_hint.extend(InconvenientVanillaLocations)
local_random.shuffle(locations_to_hint) local_random.shuffle(locations_to_hint)
hint_count = 3 if world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] else 5 hint_count = 3 if world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] else 5
del locations_to_hint[hint_count:] for location in locations_to_hint[:hint_count]:
for location in locations_to_hint:
if location == 'Swamp Left': if location == 'Swamp Left':
if local_random.randint(0, 1): if local_random.randint(0, 1):
first_item = hint_text(world.get_location('Swamp Palace - West Chest', player).item) first_item = hint_text(world.get_location('Swamp Palace - West Chest', player).item)
@ -2161,8 +2160,8 @@ def write_strings(rom, world, player, team):
# All remaining hint slots are filled with junk hints. It is done this way to ensure the same junk hint isn't selected twice. # All remaining hint slots are filled with junk hints. It is done this way to ensure the same junk hint isn't selected twice.
junk_hints = junk_texts.copy() junk_hints = junk_texts.copy()
local_random.shuffle(junk_hints) local_random.shuffle(junk_hints)
for location in hint_locations: for location, text in zip(hint_locations, junk_hints):
tt[location] = junk_hints.pop(0) tt[location] = text
# We still need the older hints of course. Those are done here. # We still need the older hints of course. Those are done here.