refine G-mode Ridley, accounting for both top and bottom stuck options

Author: blkerby

logicalRequirements.md

@@ -670,8 +670,9 @@ Heat frame requirements should be included for the period before the fight begin
 If neither Morph nor Screw Attack are available, then at the highest skill level it can be assumed that the player takes unavoidable enemy damage at a rate of 10 energy per second. If Morph or Screw Attack is available, then it is possible to avoid all enemy damage, but for leniency normally some damage should still be assumed.
 
 A `ridleyKill` requirement has the following optional properties which modify the assumptions of the fight:
-* _gMode_: A boolean indicating if the fight happens in G-mode. If true, then Samus will be protected from heat damage, but Ridley's fireballs become invisible and immobile while still being dangerous to Samus.
-- _stuck_: A boolean indicating that the fight happens with Ridley stuck in a corner, where Samus can freely avoid damage from Ridley while inflicting damage to Ridley at a higher rate:
+- _powerBombs_: A boolean indicating if Power Bombs can be used during the fight (default: true).
+- _gMode_: A boolean indicating if the fight happens in G-mode. If true, then Samus will be protected from heat damage, but Ridley's fireballs become invisible and immobile while still being dangerous to Samus.
+- _stuck_: An enum with possible values "top" or "bottom", indicating the part of the room where Ridley gets stuck, allowing Samus can freely avoid damage from Ridley while inflicting damage to Ridley. If Ridley is stuck at the bottom of the room, then damage can be inflicted at a higher rate (not taking into account lag, which may be increased by using a Crystal Flash in G-mode):
   - Supers can be used once every 0.34 seconds.
   - Missiles can be used once every 0.17 seconds.
   - Power Bombs can be used once every 2.65 seconds.

region/lowernorfair/east/Ridley's Room.json

@@ -407,21 +407,40 @@
       "requires": [
         {"notable": "G-Mode Crystal Flash Stuck Ridley"},
         "h_CrystalFlash",
+        "h_usePowerBomb",
         {"or": [
-          "canArtificialMorph",
-          "canWalljump"
+          {"and": [
+            {"or": [
+              "canWalljump",
+              "HiJump",
+              "canSpringBallJumpMidAir",
+              "SpaceJump"
+            ]},
+            {"ridleyKill": {
+              "powerBombs": false,
+              "gMode": true,
+              "stuck": "bottom"}
+            }
+          ]},
+          {"ridleyKill": {
+            "powerBombs": false,
+            "gMode": true,
+            "stuck": "top"
+          }}
         ]},
-        "h_usePowerBomb",
-        {"ridleyKill": {"gMode": true, "stuck": true}},
         {"autoReserveTrigger": {}},
-        {"heatFrames": 600},
+        {"heatFrames": 720},
         {"partialRefill": {"type": "Energy", "limit": 100}}
       ],
       "setsFlags": ["f_DefeatedRidley"],
       "note": [
-        "Enter the room in G-mode, perform a Crystal Flash, then lay a Power Bomb in the top-right.",
-        "The Power Bomb will not explode but will continually force Ridley into the lower-left of the room.",
-        "After reducing Ridley's health to zero, take damage from Ridley to trigger auto-reserves and exit G-mode.",
+        "Enter the room in G-mode, perform a Crystal Flash, then lay an additional Power Bomb, preferably at the top of the room.",
+        "The Power Bomb will not explode but will continually force Ridley into a corner of the room.",
+        "If the Power Bomb is laid near the top of the room, then Ridley will be forced into the bottom of the room,",
+        "making it easy to damage Ridley at the highest possible rate;",
+        "if the Power Bomb is laid lower, Ridley will be forced to the top of room, and Samus will have to jump repeatedly to bring it on camera.",
+        "in which case Ridley can still be damaged but more slowly and with some caution needed to avoid invisible fireballs.",
+        "After reducing Ridley's health to zero, take damage from Ridley or an invisible fireball to trigger auto-reserves and exit G-mode.",
         "Then get grabbed by Ridley to finish the fight."
       ]
     },
@@ -648,22 +667,45 @@
       "requires": [
         {"notable": "G-Mode Crystal Flash Stuck Ridley"},
         "h_CrystalFlash",
+        "h_usePowerBomb",
         {"or": [
-          "canArtificialMorph",
-          "canWalljump"
+          {"and": [
+            {"or": [
+              "canWalljump",
+              "HiJump",
+              "canSpringBallJumpMidAir",
+              "SpaceJump"
+            ]},
+            {"ridleyKill": {
+              "powerBombs": false,
+              "gMode": true,
+              "stuck": "bottom"}
+            }
+          ]},
+          {"ridleyKill": {
+            "powerBombs": false,
+            "gMode": true,
+            "stuck": "top"
+          }}
         ]},
-        "h_usePowerBomb",
-        {"ridleyKill": {"gMode": true, "stuck": true}},
         {"autoReserveTrigger": {}},
-        {"heatFrames": 600},
+        {"heatFrames": 720},
         {"partialRefill": {"type": "Energy", "limit": 100}}
       ],
       "setsFlags": ["f_DefeatedRidley"],
       "note": [
-        "Enter the room in G-mode, perform a Crystal Flash, then lay a Power Bomb in the top-right.",
-        "The Power Bomb will not explode but will continually force Ridley into the lower-left of the room.",
-        "After reducing Ridley's health to zero, take damage from Ridley to trigger auto-reserves and exit G-mode.",
+        "Enter the room in G-mode, perform a Crystal Flash, then lay an additional Power Bomb, preferably at the top of the room.",
+        "The Power Bomb will not explode but will continually force Ridley into a corner of the room.",
+        "If the Power Bomb is laid near the top of the room, then Ridley will be forced into the bottom of the room,",
+        "making it easy to damage Ridley at the highest possible rate;",
+        "if the Power Bomb is laid lower, Ridley will be forced to the top of room, and Samus will have to jump repeatedly to bring it on camera.",
+        "in which case Ridley can still be damaged but more slowly and with some caution needed to avoid invisible fireballs.",
+        "After reducing Ridley's health to zero, take damage from Ridley or an invisible fireball to trigger auto-reserves and exit G-mode.",
         "Then get grabbed by Ridley to finish the fight."
+      ],
+      "devNote": [
+        "FIXME: artificial morph with direct G-mode is another option for laying a Power Bomb at the top of the room,",
+        "by landing on the door ledge on entry."
       ]
     },
     {

schema/m3-requirements.schema.json

@@ -850,15 +850,21 @@
             "description": "Fulfilled by killing Ridley, including ammo, energy, and skill requirements.",
             "additionalProperties": false,
             "properties": {
+              "powerBombs": {
+                "type": "boolean",
+                "default": true,
+                "description": "Whether Power Bombs can be used during the fight."
+              },
               "gMode": {
                 "type": "boolean",
                 "default": false,
                 "description": "Whether the Ridley kill happens while in G-mode, preventing heat damage while making Ridley's fireballs immobile."
               },
               "stuck": {
-                "type": "boolean",
-                "default": false,
-                "description": "Whether the Ridley kill happens with Ridley stuck in a corner, preventing body damage."
+                "type": "string",
+                "enum": [null, "top", "bottom"],
+                "default": null,
+                "description": "If applicable, the part of the room where Ridley is stuck."
               }
             }
           }