From 790fea97f1fefa54bdf75941ea7dad4e5ff2642d Mon Sep 17 00:00:00 2001 From: dotzo Date: Fri, 30 Jan 2026 19:51:01 -0500 Subject: [PATCH 1/3] Adding in 2 missing locations --- LocationList.py | 4 ++++ data/Glitched World/Ganons Castle MQ.json | 5 ++++- data/Glitched World/Jabu Jabus Belly MQ.json | 3 ++- data/World/Ganons Castle MQ.json | 4 +++- data/World/Jabu Jabus Belly MQ.json | 3 ++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/LocationList.py b/LocationList.py index b19553f7d1..f05d8829c4 100644 --- a/LocationList.py +++ b/LocationList.py @@ -2503,6 +2503,9 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Ganons Castle MQ Water Trial Silver Rupee Red Ice", ("SilverRupee", 0x0D, (3,0,10), None, 'Silver Rupee (Ganons Castle Water Trial)', ("Ganon's Castle MQ", "Master Quest", "Silver Rupees",))), ("Ganons Castle MQ Water Trial Silver Rupee Above Void", ("SilverRupee", 0x0D, (3,0,11), None, 'Silver Rupee (Ganons Castle Water Trial)', ("Ganon's Castle MQ", "Master Quest", "Silver Rupees",))), + # Ganon's Castle MQ Wonderitems + ("Ganons Castle MQ Shadow Trial Explosives Wonderitem", ("Wonderitem", 0x0D, (12,0,13), None, 'Deku Nuts (5)', ("Ganon's Castle MQ", "Master Quest", "Wonderitems",))), + # Ganon's Castle Shared ("Ganons Tower Boss Key Chest", ("Chest", 0x0A, 0x0B, None, 'Boss Key (Ganons Castle)', ("Ganon's Tower", "Vanilla Dungeons", "Master Quest", "Chests",))), @@ -2545,6 +2548,7 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Fairy Pot", ("Drop", None, None, None, 'Fairy', None)), ("Free Fairies", ("Drop", None, None, None, 'Fairy', None)), ("Wall Fairy", ("Drop", None, None, None, 'Fairy', None)), + ("Bombable Fairy", ("Drop", None, None, None, 'Fairy', None)), ("Butterfly Fairy", ("Drop", None, None, None, 'Fairy', None)), ("Gossip Stone Fairy", ("Drop", None, None, None, 'Fairy', None)), ("Bean Plant Fairy", ("Drop", None, None, None, 'Fairy', None)), diff --git a/data/Glitched World/Ganons Castle MQ.json b/data/Glitched World/Ganons Castle MQ.json index 032522bd43..b1d0e563e1 100644 --- a/data/Glitched World/Ganons Castle MQ.json +++ b/data/Glitched World/Ganons Castle MQ.json @@ -136,7 +136,10 @@ "locations": { "Ganons Castle MQ Shadow Trial Silver Rupee Moving Platform": "True", "Ganons Castle MQ Shadow Trial Silver Rupee Bomb Flower": "True", - "Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True" + "Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True", + "Ganons Castle MQ Shadow Trial Explosives Wonderitem": " + at('Ganons Castle Shadow Trial', can_use(Bow)) or + has_explosives or Progressive_Strength_Upgrade or can_use(Dins_Fire) or can_gdv", }, "exits": { "Ganons Castle Shadow Trial Second Gap": "Hover_Boots or has_fire_source or logic_shadow_trial_mq" diff --git a/data/Glitched World/Jabu Jabus Belly MQ.json b/data/Glitched World/Jabu Jabus Belly MQ.json index 671f9611aa..c490cea15c 100644 --- a/data/Glitched World/Jabu Jabus Belly MQ.json +++ b/data/Glitched World/Jabu Jabus Belly MQ.json @@ -105,7 +105,8 @@ "Jabu Jabus Belly MQ Falling Like Like Room Pot 1": "True", "Jabu Jabus Belly MQ Falling Like Like Room Pot 2": "True", "Jabu Jabus Belly MQ Hallway Small Crate 1": "True", - "Jabu Jabus Belly MQ Hallway Small Crate 2": "True" + "Jabu Jabus Belly MQ Hallway Small Crate 2": "True", + "Bombable Fairy": "has_bottle and has_explosives" }, "exits": { "Jabu Jabus After Right Tentacle": "Jabu_Jabus_Belly_Right_Tentacle_Cleared" diff --git a/data/World/Ganons Castle MQ.json b/data/World/Ganons Castle MQ.json index fd350a43ca..2b14e957fb 100644 --- a/data/World/Ganons Castle MQ.json +++ b/data/World/Ganons Castle MQ.json @@ -114,7 +114,9 @@ "locations": { "Ganons Castle MQ Shadow Trial Silver Rupee Moving Platform": "True", "Ganons Castle MQ Shadow Trial Silver Rupee Bomb Flower": "True", - "Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True" + "Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True", + "Ganons Castle MQ Shadow Trial Explosives Wonderitem": " + has_explosives or Bow or Progressive_Strength_Upgrade or can_use(Dins_Fire)", }, "exits": { "Ganons Castle Shadow Trial Second Gap": "Hover_Boots or has_fire_source or logic_shadow_trial_mq" diff --git a/data/World/Jabu Jabus Belly MQ.json b/data/World/Jabu Jabus Belly MQ.json index 8fae7f009d..c8d6ff0629 100644 --- a/data/World/Jabu Jabus Belly MQ.json +++ b/data/World/Jabu Jabus Belly MQ.json @@ -100,7 +100,8 @@ "Jabu Jabus Belly MQ Falling Like-Like Room Explosives Wonderitem 2": "has_explosives", "Jabu Jabus Belly MQ Falling Like-Like Room Explosives Wonderitem 3": "has_explosives", "Jabu Jabus Belly MQ Hallway Small Crate 1": "True", - "Jabu Jabus Belly MQ Hallway Small Crate 2": "True" + "Jabu Jabus Belly MQ Hallway Small Crate 2": "True", + "Bombable Fairy": "has_bottle" }, "exits": { "Jabu Jabus Belly Past Big Octo": "Sticks or (can_use(Dins_Fire) and Kokiri_Sword)" From 0f4d474304b9947d10b4619a895e2a05fe978a9b Mon Sep 17 00:00:00 2001 From: dotzo Date: Sun, 1 Feb 2026 12:22:07 -0500 Subject: [PATCH 2/3] remove comma --- data/Glitched World/Ganons Castle MQ.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Glitched World/Ganons Castle MQ.json b/data/Glitched World/Ganons Castle MQ.json index b1d0e563e1..cc878ebfd3 100644 --- a/data/Glitched World/Ganons Castle MQ.json +++ b/data/Glitched World/Ganons Castle MQ.json @@ -139,7 +139,7 @@ "Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True", "Ganons Castle MQ Shadow Trial Explosives Wonderitem": " at('Ganons Castle Shadow Trial', can_use(Bow)) or - has_explosives or Progressive_Strength_Upgrade or can_use(Dins_Fire) or can_gdv", + has_explosives or Progressive_Strength_Upgrade or can_use(Dins_Fire) or can_gdv" }, "exits": { "Ganons Castle Shadow Trial Second Gap": "Hover_Boots or has_fire_source or logic_shadow_trial_mq" From 3129b543a50a5fb3a01e7fad710855a0d62b8c06 Mon Sep 17 00:00:00 2001 From: dotzo Date: Sun, 1 Feb 2026 12:43:21 -0500 Subject: [PATCH 3/3] stupid commas --- data/World/Ganons Castle MQ.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/World/Ganons Castle MQ.json b/data/World/Ganons Castle MQ.json index 2b14e957fb..b98064538a 100644 --- a/data/World/Ganons Castle MQ.json +++ b/data/World/Ganons Castle MQ.json @@ -116,7 +116,7 @@ "Ganons Castle MQ Shadow Trial Silver Rupee Bomb Flower": "True", "Ganons Castle MQ Shadow Trial Silver Rupee First Beamos": "True", "Ganons Castle MQ Shadow Trial Explosives Wonderitem": " - has_explosives or Bow or Progressive_Strength_Upgrade or can_use(Dins_Fire)", + has_explosives or Bow or Progressive_Strength_Upgrade or can_use(Dins_Fire)" }, "exits": { "Ganons Castle Shadow Trial Second Gap": "Hover_Boots or has_fire_source or logic_shadow_trial_mq"