Merge pull request #1915 from kjbranch/main-st-double-spring

Main Street: Add Double Spring Ball Jumps
vg-json-data · Jan 26, 2025 · d8dcb8f · d8dcb8f
2 parents 084cfaf + e4fcb19
commit d8dcb8f
Showing 1 changed file with 107 additions and 45 deletions.
diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
@@ -430,6 +430,7 @@
       "from": 13,
       "to": [
         {"id": 3},
+        {"id": 4},
         {"id": 10},
         {"id": 11}
       ]
@@ -1191,8 +1192,13 @@
         "comesThroughToilet": "no"
       },
       "requires": [
-        "h_canArtificialMorphIBJ",
-        "Gravity"
+        {"or": [
+          {"and": [
+            "Gravity",
+            "h_canArtificialMorphIBJ"
+          ]},
+          "h_canArtificialMorphDoubleSpringBallJump"
+        ]}
       ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true
@@ -1208,8 +1214,13 @@
         "comesThroughToilet": "any"
       },
       "requires": [
-        "h_canArtificialMorphIBJ",
-        "Gravity"
+        {"or": [
+          {"and": [
+            "Gravity",
+            "h_canArtificialMorphIBJ"
+          ]},
+          "h_canArtificialMorphDoubleSpringBallJump"
+        ]}
       ],
       "flashSuitChecked": true
     },
@@ -1969,8 +1980,13 @@
         }
       },
       "requires": [
-        "h_canArtificialMorphIBJ",
-        "Gravity"
+        {"or": [
+          {"and": [
+            "Gravity",
+            "h_canArtificialMorphIBJ"
+          ]},
+          "h_canArtificialMorphDoubleSpringBallJump"
+        ]}
       ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true
@@ -1985,8 +2001,13 @@
         }
       },
       "requires": [
-        "h_canArtificialMorphIBJ",
-        "Gravity"
+        {"or": [
+          {"and": [
+            "Gravity",
+            "h_canArtificialMorphIBJ"
+          ]},
+          "h_canArtificialMorphDoubleSpringBallJump"
+        ]}
       ],
       "flashSuitChecked": true
     },
@@ -3923,6 +3944,7 @@
       "link": [12, 10],
       "name": "Direct G-Mode PB Overload Speed Blocks (Get Into Position)",
       "requires": [
+        "canEnterGMode",
         {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         {"obstaclesCleared": ["B"]},
         "h_canNavigateUnderwater",
@@ -3974,6 +3996,7 @@
       "link": [12, 11],
       "name": "G-Mode Overload Speed Blocks (Bombs)",
       "requires": [
+        "canEnterGMode",
         {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "h_canUseMorphBombs",
         "h_canNavigateUnderwater",
@@ -4034,37 +4057,69 @@
     {
       "link": [13, 3],
       "name": "Exit G-Mode",
-      "requires": [],
+      "requires": [
+        "canEnterGMode"
+      ],
       "flashSuitChecked": true
     },
+    {
+      "link": [13, 4],
+      "name": "G-Mode Morph Full Climb",
+      "requires": [
+        "canEnterGMode",
+        "h_canNavigateUnderwater",
+        {"or": [
+          {"and": [
+            "h_canArtificialMorphIBJ",
+            "Gravity",
+            {"or": [
+              "h_canArtificialMorphDoubleBombJump",
+              "h_canArtificialMorphStaggeredIBJ",
+              "canBePatient",
+              "h_canArtificialMorphPowerBomb"
+            ]}
+          ]},
+          "h_canArtificialMorphDoubleSpringBallJump"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": "Climb the room with IBJ or double Spring Ball jump."
+    },
     {
       "id": 84,
       "link": [13, 10],
       "name": "Direct G-Mode Morph PB Overload Speed Blocks (Get Into Position)",
       "requires": [
+        "canEnterGMode",
         {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
+        "h_canNavigateUnderwater",
         {"obstaclesCleared": ["B"]},
-        "Gravity",
         {"or": [
-          "h_canArtificialMorphJumpIntoIBJ",
-          "h_canArtificialMorphDoubleBombJump",
-          "h_canArtificialMorphStaggeredIBJ",
-          {"and": [
-            "h_canArtificialMorphIBJ",
-            "canBeVeryPatient"
-          ]},
           {"and": [
-            "h_canArtificialMorphIBJ",
-            "h_canArtificialMorphPowerBomb"
-          ]},
-          {"and": [
-            "h_canArtificialMorphSpringBall",
-            "HiJump"
+            "Gravity",
+            {"or": [
+              "h_canArtificialMorphJumpIntoIBJ",
+              "h_canArtificialMorphDoubleBombJump",
+              "h_canArtificialMorphStaggeredIBJ",
+              {"and": [
+                "h_canArtificialMorphIBJ",
+                "canBeVeryPatient"
+              ]},
+              {"and": [
+                "h_canArtificialMorphIBJ",
+                "h_canArtificialMorphPowerBomb"
+              ]},
+              {"and": [
+                "h_canArtificialMorphSpringBall",
+                "HiJump"
+              ]},
+              {"and": [
+                "h_canArtificialMorphSpringBall",
+                "canGravityJump"
+              ]}
+            ]}
           ]},
-          {"and": [
-            "h_canArtificialMorphSpringBall",
-            "canGravityJump"
-          ]}
+          "h_canArtificialMorphDoubleSpringBallJump"
         ]}
       ],
       "flashSuitChecked": true,
@@ -4076,28 +4131,35 @@
       "link": [13, 11],
       "name": "G-Mode Morph IBJ Overload Speed Blocks",
       "requires": [
+        "canEnterGMode",
         {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
-        "h_canArtificialMorphIBJ",
-        "Gravity",
+        "h_canNavigateUnderwater",
         {"or": [
-          "h_canArtificialMorphJumpIntoIBJ",
           {"and": [
-            "h_canArtificialMorphSpringBall",
-            "HiJump"
-          ]},
-          {"and": [
-            "h_canArtificialMorphSpringBall",
-            "canGravityJump"
+            "h_canArtificialMorphIBJ",
+            "Gravity",
+            {"or": [
+              "h_canArtificialMorphJumpIntoIBJ",
+              {"and": [
+                "h_canArtificialMorphSpringBall",
+                "HiJump"
+              ]},
+              {"and": [
+                "h_canArtificialMorphSpringBall",
+                "canGravityJump"
+              ]},
+              "h_canArtificialMorphDoubleBombJump",
+              "h_canArtificialMorphStaggeredIBJ",
+              "canBeVeryPatient",
+              "h_canArtificialMorphPowerBomb"
+            ]},
+            {"or": [
+              "h_canArtificialMorphSpringBall",
+              "h_canArtificialMorphCeilingBombJump",
+              "canBeVeryPatient"
+            ]}
           ]},
-          "h_canArtificialMorphDoubleBombJump",
-          "h_canArtificialMorphStaggeredIBJ",
-          "canBeVeryPatient",
-          "h_canArtificialMorphPowerBomb"
-        ]},
-        {"or": [
-          "h_canArtificialMorphSpringBall",
-          "h_canArtificialMorphCeilingBombJump",
-          "canBeVeryPatient"
+          "h_canArtificialMorphDoubleSpringBallJump"
         ]}
       ],
       "flashSuitChecked": true,