Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include triforce pieces in major item hints #2323

Open
wants to merge 3 commits into
base: Dev
Choose a base branch
from
Open

Include triforce pieces in major item hints #2323

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e9cc8d
Include triforce pieces in major item hints
matthewkirby Oct 27, 2024
0b32a0d
Cleaned up duplicate code
matthewkirby Oct 28, 2024
a0a1f9c
Used scz shorthand and excluded gbk on lacs as its already hinted.
matthewkirby Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions Hints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,24 +1149,10 @@ def get_important_check_hint(spoiler: Spoiler, world: World, checked: set[str])
for location in world.get_filled_locations():
region = HintArea.at(location).text(world.settings.clearer_hints)
if region == hint_loc:
if (location.item.majoritem
# exclude locked items
if ((location.item.majoritem or location.item.name in ('Biggoron Sword', 'Double Defense'))
and not location.locked
# exclude triforce pieces as it defeats the idea of a triforce hunt
and not location.item.name == 'Triforce Piece'
and not (location.name == 'Song from Impa' and 'Zeldas Letter' in world.settings.starting_items and 'Zeldas Letter' not in world.settings.shuffle_child_trade)
# Special cases where the item is only considered major for important checks hints
or location.item.name == 'Biggoron Sword'
or location.item.name == 'Double Defense'
# Handle make keys not in own dungeon major items
or (location.item.type in ('SmallKey', 'SmallKeyRing') and not (world.settings.shuffle_smallkeys == 'dungeon' or world.settings.shuffle_smallkeys == 'vanilla'))
or (location.item.type in ('HideoutSmallKey', 'HideoutSmallKeyRing') and not world.settings.shuffle_hideoutkeys == 'vanilla')
or (location.item.type in ('TCGSmallKey', 'TCGSmallKeyRing') and not world.settings.shuffle_tcgkeys == 'vanilla')
or (location.item.type == 'BossKey' and not (world.settings.shuffle_bosskeys == 'dungeon' or world.settings.shuffle_bosskeys == 'vanilla'))
or (location.item.type == 'GanonBossKey' and not (world.settings.shuffle_ganon_bosskey == 'vanilla'
or world.settings.shuffle_ganon_bosskey == 'dungeon' or world.settings.shuffle_ganon_bosskey == 'on_lacs'
or world.settings.shuffle_ganon_bosskey == 'stones' or world.settings.shuffle_ganon_bosskey == 'medallions'
or world.settings.shuffle_ganon_bosskey == 'dungeons' or world.settings.shuffle_ganon_bosskey == 'tokens'))):
and not (location.name == 'Song from Impa' and world.skip_child_zelda)
and not (location.item.type == 'GanonBossKey' and not world.settings.shuffle_ganon_bosskey == 'on_lacs')):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of this line?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, was I being silly? I thought when you said the thing about not hinting GBK on lacs you meant I should reintroduce the line to not count it. So the intent was that if the region was temple of time, the ganon boss key would not be counted as a major item for this hint type.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will actually run some tests later and make sure that the GBK on lacs isn't included if I remove this line.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant that it's not going to be hinted either way so the line is not necessary. Also, the way it's written, it excludes Gbk when it's not on LACS, which I don't think we should do.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will actually run some tests later and make sure that the GBK on lacs isn't included if I remove this line.

I just checked and it isn't.

item_count = item_count + 1

checked.add(hint_loc + ' Important Check')
Expand Down