Merge pull request #1744 from kjbranch/ceiling-ibj

Add Missing Ceiling Bomb Jumps and G-Mode Open Green Gates

Author: osse101

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -776,6 +776,21 @@
         "This strat is easily bypassed by jumping through the door, or if the door can be opened."
       ]
     },
+    {
+      "link": [3, 1],
+      "name": "Bomb Boost Water Escape Into IBJ",
+      "requires": [
+        "canBombJumpWaterEscape",
+        "canJumpIntoIBJ",
+        {"or": [
+          "canTrickyCarryFlashSuit",
+          {"noFlashSuit": {}}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": "When the water is high, jump and place a Bomb on the descent just above the water, then very quickly crouch jump to hit the Bomb and IBJ.",
+      "devNote": "The crouch jump is not necessary, but is helpful. Preserving a flash suit is still difficult without the crouch jump."
+    },
     {
       "id": 40,
       "link": [3, 1],
@@ -814,4 +829,4 @@
   "nextStratId": 43,
   "notables": [],
   "nextNotableId": 1
-}
+}

region/brinstar/red/Caterpillar Room.json

@@ -2130,6 +2130,20 @@
         "Let the Zero climb the right wall and jump on top of it in Morph Ball form to bounce up to the Cacatac platform."
       ]
     },
+    {
+      "link": [5, 5],
+      "name": "G-Mode Indirect Despawn the Gate, Open Gate",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": true
+        }
+      },
+      "requires": [],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "note": "Exit G-Mode whle under the gate to open it without a Super."
+    },
     {
       "id": 92,
       "link": [5, 6],

region/crateria/central/Crateria Super Room.json

@@ -1233,7 +1233,11 @@
         "canEnterGMode",
         {"obstaclesCleared": ["C"]}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "devNote": [
+        "FIXME: It would be possible to remote acquire to the left after using spring into ceiling bomb jump,",
+        "but it would require restructuring the room and an extremely long CIBJ."
+      ]
     },
     {
       "id": 50,
@@ -1303,9 +1307,14 @@
       "name": "Jump into Ceiling Bomb Jump Over Spikes",
       "requires": [
         "canLongCeilingBombJump",
-        "canPreciseWalljump",
-        "canWallJumpInstantMorph",
-        "canJumpIntoIBJ"
+        "canJumpIntoIBJ",
+        {"or": [
+          "h_canUseSpringBall",
+          {"and": [
+            "canPreciseWalljump",
+            "canWallJumpInstantMorph"
+          ]}
+        ]}
       ]
     },
     {

region/maridia/outer/Crab Tunnel.json

@@ -226,16 +226,20 @@
     {
       "id": 10,
       "link": [1, 2],
-      "name": "Indirect G-Mode Gate Despawn",
+      "name": "G-Mode Indirect Despawn the Gate, Open Gate",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "indirect",
           "morphed": false
         }
       },
       "requires": [],
+      "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "note": "The gate will not spawn in indirect g-mode, and can be freely passed."
+      "note": [
+        "The gate will not spawn in indirect G-Mode, and can be freely passed.",
+        "Exit G-Mode whle under the gate to open it without a Super."
+      ]
     },
     {
       "id": 11,
@@ -331,16 +335,20 @@
     {
       "id": 15,
       "link": [2, 1],
-      "name": "Indirect G-Mode Gate Despawn",
+      "name": "G-Mode Indirect Despawn the Gate, Open Gate",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "indirect",
           "morphed": false
         }
       },
       "requires": [],
+      "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "note": "The gate will not spawn in indirect g-mode, and can be freely passed."
+      "note": [
+        "The gate will not spawn in indirect G-Mode, and can be freely passed.",
+        "Exit G-Mode whle under the gate to open it without a Super."
+      ]
     },
     {
       "id": 16,

region/norfair/crocomire/Grapple Tutorial Room 3.json

@@ -98,6 +98,7 @@
       "from": 3,
       "to": [
         {"id": 2},
+        {"id": 3},
         {"id": 4}
       ]
     },
@@ -367,7 +368,8 @@
         "4- Quickly climb up to the last ledge before the door.",
         "5- Run, jump, dboost off a Gamet.",
         "6- Dboost a second time off the Gamet to cross the second moat."
-      ]
+      ],
+      "devNote": "FIXME: A ceiling bomb jump could be added if Samus could not take an enemy hit."
     },
     {
       "id": 13,
@@ -727,16 +729,17 @@
     {
       "id": 33,
       "link": [2, 2],
-      "name": "G-Mode Indirect Despawn the Gate",
+      "name": "G-Mode Indirect Despawn the Gate, Open Gate",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "indirect",
           "morphed": false
         }
       },
       "requires": [],
