Bottom of the Well silver rupee logic fixes and more descriptive loca…

…tion names (#28)
fenhl · May 21, 2022 · a0e3bb2 · a0e3bb2
1 parent a46e493
commit a0e3bb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/LocationList.py b/LocationList.py
@@ -982,11 +982,11 @@ def shop_address(shop_id, shelf_id):
     ("Bottom of the Well West Inner Room Flying Pot 3", ("Collectable", 0x8, 0x36, None, 'Recovery Heart', ("Bottom of the Well", "Vanilla", "FlyingPot"))),
 
     # Bottom of the Well Silver Rupees
-    ("Bottom of the Well Basement Silver Rupee 1", ("Collectable", 0x08, 0x40, ([0x32E92B4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
-    ("Bottom of the Well Basement Silver Rupee 2", ("Collectable", 0x08, 0x41, ([0x32E92C4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
-    ("Bottom of the Well Basement Silver Rupee 3", ("Collectable", 0x08, 0x42, ([0x32E92D4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
-    ("Bottom of the Well Basement Silver Rupee 4", ("Collectable", 0x08, 0x43, ([0x32E92E4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
-    ("Bottom of the Well Basement Silver Rupee 5", ("Collectable", 0x08, 0x44, ([0x32E92F4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
+    ("Bottom of the Well Basement Silver Rupee Wood Beam Front",     ("Collectable", 0x08, 0x44, ([0x32E92F4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
+    ("Bottom of the Well Basement Silver Rupee Wood Beam Back",      ("Collectable", 0x08, 0x43, ([0x32E92E4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
+    ("Bottom of the Well Basement Silver Rupee Ladders Bottom",      ("Collectable", 0x08, 0x42, ([0x32E92D4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
+    ("Bottom of the Well Basement Silver Rupee Ladders Middle",      ("Collectable", 0x08, 0x41, ([0x32E92C4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
+    ("Bottom of the Well Basement Silver Rupee Ladders Top",         ("Collectable", 0x08, 0x40, ([0x32E92B4], None), 'Silver Rupee (Bottom of the Well Basement)', ("Bottom of the Well", "Vanilla", "Silver Rupee"))),
 
     # Bottom of the Well MQ
     ("Bottom of the Well MQ Map Chest",                              ("Chest",        0x08,  0x03, None,                        'Map (Bottom of the Well)',              ("Bottom of the Well", "Master Quest",))),

diff --git a/data/World/Bottom of the Well.json b/data/World/Bottom of the Well.json
@@ -37,9 +37,9 @@
             "Bottom of the Well Basement Pot 10" : "True",
             "Bottom of the Well Basement Pot 11" : "True",
             "Bottom of the Well Basement Pot 12" : "True",
-            "Bottom of the Well Left Side Pot 1": "True",
-            "Bottom of the Well Left Side Pot 2": "True",
-            "Bottom of the Well Left Side Pot 3": "True",
+            "Bottom of the Well Left Side Pot 1": "logic_lens_botw or can_use(Lens_of_Truth) or (Silver_Rupee_Bottom_of_the_Well_Basement, 5)",
+            "Bottom of the Well Left Side Pot 2": "logic_lens_botw or can_use(Lens_of_Truth) or (Silver_Rupee_Bottom_of_the_Well_Basement, 5)",
+            "Bottom of the Well Left Side Pot 3": "logic_lens_botw or can_use(Lens_of_Truth) or (Silver_Rupee_Bottom_of_the_Well_Basement, 5)",
             "Bottom of the Well Near Entrance Pot 1": "True",
             "Bottom of the Well Near Entrance Pot 2": "True",
             "Bottom of the Well Fire Keese Pot" : "(Small_Key_Bottom_of_the_Well, 3) and (logic_lens_botw or can_use(Lens_of_Truth))",
@@ -66,11 +66,11 @@
             "Bottom of the Well West Inner Room Flying Pot 1": "(logic_lens_botw or can_use(Lens_of_Truth)) and (Small_Key_Bottom_of_the_Well, 3)",
             "Bottom of the Well West Inner Room Flying Pot 2": "(logic_lens_botw or can_use(Lens_of_Truth)) and (Small_Key_Bottom_of_the_Well, 3)",
             "Bottom of the Well West Inner Room Flying Pot 3": "(logic_lens_botw or can_use(Lens_of_Truth)) and (Small_Key_Bottom_of_the_Well, 3)",
-            "Bottom of the Well Basement Silver Rupee 1":"True",
-            "Bottom of the Well Basement Silver Rupee 2":"True",
-            "Bottom of the Well Basement Silver Rupee 3":"True",
-            "Bottom of the Well Basement Silver Rupee 4":"True",
-            "Bottom of the Well Basement Silver Rupee 5":"True",
+            "Bottom of the Well Basement Silver Rupee Wood Beam Front": "True",
+            "Bottom of the Well Basement Silver Rupee Wood Beam Back": "True",
+            "Bottom of the Well Basement Silver Rupee Ladders Bottom": "True",
+            "Bottom of the Well Basement Silver Rupee Ladders Middle": "True",
+            "Bottom of the Well Basement Silver Rupee Ladders Top": "True",
             "Bottom of the Well GS East Inner Room": "
                 Boomerang and (logic_lens_botw or can_use(Lens_of_Truth)) and 
                 (Small_Key_Bottom_of_the_Well, 3)",