feedback update

Author: kjbranch

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

@@ -573,7 +573,11 @@
       "link": [2, 2],
       "name": "G-Mode Setup - Get Hit By Ridley",
       "requires": [
-        "h_heatProof",
+        {"heatFrames": 900},
+        {"or": [
+          "canTrickyGMode",
+          {"heatFrames": 180}
+        ]},
         "canInsaneJump",
         {"or": [
           "SpaceJump",
@@ -590,10 +594,14 @@
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "note": "It is much more common for Ridley to hit Samus when Ridley is facing left.",
+      "note": [
+        "It is much more common for Ridley to hit Samus when Ridley is facing left.",
+        "One way to get Ridley to turn around is when it pogos on the right side of the room, stationary spin jump and break spin.",
+        "The fireballs can be tricky to deal with in the door frame, but can be done by dropping down and quickly wall jumping back up or by kagoing them."
+      ],
       "devNote": [
         "Not likely to be possible, as it requires canRiskPermanentLossOfAccess and Ridley alive with the door unlocked.",
-        "This could be done without heat protection, but with the unpredictable timings it would require a precise setup or too much luck."
+        "The extra heat frames are a leniency to account for randomness."
       ]
     },
     {

region/maridia/inner-pink/Draygon's Room.json

@@ -403,9 +403,15 @@
         {"not": "f_DefeatedDraygon"},
         "canRiskPermanentLossOfAccess",
         {"or": [
-          "canTrickyDodgeEnemies",
-          "Gravity",
-          "h_breakOneDraygonTurret"
+          "h_breakOneDraygonTurret",
+          {"and": [
+            "canTrickyDodgeEnemies",
+            "Gravity"
+          ]},
+          {"and": [
+            "canSuitlessMaridia",
+            "canTrickyGMode"
+          ]}
         ]}
       ],
       "exitCondition": {

region/norfair/east/Green Bubbles Missile Room.json

@@ -373,25 +373,20 @@
       "link": [2, 2],
       "name": "G-Mode Setup - Get Hit By Geruta",
       "requires": [
-        {"heatFrames": 550},
-        {"or": [
-          "canInsaneJump",
-          {"and": [
-            "canTrickyDodgeEnemies",
-            "canWalljump"
-          ]},
-          {"enemyDamage": {"enemy": "Geruta", "type": "contact", "hits": 1}}
-        ]}
+        {"heatFrames": 350}
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
-        "Move over to the item pedestal then jump over the Geruta and lure it back to the door.",
-        "Wall jumping on the left wall and the bubble pillar can help to avoid the Geruta."
-      ]
+        "On entry, wait for the Geruta to swoop under the door runway, then spin jump up into the alcove on the ceiling above the end of the runway.",
+        "The Geruta will often swoop around the runway and be set up to hit Samus on the next swoop.",
+        "Other times it may swoop outwards instead; in this scenario, repeat the same movements for another attempt for it to swoop towards the door.",
+        "Because it deals a lot of damage, it is possible to enter with ~99 Energy and use the setup whether it swoops towards the door on a first or second attempt at manipulating it."
+      ],
+      "devNote": "Adding more heat frame leniency here won't really help because then if the Geruta gets into position quickly, Samus will have too much Energy to use for the setup."
     },
     {
       "id": 11,

region/norfair/west/Crocomire Escape.json

@@ -682,9 +682,26 @@
       "name": "G-Mode Setup - Get Hit By Geruta",
       "requires": [
         "h_heatProof",
+        "canBePatient",
+        {"or": [
+          {"and": [
+            "canInsaneJump",
+            "canTrickyUseFrozenEnemies"
+          ]},
+          {"enemyDamage": {"enemy": "Geruta", "type": "contact", "hits": 2}}
+        ]},
         {"or": [
           "canInsaneJump",
-          {"enemyDamage": {"enemy": "Geruta", "type": "contact", "hits": 1}}
+          "canTrickyUseFrozenEnemies",
+          "Charge",
+          "Plasma",
+          "h_usePowerBomb",
+          {"ammo": {"type": "Missile", "count": 3}},
+          {"ammo": {"type": "Super", "count": 1}},
+          {"and": [
+            "ScrewAttack",
+            {"lavaFrames": 20}
+          ]}
         ]}
       ],
       "exitCondition": {
@@ -694,7 +711,9 @@
       "note": [
         "On room entry, perform a low spin jump onto the first ledge to avoid getting the Geruta to swoop to the right.",
         "Jump against the left wall, then move right and the Geruta should come down quickly.",
-        "Move back and forth until it comes down further. This can be tricky if needing to avoid all contact damage."
+        "Move back and forth until it comes down further. This can be tricky if needing to avoid contact damage.",
+        "Quickly freezing the Geruta as it starts to come down can be used to avoid taking a hit.",
+        "Killing the Dragon on room entry can also be helpful."
       ]
     },
     {