Ridley G-mode and ridleyKill requirement

Author: blkerby

logicalRequirements.md

@@ -651,6 +651,32 @@ __Example:__
 {"noFlashSuit": {}}
 ```
 
+### Boss requirements
+
+#### Ridley kill
+
+A `ridleyKill` requirement represents the need to kill Ridley, including ammo and energy requirements depending on the player's assumed skill level and available items. The expected duration of the fight can be estimated based on the following:
+- Supers can be used once every 0.5 seconds.
+- Missiles can be used once every 0.34 seconds.
+- Power Bombs can be used once every 3 seconds.
+- A charged beam shot can be used once every 1.4 seconds.
+
+Patience requirements `canBePatient`, `canBeVeryPatient`, and `canBeExtremelyPatient` should be applied based on the expected duration of the fight.
+
+A leniency multiplier should normally be applied to the time taken between shots, as well as to the accuracy rate of shots hitting Ridley successfully.
+
+Heat frame requirements should be included for the period before the fight begins, as well as after the fight until drops occurs, which can be estimated (slightly generously) at 16 seconds, or 960 heat frames.
+
+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:
+  - 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.
+  - A charged beam shot can be used once every 1.1 seconds.
+
 ### Other requirements
 
 #### tech object

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

@@ -395,6 +395,65 @@
         {"heatFrames": 50}
       ]
     },
+    {
+      "link": [1, 3],
+      "name": "G-Mode Crystal Flash Stuck Ridley",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"notable": "G-Mode Crystal Flash Stuck Ridley"},
+        "h_CrystalFlash",
+        {"or": [
+          "canArtificialMorph",
+          "canWalljump"
+        ]},
+        "h_usePowerBomb",
+        {"ridleyKill": {"gMode": true, "stuck": true}},
+        {"autoReserveTrigger": {}},
+        {"heatFrames": 600},
+        {"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.",
+        "Then get grabbed by Ridley to finish the fight."
+      ]
+    },
+    {
+      "link": [1, 3],
+      "name": "G-Mode Ridley with 30 Supers",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"notable": "G-Mode Ridley with 30 Supers"},
+        {"heatFrames": 0},
+        {"ammo": {"type": "Super", "count": 30}},
+        {"partialRefill": {"type": "Energy", "limit": 100}}
+      ],
+      "setsFlags": ["f_DefeatedRidley"],
+      "note": [
+        "Enter the room in G-mode and quickly kill Ridley with 30 Supers.",
+        "G-mode protects against heat damage but also causes Ridley's fireballs to be invisible and not move.",
+        "As long as Ridley is swooping, not many fireballs will be placed, so delaying Ridley from pogoing can be helpful.",
+        "Once Ridley begins pogoing, it generally becomes unsafe for Samus to jump high because of the risk of touching a fireball.",
+        "By the end of the fight, projectiles will probably be overloaded, causing Ridley's drops not to spawn;",
+        "to solve this, exit G-mode just before drops spawn, and pause abuse in order to collect them."
+      ],
+      "devNote": [
+        "Leaving back through the open door while still in G-Mode can also be possible,",
+        "but the risk of hitting a fireball is probably too high for that to be reasonable."
+      ]
+    },
     {
       "id": 4,
       "link": [2, 2],
@@ -577,6 +636,62 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 3],
+      "name": "G-Mode Crystal Flash Stuck Ridley",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"notable": "G-Mode Crystal Flash Stuck Ridley"},
+        "h_CrystalFlash",
+        {"or": [
+          "canArtificialMorph",
+          "canWalljump"
+        ]},
+        "h_usePowerBomb",
+        {"ridleyKill": {"gMode": true, "stuck": true}},
+        {"autoReserveTrigger": {}},
+        {"heatFrames": 600},
+        {"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.",
+        "Then get grabbed by Ridley to finish the fight."
+      ]
+    },
+    {
+      "link": [2, 3],
+      "name": "G-Mode Ridley with 30 Supers",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"notable": "G-Mode Ridley with 30 Supers"},
+        {"heatFrames": 0},
+        {"ammo": {"type": "Super", "count": 30}},
+        {"partialRefill": {"type": "Energy", "limit": 100}}
+      ],
+      "setsFlags": ["f_DefeatedRidley"],
+      "note": [
+        "Enter the room in G-mode and quickly kill Ridley with 30 Supers.",
+        "G-mode protects against heat damage but also causes Ridley's fireballs to be invisible and not move.",
+        "As long as Ridley is swooping, not many fireballs will be placed, so delaying Ridley from pogoing can be helpful.",
+        "Once Ridley begins pogoing, it generally becomes unsafe for Samus to jump high because of the risk of touching a fireball.",
+        "By the end of the fight, projectiles will probably be overloaded, causing Ridley's drops not to spawn;",
+        "to solve this, exit G-mode just before drops spawn, and pause abuse in order to collect them.",
+        "Leaving back through the open door while still in G-mode is also possible."
+      ]
+    },
     {
       "id": 9,
       "link": [3, 1],
@@ -662,9 +777,7 @@
       "name": "Heat Proof Ridley",
       "requires": [
         "h_heatProof",
-        {"enemyKill": {
-          "enemies": [["Ridley"]]
-        }}
+        {"ridleyKill": {}}
       ],
       "setsFlags": ["f_DefeatedRidley"]
     },
@@ -675,9 +788,7 @@
       "requires": [
         {"notable": "Ridley without Heat Protection"},
         {"heatFrames": 0},
-        {"enemyKill": {
-          "enemies": [["Ridley"]]
-        }}
+        {"ridleyKill": {}}
       ],
       "setsFlags": ["f_DefeatedRidley"],
       "note": "Fight Ridley without immunity to heat damage.",
@@ -698,8 +809,24 @@
       "id": 1,
       "name": "Ridley without Heat Protection",
       "note": "Fight Ridley without immunity to heat damage."
+    },
+    {
+      "id": 2,
+      "name": "G-Mode Crystal Flash Stuck Ridley",
+      "note": [
+        "In G-mode, use a Crystal Flash and additional Power Bomb to get Ridley stuck at the bottom-left of the room.",
+        "To end the fight, exit G-mode by using damage from Ridley to trigger auto-reserves."
+      ]
+    },
+    {
+      "id": 3,
+      "name": "G-Mode Ridley with 30 Supers",
+      "note": [
+        "In G-Mode, use 30 Supers to end the fight quickly, carefully avoiding the invisible fireballs that Ridley spawns.",
+        "Use X-Ray to exit G-Mode precisely at the end of the fight just before drops spawn."
+      ]
     }
   ],
   "nextStratId": 27,
-  "nextNotableId": 2
+  "nextNotableId": 4
 }

schema/m3-requirements.schema.json

@@ -844,6 +844,23 @@
             "type": "string",
             "title": "Disable Equipment",
             "description": "A requirement to disable a specific item."
+          },
+          "ridleyKill": {
+            "type": "object",
+            "description": "Fulfilled by killing Ridley, including ammo, energy, and skill requirements.",
+            "additionalProperties": false,
+            "properties": {
+              "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."
+              }
+            }
           }
         }
       }