Skip to content
Open
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
8 changes: 8 additions & 0 deletions SettingsListTricks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2872,6 +2872,14 @@
You can also do the same by abusing invincibility frames
if not on ohko.
'''},
'(Advanced) Water Temple Before Boss Iron Boots Dive Ledgegrab': {
'name' : 'adv_irons_dive',
'tags' : ("Glitchless","Adult","Water Temple","Water Temple MQ",),
'tooltip' : '''\
After diving in front of the water, equip iron boots
on the frame(s) before resurfacing to preserve velocity
to grab the ledge.
'''},
'(Glitch) Water Temple Antigrav to Boss Key Area': {
'name' : 'glitch_water_bk_area_antigrav',
'tags' : ("Glitch","Adult","Water Temple","Water Temple MQ",),
Expand Down
1 change: 1 addition & 0 deletions data/Glitched World/Water Temple MQ.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
(Zora_Tunic or logic_fewer_tunic_requirements) and Hookshot",
"Water Temple Before Boss Lower": "can_use(Longshot) or
(adv_hovers_recoil and can_use(Hover_Boots) and Megaton_Hammer) or
(adv_irons_dive and can_use(Iron_Boots) and Reset_Water_Level) or
((can_mega or can_hess or can_superslide) and can_use(Hover_Boots)) or
can_hover",
"Water Temple After Waterfall Room": "
Expand Down
1 change: 1 addition & 0 deletions data/Glitched World/Water Temple.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
(Zora_Tunic or logic_fewer_tunic_requirements) and Hookshot",
"Water Temple Before Boss": "can_use(Longshot) or
(adv_hovers_recoil and can_use(Hover_Boots) and Megaton_Hammer) or
(adv_irons_dive and can_use(Iron_Boots) and Raise_Water_Level) or
((can_mega or can_hess or can_superslide) and can_use(Hover_Boots)) or
can_hover",
"Water Temple North Basement": "can_use(Iron_Boots) and (Zora_Tunic or logic_fewer_tunic_requirements)
Expand Down