From 3377411556510c0a5a2fe93a7175936cdf5cb78a Mon Sep 17 00:00:00 2001 From: dotzo Date: Sun, 5 Oct 2025 21:06:07 -0400 Subject: [PATCH 1/5] Make Biggoron Sword and Giant's Knife Advancement items to conform with advanced logic --- ItemList.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ItemList.py b/ItemList.py index 0d13f44c92..b07b8b0f0f 100644 --- a/ItemList.py +++ b/ItemList.py @@ -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), @@ -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), From fd0ea9f3d6ebc0007e142bf346b11b9bf506a69a Mon Sep 17 00:00:00 2001 From: shirosoluna Date: Fri, 24 Oct 2025 16:51:59 -0400 Subject: [PATCH 2/5] new trick water iron boots dive --- SettingsListTricks.py | 8 ++++++++ data/Glitched World/Water Temple MQ.json | 3 ++- data/Glitched World/Water Temple.json | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/SettingsListTricks.py b/SettingsListTricks.py index cfa4dd66d5..578eca8db4 100644 --- a/SettingsListTricks.py +++ b/SettingsListTricks.py @@ -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",), diff --git a/data/Glitched World/Water Temple MQ.json b/data/Glitched World/Water Temple MQ.json index 860352d5c9..ab27e7333f 100644 --- a/data/Glitched World/Water Temple MQ.json +++ b/data/Glitched World/Water Temple MQ.json @@ -53,7 +53,8 @@ "Water Temple Storage Room": "is_adult and Iron_Boots and (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_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": " diff --git a/data/Glitched World/Water Temple.json b/data/Glitched World/Water Temple.json index 434c0f0325..18a3da8911 100644 --- a/data/Glitched World/Water Temple.json +++ b/data/Glitched World/Water Temple.json @@ -35,8 +35,9 @@ "Water Temple Compass Room": "is_adult and Iron_Boots and (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 - ((can_mega or can_hess or can_superslide) and can_use(Hover_Boots)) 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) and (Longshot or (logic_water_north_basement and Hover_Boots) or can_hover) From a23e3556b2a66139ce143b5f1d3679e2df5c8300 Mon Sep 17 00:00:00 2001 From: shirosoluna Date: Fri, 24 Oct 2025 17:00:27 -0400 Subject: [PATCH 3/5] trailing spaces --- data/Glitched World/Water Temple MQ.json | 2 +- data/Glitched World/Water Temple.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/Glitched World/Water Temple MQ.json b/data/Glitched World/Water Temple MQ.json index ab27e7333f..b686e1785d 100644 --- a/data/Glitched World/Water Temple MQ.json +++ b/data/Glitched World/Water Temple MQ.json @@ -53,7 +53,7 @@ "Water Temple Storage Room": "is_adult and Iron_Boots and (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_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", diff --git a/data/Glitched World/Water Temple.json b/data/Glitched World/Water Temple.json index 18a3da8911..304bcb02ed 100644 --- a/data/Glitched World/Water Temple.json +++ b/data/Glitched World/Water Temple.json @@ -35,9 +35,9 @@ "Water Temple Compass Room": "is_adult and Iron_Boots and (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 + (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) and (Longshot or (logic_water_north_basement and Hover_Boots) or can_hover) From 270bd1f08a84b28cdc055441de09a5473a7dc640 Mon Sep 17 00:00:00 2001 From: shirosoluna Date: Wed, 5 Nov 2025 09:58:45 -0500 Subject: [PATCH 4/5] fix typo, remove 1164 hints.py per r0bdog --- Hints.py | 1 - data/Glitched World/Water Temple MQ.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Hints.py b/Hints.py index 4029b4968a..e9ea73ed8d 100644 --- a/Hints.py +++ b/Hints.py @@ -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')) diff --git a/data/Glitched World/Water Temple MQ.json b/data/Glitched World/Water Temple MQ.json index b686e1785d..42951080e5 100644 --- a/data/Glitched World/Water Temple MQ.json +++ b/data/Glitched World/Water Temple MQ.json @@ -54,7 +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 + (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": " From 6b616ec7e8ba81e1f7c4912e18c0e9ce2949f4d6 Mon Sep 17 00:00:00 2001 From: shirosoluna Date: Fri, 5 Dec 2025 10:38:55 -0500 Subject: [PATCH 5/5] remove water trick --- SettingsListTricks.py | 8 -------- data/Glitched World/Water Temple MQ.json | 1 - data/Glitched World/Water Temple.json | 1 - 3 files changed, 10 deletions(-) diff --git a/SettingsListTricks.py b/SettingsListTricks.py index 578eca8db4..cfa4dd66d5 100644 --- a/SettingsListTricks.py +++ b/SettingsListTricks.py @@ -2872,14 +2872,6 @@ 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",), diff --git a/data/Glitched World/Water Temple MQ.json b/data/Glitched World/Water Temple MQ.json index 42951080e5..860352d5c9 100644 --- a/data/Glitched World/Water Temple MQ.json +++ b/data/Glitched World/Water Temple MQ.json @@ -54,7 +54,6 @@ (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": " diff --git a/data/Glitched World/Water Temple.json b/data/Glitched World/Water Temple.json index 304bcb02ed..434c0f0325 100644 --- a/data/Glitched World/Water Temple.json +++ b/data/Glitched World/Water Temple.json @@ -36,7 +36,6 @@ (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)