Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Hints.py
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,6 @@ def get_important_check_hint(spoiler: Spoiler, world: World, checked: set[str])
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'))
Expand Down
4 changes: 2 additions & 2 deletions ItemList.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ class GetItemId(IntEnum):
'Eyedrops': ('Item', True, GetItemId.GI_EYE_DROPS, {'trade': True}),
'Claim Check': ('Item', True, GetItemId.GI_CLAIM_CHECK, {'trade': True}),
'Kokiri Sword': ('Item', True, GetItemId.GI_SWORD_KOKIRI, None),
'Giants Knife': ('Item', None, GetItemId.GI_SWORD_KNIFE, None),
'Giants Knife': ('Item', True, GetItemId.GI_SWORD_KNIFE, None),
'Deku Shield': ('Item', None, GetItemId.GI_SHIELD_DEKU, None),
'Hylian Shield': ('Item', None, GetItemId.GI_SHIELD_HYLIAN, None),
'Mirror Shield': ('Item', True, GetItemId.GI_SHIELD_MIRROR, None),
Expand Down Expand Up @@ -394,7 +394,7 @@ class GetItemId(IntEnum):
'Gerudo Mask': ('Item', None, GetItemId.GI_MASK_GERUDO, {'trade': True, 'object': 0x0152}),
'Rupees (50)': ('Item', None, GetItemId.GI_RUPEE_PURPLE, {'junk': 1}),
'Rupees (200)': ('Item', None, GetItemId.GI_RUPEE_GOLD, {'junk': 0}),
'Biggoron Sword': ('Item', None, GetItemId.GI_SWORD_BIGGORON, None),
'Biggoron Sword': ('Item', True, GetItemId.GI_SWORD_BIGGORON, None),
'Fire Arrows': ('Item', True, GetItemId.GI_ARROW_FIRE, None),
'Ice Arrows': ('Item', True, GetItemId.GI_ARROW_ICE, None),
'Blue Fire Arrows': ('Item', True, GetItemId.GI_ARROW_ICE, None),
Expand Down