Skip to content

Commit

Permalink
Fix alt_hint for ganondorf only. Fix Ganon's tower filter tags
Browse files Browse the repository at this point in the history
  • Loading branch information
@rrealmuto
rrealmuto committed Oct 24, 2022
1 parent daf463a commit 4e9e7c9
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
2 changes: 2 additions & 0 deletions HintList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1712,6 +1712,7 @@ def tokens_required_by_settings(world):
'replace': {
"enter #your pocket#. I will let you have": "check #your pocket#. You will find",
},
'use_alt_hint': False,
},
'ganondorf': {
'id': 0x70CC,
Expand All @@ -1724,6 +1725,7 @@ def tokens_required_by_settings(world):
"from #outside Ganon's Castle#": "from #outside my castle#",
"from #Ganondorf's Chamber#": "from #those pots over there#",
},
'use_alt_hint': True,
},
}

Expand Down
2 changes: 1 addition & 1 deletion Hints.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,7 @@ def buildMiscItemHints(world, messages):
text = data['custom_item_text'].format(area='#your pocket#', item=item)
elif hint_type in world.misc_hint_item_locations:
location = world.misc_hint_item_locations[hint_type]
area = HintArea.at(location, use_alt_hint=True).text(world.settings.clearer_hints, world=None if location.world.id == world.id else location.world.id + 1)
area = HintArea.at(location, use_alt_hint=data['use_alt_hint']).text(world.settings.clearer_hints, world=None if location.world.id == world.id else location.world.id + 1)
if item == data['default_item']:
text = data['default_item_text'].format(area=area)
else:
Expand Down
30 changes: 15 additions & 15 deletions LocationList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1889,23 +1889,23 @@ def shop_address(shop_id, shelf_id):
("Ganons Castle MQ Spirit Trial Pot 2", ("Collectable", 0x0D, 0x33, None, 'Deku Nuts (5)', ("Ganon's Castle", "Master Quest", "Pot"))),

# Ganon's Castle shared
("Ganons Tower Boss Key Chest", ("Chest", 0x0A, 0x0B, None, 'Boss Key (Ganons Castle)', ("Ganon's Castle", "Vanilla", "Master Quest"))),
("Ganons Tower Boss Key Chest", ("Chest", 0x0A, 0x0B, None, 'Boss Key (Ganons Castle)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest"))),

# Ganon's Tower Pots
("Ganons Tower Pot 1", ("Collectable", 0x19, 0x20, None, 'Rupees (5)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 2", ("Collectable", 0x19, 0x21, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 3", ("Collectable", 0x19, 0x25, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 4", ("Collectable", 0x19, 0x22, None, 'Rupees (5)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 5", ("Collectable", 0x19, 0x26, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 6", ("Collectable", 0x19, 0x27, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 7", ("Collectable", 0x19, 0x23, None, 'Rupees (5)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 8", ("Collectable", 0x19, 0x24, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 9", ("Collectable", 0x19, 0x2A, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 10", ("Collectable", 0x19, 0x2B, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 11", ("Collectable", 0x19, 0x2C, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 12", ("Collectable", 0x19, 0x2D, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 13", ("Collectable", 0x19, 0x2E, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 14", ("Collectable", 0x19, 0x31, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))),
("Ganons Tower Pot 1", ("Collectable", 0x19, 0x20, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 2", ("Collectable", 0x19, 0x21, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 3", ("Collectable", 0x19, 0x25, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 4", ("Collectable", 0x19, 0x22, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 5", ("Collectable", 0x19, 0x26, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 6", ("Collectable", 0x19, 0x27, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 7", ("Collectable", 0x19, 0x23, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 8", ("Collectable", 0x19, 0x24, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 9", ("Collectable", 0x19, 0x2A, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 10", ("Collectable", 0x19, 0x2B, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 11", ("Collectable", 0x19, 0x2C, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 12", ("Collectable", 0x19, 0x2D, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 13", ("Collectable", 0x19, 0x2E, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))),
("Ganons Tower Pot 14", ("Collectable", 0x19, 0x31, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))),

## Events and Drops
("Pierre", ("Event", None, None, None, 'Scarecrow Song', None)),
Expand Down

0 comments on commit 4e9e7c9

Please sign in to comment.