Merge pull request #2402 from nn357/botwoonhallway

add 10pb cf clip and rmode standup clip to botwoon hallway

Author: osse101

region/maridia/inner-pink/Botwoon Hallway.json

@@ -405,6 +405,69 @@
         "This is for the much harder version, without Gravity and Bombs."
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "10 Power Bomb Crystal Flash Clip with Bombs (Left to Right)",
+      "requires": [
+        "canBeVeryPatient",
+        {"tech": "canBombIntoCrystalFlashClip"},
+        "Bombs",
+        "Gravity",
+        "h_10PowerBombCrystalFlash",
+        {"resetRoom": {"nodes": [1]}}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Lure a Puyo close to the crumble blocks and time the first bomb with the Puyo's jump so that the bomb will kill the Puyo."
+      ]
+    },
+    {
+      "link": [1, 2],
+      "name": "Suitless 10 Power Bomb Crystal Flash Clip (Left to Right)",
+      "requires": [
+        "canBeExtremelyPatient",
+        "canSuitlessMaridia",
+        {"tech": "canJumpIntoCrystalFlashClip"},
+        "h_underwaterCrouchJumpDownGrab",
+        "h_10PowerBombCrystalFlash",
+        {"resetRoom": {"nodes": [1]}}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Lure a Puyo close to the crumble blocks and time it so you can kill it and collect its drop without getting hit.",
+        "Alternativly you can start with more health and time the PowerBomb explosion with a Puyo hit to collect the drop automatically."
+      ]
+    },
+    {
+      "link": [1, 2],
+      "name": "R-Mode Forced Standup Clip (Left to Right)",
+      "entranceCondition": {
+        "comeInWithRMode": {},
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "canRModeStandupClip",
+        {"disableEquipment": "ETank"},
+        {"disableEquipment": "Gravity"},
+        {"disableEquipment": "HiJump"},
+        {"resourceAvailable": [{"type": "Energy", "count": 99}]},
+        {"or": [
+          "canBeVeryPatient",
+          {"and": [
+            "canMidAirMorph",
+            "canBePatient"
+          ]}
+        ]},
+        {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+        {"autoReserveTrigger": {}}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Perform a suitless crouch jump at the crumbles so that the reserve trigger forced standup happens just before Samus contacts the crumbles and still has upwards momentum.",
+        "Hold down during the forced standup until through the crumbles or they break.",
+        "If Morph is available a jump morph can be used for more leniency, giving a 9 frame window compared to 3 frames for the crouch jump."
+      ]
+    },
     {
       "id": 33,
       "link": [1, 2],
@@ -682,6 +745,35 @@
         "it could require too much patience, considering that the chain continues into the next room."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "R-Mode Forced Standup Clip (Right to Left)",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        "canRModeStandupClip",
+        {"disableEquipment": "ETank"},
+        {"disableEquipment": "Gravity"},
+        {"disableEquipment": "HiJump"},
+        {"resourceAvailable": [{"type": "Energy", "count": 99}]},
+        {"or": [
+          "canBeVeryPatient",
+          {"and": [
+            "canMidAirMorph",
+            "canBePatient"
+          ]}
+        ]},
+        {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+        {"autoReserveTrigger": {}}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Perform a suitless crouch jump at the crumbles so that the reserve trigger forced standup happens just before Samus contacts the crumbles and still has upwards momentum.",
+        "Hold down during the forced standup until through the crumbles or they break.",
+        "If Morph is available a jump morph can be used for more leniency, giving a 9 frame window compared to 3 frames for the crouch jump."
+      ]
+    },
     {
       "id": 21,
       "link": [2, 1],
@@ -992,4 +1084,4 @@
   ],
   "nextStratId": 39,
   "nextNotableId": 3
-}
+}

tech.json

@@ -3075,6 +3075,18 @@
           "note": [
             "Ability to enter R-mode.",
             "Have some energy in reserves (set to Auto), take damage while going through a door, use X-Ray while entering the next room, and release X-Ray after reserves have finished filling."
+          ],
+           "extensionTechs": [
+            {
+              "name": "canRModeStandupClip",
+              "techRequires": [
+                "canRMode"
+              ],
+              "otherRequires": [],
+              "note": [
+                "After entering a room in R-Mode, put some energy into reserves (set to Auto) and then have reserves trigger to force Samus into a standing pose."
+              ]
+            }
           ]
         },
         {