diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json index b8f4d922b3..46a22bf2d6 100644 --- a/region/maridia/inner-pink/Aqueduct.json +++ b/region/maridia/inner-pink/Aqueduct.json @@ -684,6 +684,7 @@ } }, "requires": [ + "canComplexGMode", "canXRayClimb" ], "bypassesDoorShell": true, @@ -3351,7 +3352,7 @@ "link": [12, 3], "name": "Leave with G-Mode Snail Moonfall", "requires": [ - "canEnterGMode", + "canComplexGMode", "h_navigateUnderwater", "canEnemyStuckMoonfall", {"or": [ @@ -3379,7 +3380,7 @@ "link": [12, 4], "name": "Leave with G-Mode Snail Moonfall", "requires": [ - "canEnterGMode", + "canComplexGMode", "h_navigateUnderwater", "canEnemyStuckMoonfall", {"or": [ diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index ea0f70d639..f320dea3a0 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -1297,8 +1297,8 @@ } }, "requires": [ + "canComplexGMode", "canSuitlessMaridia", - "canInsaneJump", "canXRayClimb", "Morph" ], @@ -2364,8 +2364,8 @@ } }, "requires": [ + "canComplexGMode", "canSuitlessMaridia", - "canInsaneJump", "canXRayClimb", "Morph" ], @@ -2473,6 +2473,7 @@ "link": [5, 1], "name": "G-Mode Morph Exit Tunnel Before Leaving G-Mode", "requires": [ + "canComplexGMode", {"obstaclesCleared": ["B"]} ], "note": "If the Puyos are alive, lure the first to the right, then roll out of the hole, unmorph and fight them. Crouching while shooting may increase accuracy.", @@ -2483,6 +2484,7 @@ "link": [5, 4], "name": "G-Mode Morph Exit Tunnel Before Leaving G-Mode", "requires": [ + "canComplexGMode", {"obstaclesCleared": ["B"]} ] }, diff --git a/region/maridia/inner-pink/Botwoon Quicksand Room.json b/region/maridia/inner-pink/Botwoon Quicksand Room.json index 6985119bcc..f11d004e37 100644 --- a/region/maridia/inner-pink/Botwoon Quicksand Room.json +++ b/region/maridia/inner-pink/Botwoon Quicksand Room.json @@ -181,6 +181,7 @@ "comesThroughToilet": "any" }, "requires": [ + "canComplexGMode", "canInsaneJump", {"or": [ {"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}, @@ -258,6 +259,7 @@ "comesThroughToilet": "any" }, "requires": [ + "canComplexGMode", "canInsaneJump", {"or": [ {"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}, diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json index d1a7b4ec4c..eae98b9096 100644 --- a/region/maridia/inner-pink/Colosseum.json +++ b/region/maridia/inner-pink/Colosseum.json @@ -1606,6 +1606,7 @@ } }, "requires": [ + "canComplexGMode", "canXRayClimb" ], "bypassesDoorShell": true, diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json index 4dd311265c..0ebe4c569a 100644 --- a/region/maridia/inner-pink/Halfie Climb Room.json +++ b/region/maridia/inner-pink/Halfie Climb Room.json @@ -1550,6 +1550,7 @@ } }, "requires": [ + "canComplexGMode", {"notable": "Very Deep Stuck X-Ray Climb"}, "canXRayClimb" ], @@ -4365,19 +4366,17 @@ "link": [5, 4], "name": "G-Mode Morph, Gravity Jump, Spring Ball Jump", "requires": [ - "canEnterGMode", + "canComplexGMode", "canGravityJump", "HiJump", {"tech": "canSpringBallJumpMidAir"}, - "h_artificialMorphSpringBall", - "canInsaneJump" + "h_artificialMorphSpringBall" ], "flashSuitChecked": true, "note": [ "Climb the room with a Gravity jump + Spring Ball jump. Turn off Spring Ball and Gravity at the same time, then repause after a short delay and turn Spring back on.", "If coming from the right, Samus will be off camera." - ], - "devNote": "This requires canInsaneJump even though it is not very difficult, because it is not very intuitive and may be off camera." + ] }, { "id": 199, diff --git a/region/maridia/inner-pink/The Precious Room.json b/region/maridia/inner-pink/The Precious Room.json index e8c6ab331a..c8107e1ee4 100644 --- a/region/maridia/inner-pink/The Precious Room.json +++ b/region/maridia/inner-pink/The Precious Room.json @@ -270,6 +270,7 @@ } }, "requires": [ + "canComplexGMode", "canLongXRayClimb" ], "bypassesDoorShell": true,