Merge pull request #8 from Vodzilla/mq_pots

Remove Redundant Location
fenhl · Feb 9, 2022 · 91c60b2 · 91c60b2
2 parents 7e0c5de + 9008794
commit 91c60b2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 44 deletions.
diff --git a/LocationList.py b/LocationList.py
@@ -752,10 +752,10 @@ def shop_address(shop_id, shelf_id):
     ("Dodongos Cavern MQ Upper Lizalfos Pot 2",                         ("Collectable",  0x01,  0x2B, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
     ("Dodongos Cavern MQ Upper Lizalfos Pot 3",                         ("Collectable",  0x01,  0x2C, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
     ("Dodongos Cavern MQ Upper Lizalfos Pot 4",                         ("Collectable",  0x01,  0x2D, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
-    ("Dodongos Cavern MQ Torch Room Pot 1",                         ("Collectable",  0x01,  0x2E, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
-    ("Dodongos Cavern MQ Torch Room Pot 2",                         ("Collectable",  0x01,  0x2F, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
-    ("Dodongos Cavern MQ Torch Room Pot 3",                         ("Collectable",  0x01,  0x31, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
-    ("Dodongos Cavern MQ Torch Room Pot 4",                         ("Collectable",  0x01,  0x32, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
+    ("Dodongos Cavern MQ Poes Room Pot 1",                         ("Collectable",  0x01,  0x2E, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
+    ("Dodongos Cavern MQ Poes Room Pot 2",                         ("Collectable",  0x01,  0x2F, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
+    ("Dodongos Cavern MQ Poes Room Pot 3",                         ("Collectable",  0x01,  0x31, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
+    ("Dodongos Cavern MQ Poes Room Pot 4",                         ("Collectable",  0x01,  0x32, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
     ("Dodongos Cavern MQ Before Boss Room Pot 1",                         ("Collectable",  0x01,  0x3D, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
     ("Dodongos Cavern MQ Before Boss Room Pot 2",                         ("Collectable",  0x01,  0x3E, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
     ("Dodongos Cavern MQ Armos Army Room Pot 1",                         ("Collectable",  0x01,  0x20, None,                        'Rupees (5)',                           ("Dodongo's Cavern", "Master Quest", "Pot"))),
@@ -776,14 +776,14 @@ def shop_address(shop_id, shelf_id):
     ("Dodongos Cavern MQ Staircase Crate Top Left", ("Collectable", 0x1, 0x43, ([0x1f55cf4],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
     ("Dodongos Cavern MQ Staircase Crate Mid Right", ("Collectable", 0x1, 0x44, ([0x1f55d24],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
     ("Dodongos Cavern MQ Staircase Crate Top Right", ("Collectable", 0x1, 0x45, ([0x1f55d34],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 5", ("Collectable", 0x1, 0x46, ([0x1f6d9bc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 6", ("Collectable", 0x1, 0x47, ([0x1f6d9cc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 1", ("Collectable", 0x1, 0x48, ([0x1f6d9dc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 2", ("Collectable", 0x1, 0x49, ([0x1f6d9ec],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 3", ("Collectable", 0x1, 0x4A, ([0x1f6d9fc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 4", ("Collectable", 0x1, 0x4B, ([0x1f6da0c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 7", ("Collectable", 0x1, 0x4C, ([0x1f6da1c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
-    ("Dodongos Cavern MQ Torch Room Crate 8", ("Collectable", 0x1, 0x4D, ([0x1f6da2c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 5", ("Collectable", 0x1, 0x46, ([0x1f6d9bc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 6", ("Collectable", 0x1, 0x47, ([0x1f6d9cc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 1", ("Collectable", 0x1, 0x48, ([0x1f6d9dc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 2", ("Collectable", 0x1, 0x49, ([0x1f6d9ec],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 3", ("Collectable", 0x1, 0x4A, ([0x1f6d9fc],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 4", ("Collectable", 0x1, 0x4B, ([0x1f6da0c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 7", ("Collectable", 0x1, 0x4C, ([0x1f6da1c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
+    ("Dodongos Cavern MQ Poes Room Crate 8", ("Collectable", 0x1, 0x4D, ([0x1f6da2c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
     ("Dodongos Cavern MQ Larvae Room Crate 1", ("Collectable", 0x1, 0x4E, ([0x1f7646c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
     ("Dodongos Cavern MQ Larvae Room Crate 2", ("Collectable", 0x1, 0x4F, ([0x1f7647c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),
     ("Dodongos Cavern MQ Larvae Room Crate 3", ("Collectable", 0x1, 0x50, ([0x1f7648c],None), 'Rupee (1)', ("Dodongos Cavern", "Master Quest", "Crate"))),

diff --git a/data/World/Deku Tree MQ.json b/data/World/Deku Tree MQ.json
@@ -8,7 +8,7 @@
             "Deku Tree MQ Lobby Crate": "True",
             "Deku Tree MQ Slingshot Chest": "is_adult or can_child_attack",
             "Deku Tree MQ Slingshot Room Back Chest": "has_fire_source_with_torch or can_use(Bow)",
-            "Deku Tree MQ Slingshot Room Recovery Heart": "is_adult or can_child_attack",
+            "Deku Tree MQ Slingshot Room Recovery Heart": "True",
             "Deku Tree MQ Slingshot Room Crate 1": "True",
             "Deku Tree MQ Slingshot Room Crate 2": "True",
             "Deku Tree MQ Near Compass Room Recovery Heart": "((is_adult or can_child_attack) and (has_fire_source_with_torch or can_use(Bow)) or has_fire_source)",

diff --git a/data/World/Dodongos Cavern MQ.json b/data/World/Dodongos Cavern MQ.json
@@ -49,35 +49,44 @@
             "Dodongos Cavern MQ GS Larvae Room": "can_use(Sticks) or has_fire_source",
             "Dodongos Cavern MQ GS Lizalfos Room": "can_blast_or_smash",
             "Dodongos Cavern MQ Deku Scrub Staircase": "can_stun_deku",
+            "Dodongos Cavern MQ Block Room Recovery Heart": "can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire)",
             "Dodongos Cavern MQ Staircase Room Pot 1": "True",
             "Dodongos Cavern MQ Staircase Room Pot 2": "True",
             "Dodongos Cavern MQ Staircase Room Pot 3": "True",
             "Dodongos Cavern MQ Staircase Room Pot 4": "True",
-            "Dodongos Cavern MQ Upper Lizalfos Pot 1": "can_blast_or_smash",
-            "Dodongos Cavern MQ Upper Lizalfos Pot 2": "can_blast_or_smash",
-            "Dodongos Cavern MQ Upper Lizalfos Pot 3": "can_blast_or_smash",
-            "Dodongos Cavern MQ Upper Lizalfos Pot 4": "can_blast_or_smash",
+            "Dodongos Cavern MQ Upper Lizalfos Pot 1": "
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
+                (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
+            "Dodongos Cavern MQ Upper Lizalfos Pot 2": "
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
+                (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
+            "Dodongos Cavern MQ Upper Lizalfos Pot 3": "
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
+                (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
+            "Dodongos Cavern MQ Upper Lizalfos Pot 4": "
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
+                (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ 3 Torch Room Pot 1": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ 3 Torch Room Pot 2": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ Before Upper Lizalfos Pot 1": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ Before Upper Lizalfos Pot 2": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ After Upper Lizalfos Pot 1": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ After Upper Lizalfos Pot 2": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ Staircase Crate Bottom Left": "True",
             "Dodongos Cavern MQ Staircase Crate Bottom Right": "True",
-            ##whatever was used to destroy the boulder to activate the elevator can be used to access the top of the staircase
+            #whatever was used to destroy the boulder to activate the elevator can be used to access the top of the staircase
             "Dodongos Cavern MQ Staircase Crate Mid Left": "True",
             "Dodongos Cavern MQ Staircase Crate Mid Right": "True",
             "Dodongos Cavern MQ Staircase Crate Top Left": "True",
@@ -89,10 +98,10 @@
             "Dodongos Cavern MQ Larvae Room Crate 5": "can_use(Sticks) or has_fire_source",
             "Dodongos Cavern MQ Larvae Room Crate 6": "can_use(Sticks) or has_fire_source",
             "Dodongos Cavern MQ After Upper Lizalfos Crate 1": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))",
             "Dodongos Cavern MQ After Upper Lizalfos Crate 2": "
-                can_blast_or_smash or can_use(Sticks) or can_use(Dins_Fire) or 
+                can_blast_or_smash or can_use(Sticks) or has_fire_source or 
                 (is_adult and (logic_dc_jump or Hover_Boots or Progressive_Hookshot))"
         },
         "exits": {
@@ -137,19 +146,18 @@
                 (here(can_use(Bow)) or Progressive_Strength_Upgrade or
                     can_use(Dins_Fire) or has_explosives) and
                 (can_use(Hookshot) or can_use(Boomerang))",
-            "Dodongos Cavern MQ Block Room Recovery Heart": "True",
-            "Dodongos Cavern MQ Torch Room Pot 1": "True",
-            "Dodongos Cavern MQ Torch Room Pot 2": "True",
-            "Dodongos Cavern MQ Torch Room Pot 3": "True",
-            "Dodongos Cavern MQ Torch Room Pot 4": "True",
-            "Dodongos Cavern MQ Torch Room Crate 1": "True",
-            "Dodongos Cavern MQ Torch Room Crate 2": "True",
-            "Dodongos Cavern MQ Torch Room Crate 3": "True",
-            "Dodongos Cavern MQ Torch Room Crate 4": "True",
-            "Dodongos Cavern MQ Torch Room Crate 5": "True",
-            "Dodongos Cavern MQ Torch Room Crate 6": "True",
-            "Dodongos Cavern MQ Torch Room Crate 7": "True",
-            "Dodongos Cavern MQ Torch Room Crate 8": "True"
+            "Dodongos Cavern MQ Poes Room Pot 1": "True",
+            "Dodongos Cavern MQ Poes Room Pot 2": "True",
+            "Dodongos Cavern MQ Poes Room Pot 3": "True",
+            "Dodongos Cavern MQ Poes Room Pot 4": "True",
+            "Dodongos Cavern MQ Poes Room Crate 1": "True",
+            "Dodongos Cavern MQ Poes Room Crate 2": "True",
+            "Dodongos Cavern MQ Poes Room Crate 3": "True",
+            "Dodongos Cavern MQ Poes Room Crate 4": "True",
+            "Dodongos Cavern MQ Poes Room Crate 5": "True",
+            "Dodongos Cavern MQ Poes Room Crate 6": "True",
+            "Dodongos Cavern MQ Poes Room Crate 7": "True",
+            "Dodongos Cavern MQ Poes Room Crate 8": "True"
         },
         "exits": {
             "Dodongos Cavern Lower Right Side": "True"
@@ -208,4 +216,4 @@
             "Fairy Pot": "has_bottle"
         }
     }
-]
+]
diff --git a/data/World/Water Temple MQ.json b/data/World/Water Temple MQ.json
@@ -40,10 +40,6 @@
             "Water Temple MQ Storage Room Crate 7": "can_use(Hookshot)",
             "Water Temple MQ Central Pillar Upper Crate 1": "True",
             "Water Temple MQ Central Pillar Upper Crate 2": "True",
-            "Water Temple MQ Central Pillar Lower Crate 1": "
-                can_use(Zora_Tunic) and
-                ((logic_water_mq_central_pillar and can_use(Fire_Arrows)) or
-                    (can_use(Dins_Fire) and can_play(Song_of_Time)))",
             "Water Temple MQ Central Pillar Lower Crate 1": "
                 can_use(Zora_Tunic) and
                 ((logic_water_mq_central_pillar and can_use(Fire_Arrows)) or