Logic fixes for accessing Succubus and DK skeleton in caverns

DorkmasterFlek · Mar 11, 2024 · f5456de · f5456de
1 parent 8e8fce1
commit f5456de
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/generate_locations.py b/generate_locations.py
@@ -232,12 +232,12 @@ def boss_location(name, code, map, x, y, location_id, **kwargs):
             Section('Life Vessel', location_id=127130005),
         ]),
         normal.simple_location('Pentagram', 23, 32, location_id=127130030),
-        normal.simple_location('Herald Shield', 20, 32, access_rules=['$canJump', '$canDash'], location_id=127130007),
-        Location('Below Bridge', map_locations=[normal.location(27, 32)], access_rules=['$canJump', '$canDash'], sections=[
+        normal.simple_location('Herald Shield', 20, 32, access_rules=['leapstone', '$canFly', '$canDash'], location_id=127130007),
+        Location('Below Bridge', map_locations=[normal.location(27, 32)], access_rules=['leapstone', '$canFly', '$canDash'], sections=[
             Section('Life Vessel', location_id=127130028),
             Section('Heart Vessel', location_id=127130029),
         ]),
-        Area('Side Section', access_rules=['$canJump'], children=[
+        Area('Succubus Area', access_rules=['$canFly'], children=[
             normal.simple_location('Claymore', 41, 24, location_id=127130013),
             Location('Succubus Approach', map_locations=[normal.location(42, 27.5)], sections=[
                 Section('Meal Ticket', location_id=[127130014, 127130015, 127130016, 127130017]),
@@ -273,8 +273,7 @@ def boss_location(name, code, map, x, y, location_id, **kwargs):
 
 # Abandoned Mine
 mine = Area('Abandoned Mine', access_rules=[
-        '@Underground Caverns/Upper Caverns,$canJump',
-        '@Underground Caverns/Upper Caverns,$canDash',
+        '@Underground Caverns/Upper Caverns/Below Bridge',
     ], children=[
     Area('Behind Demon Button', access_rules=['demoncard'], children=[
         Location('Demon Button Room', map_locations=[normal.location(34, 36)], sections=[

diff --git a/locations/normal/caverns.json b/locations/normal/caverns.json
@@ -170,7 +170,8 @@
                     {
                         "name": "Herald Shield",
                         "access_rules": [
-                            "$canJump",
+                            "leapstone",
+                            "$canFly",
                             "$canDash"
                         ],
                         "sections": [
@@ -190,7 +191,8 @@
                     {
                         "name": "Below Bridge",
                         "access_rules": [
-                            "$canJump",
+                            "leapstone",
+                            "$canFly",
                             "$canDash"
                         ],
                         "sections": [
@@ -212,9 +214,9 @@
                         ]
                     },
                     {
-                        "name": "Side Section",
+                        "name": "Succubus Area",
                         "access_rules": [
-                            "$canJump"
+                            "$canFly"
                         ],
                         "children": [
                             {

diff --git a/locations/normal/mine.json b/locations/normal/mine.json
@@ -2,8 +2,7 @@
     {
         "name": "Abandoned Mine",
         "access_rules": [
-            "@Underground Caverns/Upper Caverns,$canJump",
-            "@Underground Caverns/Upper Caverns,$canDash"
+            "@Underground Caverns/Upper Caverns/Below Bridge"
         ],
         "children": [
             {

diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua
@@ -428,15 +428,15 @@ LOCATIONS_MAPPING = {
     [127130006] = "@Underground Caverns/Lower Caverns/Life Vessel (Behind Waterfall)/Life Vessel (Behind Waterfall)",
     [127130007] = "@Underground Caverns/Upper Caverns/Herald Shield/Herald Shield",
     [127130009] = "@Underground Caverns/Upper Caverns/Zircon/Zircon",
-    [127130010] = "@Underground Caverns/Upper Caverns/Side Section/Succubus/Gold Ring",
+    [127130010] = "@Underground Caverns/Upper Caverns/Succubus Area/Succubus/Gold Ring",
     [127130011] = "@Underground Caverns/Upper Caverns/Bandana/Bandana",
     [127130012] = "@Underground Caverns/Upper Caverns/Shiitake (Shaft)/Shiitake (Shaft)",
-    [127130013] = "@Underground Caverns/Upper Caverns/Side Section/Claymore/Claymore",
-    [127130014] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket",
-    [127130015] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket",
-    [127130016] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket",
-    [127130017] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Meal Ticket",
-    [127130018] = "@Underground Caverns/Upper Caverns/Side Section/Succubus Approach/Moonstone",
+    [127130013] = "@Underground Caverns/Upper Caverns/Succubus Area/Claymore/Claymore",
+    [127130014] = "@Underground Caverns/Upper Caverns/Succubus Area/Succubus Approach/Meal Ticket",
+    [127130015] = "@Underground Caverns/Upper Caverns/Succubus Area/Succubus Approach/Meal Ticket",
+    [127130016] = "@Underground Caverns/Upper Caverns/Succubus Area/Succubus Approach/Meal Ticket",
+    [127130017] = "@Underground Caverns/Upper Caverns/Succubus Area/Succubus Approach/Meal Ticket",
+    [127130018] = "@Underground Caverns/Upper Caverns/Succubus Area/Succubus Approach/Moonstone",
     [127130019] = "@Underground Caverns/Upper Caverns/Scimitar/Scimitar",
     [127130020] = "@Underground Caverns/Upper Caverns/Resist Ice/Resist Ice",
     [127130021] = "@Underground Caverns/Upper Caverns/Pot Roast/Pot Roast",
@@ -455,7 +455,7 @@ LOCATIONS_MAPPING = {
     [127130035] = "@Underground Caverns/Lower Caverns/Shiitake (Near Entrance Passage)/Shiitake (Near Entrance Passage)",
     [127130036] = "@Underground Caverns/Upper Caverns/Caverns Entrance/Nunchaku",
     [127133130] = "@Underground Caverns/Upper Caverns/Scylla/Scylla kill",
-    [127133131] = "@Underground Caverns/Upper Caverns/Side Section/Succubus/Succubus Kill",
+    [127133131] = "@Underground Caverns/Upper Caverns/Succubus Area/Succubus/Succubus Kill",
     [127133132] = "@Underground Caverns/Upper Caverns/Holy Symbol/Holy Symbol",
     [127133133] = "@Underground Caverns/Lower Caverns/Merman Statue/Merman Statue",