Merge pull request #2190 from kjbranch/g-w-maridia

Outer Maridia G-Mode: Second Pass

Author: osse101

region/maridia/outer/Crab Hole.json

@@ -712,9 +712,12 @@
             "Gravity",
             "h_artificialMorphBombHorizontally",
             {"or": [
-              "h_artificialMorphBombThings",
-              "canTrickyJump",
-              {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}}
+              "h_additionalBomb",
+              "canTrickyGMode",
+              {"and": [
+                "canTrickyDodgeEnemies",
+                "canGravityJump"
+              ]}
             ]}
           ]}
         ]}
@@ -725,9 +728,10 @@
         }
       },
       "flashSuitChecked": true,
-      "note": [
-        "To save a bomb, it is possible but difficult to roll from the doorway onto the platform with Gravity turned off.",
-        "This requires backing up slightly after entering the room then quickly rolling before the crabs. It is a bit tighter in direct G-Mode."
+      "note": "To save a bomb, it is possible to roll from the doorway onto the platform with movement similar to a Gravity jump - hold forward just before the pause to disable gravity.",
+      "devNote": [
+        "It is possible to cross with a single Power Bomb, but it requires a last pixel jump with a frame perfect forward press.",
+        "A crab hit could bounce Samus onto the middle platform, but the gravity jump is better. If Samus has a blue suit and cant pause, then she also cant boost from the crab."
       ]
     },
     {
@@ -3524,7 +3528,15 @@
           ]},
           {"and": [
             "Gravity",
-            "h_artificialMorphBombHorizontally"
+            "h_artificialMorphBombHorizontally",
+            {"or": [
+              "h_additionalBomb",
+              "canTrickyGMode",
+              {"and": [
+                "canTrickyJump",
+                "canGravityJump"
+              ]}
+            ]}
           ]}
         ]}
       ],
@@ -3534,7 +3546,11 @@
         }
       },
       "flashSuitChecked": true,
-      "note": "To save a bomb, it is possible to roll from the doorway onto the platform with Gravity turned off."
+      "note": "To save a bomb, it is possible to roll from the doorway onto the platform with similar to a Gravity jump - hold forward just before the pause to disable gravity.",
+      "devNote": [
+        "It is possible to cross with a single Power Bomb, but it requires a last pixel jump with a frame perfect forward press.",
+        "A crab hit could bounce Samus onto the middle platform, but the gravity jump is better. If Samus has a blue suit and cant pause, then she also cant boost from the crab."
+      ]
     },
     {
       "id": 100,

region/maridia/outer/Fish Tank.json

@@ -713,15 +713,6 @@
             "canJumpIntoIBJ",
             "canBombHorizontally"
           ]},
-          {"and": [
-            "HiJump",
-            "canTrickyDashJump"
-          ]},
-          {"and": [
-            "canUseFrozenEnemies",
-            "HiJump",
-            "SpeedBooster"
-          ]},
           "h_maxHeightSpringBallJump",
           {"and": [
             "HiJump",
@@ -738,6 +729,31 @@
         "canGravityJump"
       ]
     },