-      "clearsObstacles": ["B"],
-      "flashSuitChecked": true
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "note": "Exit G-Mode whle under the gate to open it without a Super."
     },
     {
       "id": 34,
@@ -751,24 +754,6 @@
       "clearsObstacles": ["A"],
       "flashSuitChecked": true
     },
-    {
-      "id": 35,
-      "link": [2, 3],
-      "name": "Go Through Missing Gate",
-      "requires": [
-        {"obstaclesCleared": ["B"]}
-      ],
-      "resetsObstacles": ["B"]
-    },
-    {
-      "id": 36,
-      "link": [2, 4],
-      "name": "Go Through Missing Gate",
-      "requires": [
-        {"obstaclesCleared": ["B"]}
-      ],
-      "resetsObstacles": ["B"]
-    },
     {
       "id": 37,
       "link": [3, 2],
@@ -783,12 +768,15 @@
     },
     {
       "id": 38,
-      "link": [3, 2],
-      "name": "Go Through Missing Gate",
+      "link": [3, 3],
+      "name": "Exit G-Mode to Open Gate",
       "requires": [
         {"obstaclesCleared": ["B"]}
       ],
-      "resetsObstacles": ["B"]
+      "resetsObstacles": ["B"],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "note": "Exit G-Mode whle under the gate to open it without a Super."
     },
     {
       "id": 39,

region/norfair/east/Double Chamber.json

@@ -1300,6 +1300,19 @@
         "Climb the left wall while avoiding falling onto the spikes or through the crumble blocks. The ledge is the same size of that in writg."
       ]
     },
+    {
+      "link": [3, 4],
+      "name": "Ceiling Bomb Jump Over Spikes",
+      "requires": [
+        "h_heatProof",
+        "canCeilingBombJump",
+        "canResetFallSpeed"
+      ],
+      "note": [
+        "Samus can ceiling bomb jump up gentle slopes.",
+        "Going down gentle slopes is also possible but harder, instead an unmorph to reset fall speed is recommended here."
+      ]
+    },
     {
       "id": 60,
       "link": [3, 5],
@@ -1515,6 +1528,19 @@
       "note": "A short hop from the ledge can bounce on the crumbles and into the spikes.  Just be careful of being pushed back onto the crumble blocks by the spikes.",
       "devNote": "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
     },
+    {
+      "link": [4, 3],
+      "name": "Ceiling Bomb Jump Over Spikes",
+      "requires": [
+        "h_heatProof",
+        "canCeilingBombJump",
+        "canResetFallSpeed"
+      ],
+      "note": [
+        "Samus can ceiling bomb jump up gentle slopes.",
+        "Going down gentle slopes is also possible but harder, instead an unmorph to reset fall speed is recommended here."
+      ]
+    },
     {
       "id": 73,
       "link": [4, 4],

region/norfair/east/Spiky Acid Snakes Tunnel.json

@@ -339,6 +339,19 @@
         "Delay the damage boost from the spikes slightly in order to rise above the lava before moving."
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "Ceiling Bomb Jump Over Spikes",
+      "requires": [
+        "h_heatProof",
+        "canLongCeilingBombJump",
+        "canResetFallSpeed"
+      ],
+      "note": [
+        "Samus can ceiling bomb jump up gentle slopes.",
+        "Going down gentle slopes is also possible but harder, instead an unmorph to reset fall speed is recommended here."
+      ]
+    },
     {
       "id": 17,
       "link": [2, 1],
@@ -665,6 +678,19 @@
         }
       }
     },
+    {
+      "link": [2, 1],
+      "name": "Ceiling Bomb Jump Over Spikes",
+      "requires": [
+        "h_heatProof",
+        "canLongCeilingBombJump",
+        "canResetFallSpeed"
+      ],
+      "note": [
+        "Samus can ceiling bomb jump up gentle slopes.",
+        "Going down gentle slopes is also possible but harder, instead an unmorph to reset fall speed is recommended here."
+      ]
+    },
     {
       "id": 35,
       "link": [2, 2],

region/wreckedship/main/Bowling Alley.json

@@ -760,7 +760,8 @@
         "canLongCeilingBombJump",
         "canBeVeryPatient"
       ],
-      "note": "This is a very long ceiling bomb jump."
+      "note": "This is a very long ceiling bomb jump.",
+      "devNote": "There is no reason to go back to the left."
     },
     {
       "id": 35,