add rmodestandupclip as a tech

nn357 · nn357 · commit 3b6bc41d9cde · 2025-11-12T22:01:45.000+09:00
diff --git a/region/maridia/inner-pink/Botwoon Hallway.json b/region/maridia/inner-pink/Botwoon Hallway.json
@@ -426,7 +426,7 @@
       "requires": [
         "canBeExtremelyPatient",
         "canSuitlessMaridia",
-       "h_underwaterCrouchJumpDownGrab",
+        "h_underwaterCrouchJumpDownGrab",
         "h_10PowerBombCrystalFlash",
         {"resetRoom": {"nodes": [1]}}
       ],
@@ -444,12 +444,12 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canRModeStandupClip",
         {"disableEquipment": "ETank"},
         {"disableEquipment": "Gravity"},
         {"disableEquipment": "HiJump"},
         {"resourceAvailable": [{"type": "Energy", "count": 99}]},
         {"or": [
-            "canBeVeryPatient",
             {"and": [
                 "canMidAirMorph",
                 "canBePatient"
@@ -460,49 +460,11 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "Gravity suit allows easy traversal of the room and the ability to outrun the mochtroid to safely damage it down and get it into position",
         "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. The Mochtroid must be killed quickly after the clip if the crumbles are broken.",
+        "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."
       ]
     },
-    {
-      "link": [1, 2],
-      "name": "Suitless R-Mode Forced Standup Clip (Left to Right)",
-      "entranceCondition": {
-        "comeInWithRMode": {},
-        "comesThroughToilet": "any"
-      },
-      "requires": [
-        {"disableEquipment": "ETank"},
-        {"resourceAvailable": [{"type": "Energy", "count": 99}]},
-        "canSuitlessMaridia",
-        "h_underwaterCrouchJumpDownGrab",
-        "canCarefulJump",
-        {"or": [
-            "canBeExtremelyPatient",
-            {"and": [
-                "Morph",
-                "canBeVeryPatient",
-                {"or": [
-                    "Plasma",
-                    "Wave",
-                    {"ammo": {"type": "Super", "count": 1}},
-                    {"ammo": {"type": "Missile", "count": 1}}
-                ]}
-            ]}
-        ]},
-        {"partialRefill": {"type": "ReserveEnergy"}},
-        {"autoReserveTrigger": {}}
-      ],
-      "flashSuitChecked": true,
-      "note": [
-        "Without Ammo, Plasma Beam or Wave Beam the mochtroid must be carefully damaged down by breaking the crumbles in a way to not release it.",
-        "Perform a 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. The Mochtroid must be killed quickly after the clip if the crumbles are broken.",
-        "If Morph is available a jump morph towards the crumbles can be used for more leniency, giving a 9 frame window compared to 3 frames for the crouch jump."
-      ]
-    },
     {
       "id": 33,
       "link": [1, 2],
@@ -780,70 +742,34 @@
         "it could require too much patience, considering that the chain continues into the next room."
       ]
     },
-        {
+    {
       "link": [2, 1],
-      "name": "R-Mode Forced Standup Clip (Left to Right)",
+      "name": "R-Mode Forced Standup Clip (Right to Left)",
       "entranceCondition": {
         "comeInWithRMode": {}
       },
       "requires": [
+        "canRModeStandupClip",
         {"disableEquipment": "ETank"},
+        {"disableEquipment": "Gravity"},
+        {"disableEquipment": "HiJump"},
         {"resourceAvailable": [{"type": "Energy", "count": 99}]},
-        "Gravity",
         {"or": [
-            "canBeVeryPatient",
             {"and": [
-                "Morph",
+                "canMidAirMorph",
                 "canBePatient"
             ]}
         ]},
-        {"partialRefill": {"type": "ReserveEnergy"}},
+        {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
         {"autoReserveTrigger": {}}
       ],
       "flashSuitChecked": true,
       "note": [
-        "Gravity suit allows easy traversal of the room and the ability to outrun the mochtroid to safely damage it down and get it into position",
         "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. The Mochtroid must be killed quickly after the clip if the crumbles are broken.",
+        "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."
       ]
     },
-    {
-      "link": [2, 1],
-      "name": "Suitless R-Mode Forced Standup Clip (Left to Right)",
-      "entranceCondition": {
-        "comeInWithRMode": {}
-      },
-      "requires": [
-        {"disableEquipment": "ETank"},
-        {"resourceAvailable": [{"type": "Energy", "count": 99}]},
-        "canSuitlessMaridia",
-        "h_underwaterCrouchJumpDownGrab",
-        "canCarefulJump",
-        {"or": [
-            "canBeExtremelyPatient",
-            {"and": [
-                "Morph",
-                "canBeVeryPatient",
-            {"or": [
-                "Plasma",
-                "Wave",
-                {"ammo": {"type": "Super", "count": 1}},
-                {"ammo": {"type": "Missile", "count": 1}}
-            ]}
-            ]}
-        ]},
-        {"partialRefill": {"type": "ReserveEnergy"}},
-        {"autoReserveTrigger": {}}
-      ],
-      "flashSuitChecked": true,
-      "note": [
-        "Without Ammo, Plasma Beam or Wave Beam the mochtroid must be carefully damaged down by breaking the crumbles in a way to not release it.",
-        "Perform a 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. The Mochtroid must be killed quickly after the clip if the crumbles are broken.",
-        "If Morph is available a jump morph towards the crumbles can be used for more leniency, giving a 9 frame window compared to 3 frames for the crouch jump."
-      ]
-    },
     {
       "id": 21,
       "link": [2, 1],
diff --git a/tech.json b/tech.json
@@ -3013,6 +3013,23 @@
           "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": [
+                {"or": [
+                  "canBeVeryPatient",
+                  "Morph"
+                ]}
+              ],
+              "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."
+              ]
+            }
           ]
         },
         {