+    {
+      "link": [1, 5],
+      "name": "Jump to the Frozen Fish",
+      "requires": [
+        "Gravity",
+        "canUseFrozenEnemies",
+        "HiJump",
+        "SpeedBooster"
+      ]
+    },
+    {
+      "link": [1, 5],
+      "name": "Tricky Dash Jump",
+      "requires": [
+        "Gravity",
+        "HiJump",
+        "canTrickyDashJump",
+        "canDownGrab"
+      ],
+      "note": [
+        "Get a tricky dash jump running up the hill, then precisely down grab at the top.",
+        "It is best to start a few pixels away from the edge of the runway, so that Samus can jump at the correct frame and while being higher up the hill."
+      ],
+      "devNote": "A down grab is not strictly necessary, but it makes it much easier."
+    },
     {
       "id": 14,
       "link": [1, 5],
@@ -2304,6 +2320,33 @@
       "bypassesDoorShell": "free",
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 3],
+      "name": "Carry G-Mode Back Up, Bomb Into Spring Ball Jump",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "h_artificialMorphUnderwaterBombIntoSpringBallJump"
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": "free",
+      "flashSuitChecked": true,
+      "note": [
+        "Pause and jump just before the fade out finishes. Turn off Spring Ball and place a Bomb just above where Samus' head would be if standing.",
+        "Pause again between 23-25 frames later and equip Spring Ball; Samus has a three frame window where she has upward momentum from the Bomb and can jump again.",
+        "The positioning of the Bomb is quite lenient, with an 11 frame window for where it can be placed.",
+        "Unmorph at the top of the jump to touch the transition blocks."
+      ]
+    },
     {
       "id": 47,
       "link": [3, 7],
@@ -2374,7 +2417,8 @@
               ]},
               {"and": [
                 "HiJump",
-                "canTrickyDashJump"
+                "canTrickyDashJump",
+                "canDownGrab"
               ]},
               "h_maxHeightSpringBallJump",
               {"and": [

region/maridia/outer/Main Street.json

@@ -195,7 +195,8 @@
         [1, 1, 0],
         [1, 1, 1],
         [1, 1, 0]
-      ]
+      ],
+      "devNote": "Currently this node is only used to overload the speed blocks then use global crab to collect the item."
     },
     {
       "id": 11,
@@ -211,7 +212,8 @@
         [1, 1, 0],
         [1, 1, 1],
         [1, 1, 0]
-      ]
+      ],
+      "devNote": "Currently this node is only used to overload the speed blocks then use global crab to collect the item."
     },
     {
       "id": 12,
@@ -227,7 +229,8 @@
         [1, 1, 0],
         [1, 1, 2],
         [1, 1, 0]
-      ]
+      ],
+      "devNote": "Currently this node is only used to overload the speed blocks then use global crab to collect the item."
     },
     {
       "id": 13,
@@ -1158,6 +1161,7 @@
         "comesThroughToilet": "no"
       },
       "requires": [
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "h_navigateUnderwater",
         {"or": [
           "canGravityJump",
@@ -1210,6 +1214,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "h_navigateUnderwater",
         {"or": [
           "canGravityJump",
@@ -1264,7 +1269,17 @@
         {"or": [
           {"and": [
             "Gravity",
-            "h_artificialMorphIBJ"
+            {"or": [
+              "h_artificialMorphIBJ",
+              {"and": [
+                "h_artificialMorphSpringBall",
+                "HiJump"
+              ]},
+              {"and": [
+                "h_artificialMorphSpringBall",
+                "canGravityJump"
+              ]}
+            ]}
           ]},
           "h_artificialMorphDoubleSpringBallJump"
         ]}
@@ -2184,6 +2199,7 @@
         }
       },
       "requires": [
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "h_navigateUnderwater",
         {"or": [
           "canGravityJump",
@@ -2235,6 +2251,7 @@
         }
       },
       "requires": [
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "h_navigateUnderwater",
         {"or": [
           "canGravityJump",
@@ -2288,7 +2305,17 @@
         {"or": [
           {"and": [
             "Gravity",
-            "h_artificialMorphIBJ"
+            {"or": [
+              "h_artificialMorphIBJ",
+              {"and": [
+                "h_artificialMorphSpringBall",
+                "HiJump"
+              ]},
+              {"and": [
+                "h_artificialMorphSpringBall",
+                "canGravityJump"
+              ]}
+            ]}
           ]},
           "h_artificialMorphDoubleSpringBallJump"
         ]}
@@ -3396,7 +3423,9 @@
           "morphed": false
         }
       },
-      "requires": [],
+      "requires": [
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}
+      ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true,
       "devNote": "FIXME: Immobile strats may need canBeVeryPatient if they can't be done before the crab is in position"
@@ -3411,7 +3440,9 @@
           "morphed": false
         }
       },
-      "requires": [],
+      "requires": [
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}
+      ],
       "flashSuitChecked": true,
       "devNote": "FIXME: Immobile strats may need canBeVeryPatient if they can't be done before the crab is in position"
     },
@@ -4381,30 +4412,11 @@
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "The crab will not come through the whole tunnel, so wait for it to pass before going through the vertical portion."
-    },
-    {
-      "id": 119,
-      "link": [5, 7],
-      "name": "Direct G-Mode Morph",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": true
-        }
-      },
-      "requires": [
-        "h_EverestMorphTunnelExpanded",
-        {"or": [
-          "h_artificialMorphSpringBall",
-          {"and": [
-            "Gravity",
-            "h_artificialMorphBombThings"
-          ]}
-        ]}
-      ],
-      "flashSuitChecked": true,
-      "note": "The crab will not come through the whole tunnel, so wait for it to pass before going through the vertical portion."
+      "note": "The crab will not come through the whole tunnel, so wait for it to pass before going through the vertical portion.",
+      "devNote": [
+        "The tunnel does not need to be expanded for Samus to get into the morph tunnel without getting stuck,",
+        "regardless of if she has Morph or artificial morph, and is in direct or indirect G-mode."
+      ]
     },
     {
       "id": 120,
@@ -4420,6 +4432,7 @@
       "name": "Kill Frozen Crab with Wave",
       "requires": [
         "canEnterGMode",
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "Wave",
         {"obstaclesCleared": ["C"]}
       ],
@@ -4432,6 +4445,7 @@
       "name": "Kago Frozen Crab",
       "requires": [
         "canEnterGMode",
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "canKago",
         {"or": [
           {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}},
@@ -5256,6 +5270,7 @@
       "name": "Indirect G-Mode Crystal Flash",
       "requires": [
         "canEnterGMode",
+        {"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
         "h_artificialMorphCrystalFlash",
         {"obstaclesNotCleared": ["B"]}
       ],