From 321398e1b8297ff9214c77a40f05addf9b619d18 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Tue, 24 Jun 2025 11:51:21 -0600 Subject: [PATCH 1/2] Misc G-mode setups --- region/lowernorfair/east/Ridley's Room.json | 43 ++++++++++++++++++- region/maridia/inner-pink/Draygon's Room.json | 18 ++++++++ .../east/Green Bubbles Missile Room.json | 24 +++++++++++ region/norfair/west/Crocomire Escape.json | 20 +++++++++ 4 files changed, 104 insertions(+), 1 deletion(-) diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json index 507d4ae906..265f88f969 100644 --- a/region/lowernorfair/east/Ridley's Room.json +++ b/region/lowernorfair/east/Ridley's Room.json @@ -164,8 +164,22 @@ {"enemyDamage": {"enemy": "Ridley", "type": "contact", "hits": 1}} ], "gModeRegainMobility": {}, + "flashSuitChecked": true + }, + { + "link": [1, 1], + "name": "G-Mode Setup - Get Hit By Ridley", + "requires": [ + {"heatFrames": 500}, + {"not": "f_DefeatedRidley"}, + "canRiskPermanentLossOfAccess" + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, "flashSuitChecked": true, - "devNote": "FIXME: Ridley could also be used to set up G-mode, but the chaos of the fight makes this difficult." + "note": "Get into position and Ridley will hit Samus shorly after starting to move.", + "devNote": "Not likely to be possible, as it requires canRiskPermanentLossOfAccess and Ridley alive with the door unlocked." }, { "id": 26, @@ -555,6 +569,33 @@ "flashSuitChecked": true, "devNote": "FIXME: Ridley could also be used to set up G-mode, but the chaos of the fight makes this difficult." }, + { + "link": [2, 2], + "name": "G-Mode Setup - Get Hit By Ridley", + "requires": [ + "h_heatProof", + "canInsaneJump", + {"or": [ + "SpaceJump", + "canWalljump", + {"and": [ + "HiJump", + "canSpringBallJumpMidAir" + ]} + ]}, + {"not": "f_DefeatedRidley"}, + "canRiskPermanentLossOfAccess" + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, + "flashSuitChecked": true, + "note": "It is much more common for Ridley to hit Samus when Ridley is facing left.", + "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." + ] + }, { "id": 6, "link": [2, 2], diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json index c6c3e9d6b6..395c39db3e 100644 --- a/region/maridia/inner-pink/Draygon's Room.json +++ b/region/maridia/inner-pink/Draygon's Room.json @@ -396,6 +396,24 @@ "gModeRegainMobility": {}, "flashSuitChecked": true }, + { + "link": [1, 1], + "name": "G-Mode Setup - Get Hit By Draygon", + "requires": [ + {"not": "f_DefeatedDraygon"}, + "canRiskPermanentLossOfAccess", + {"or": [ + "canTrickyDodgeEnemies", + "Gravity", + "h_breakOneDraygonTurret" + ]} + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, + "flashSuitChecked": true, + "devNote": "Not likely to be possible, as it requires canRiskPermanentLossOfAccess and Draygon alive with the door unlocked." + }, { "id": 9, "link": [1, 1], diff --git a/region/norfair/east/Green Bubbles Missile Room.json b/region/norfair/east/Green Bubbles Missile Room.json index 8e78f73b94..0ab7a48a0a 100644 --- a/region/norfair/east/Green Bubbles Missile Room.json +++ b/region/norfair/east/Green Bubbles Missile Room.json @@ -369,6 +369,30 @@ "collectsItems": [3], "flashSuitChecked": true }, + { + "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}} + ]} + ], + "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." + ] + }, { "id": 11, "link": [2, 3], diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json index 5c08718f31..9b7c8e8a11 100644 --- a/region/norfair/west/Crocomire Escape.json +++ b/region/norfair/west/Crocomire Escape.json @@ -677,6 +677,26 @@ "Use the platform at the top-right of the room to gain temporary blue, then chain it through the door." ] }, + { + "link": [2, 2], + "name": "G-Mode Setup - Get Hit By Geruta", + "requires": [ + "h_heatProof", + {"or": [ + "canInsaneJump", + {"enemyDamage": {"enemy": "Geruta", "type": "contact", "hits": 1}} + ]} + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, + "flashSuitChecked": true, + "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." + ] + }, { "id": 53, "link": [2, 2], From 5943a95e1e6e7e7541447d62739a45d29fceaadb Mon Sep 17 00:00:00 2001 From: kjbranch Date: Mon, 7 Jul 2025 23:13:14 -0600 Subject: [PATCH 2/2] feedback update --- region/lowernorfair/east/Ridley's Room.json | 14 ++++++++--- region/maridia/inner-pink/Draygon's Room.json | 12 +++++++--- .../east/Green Bubbles Missile Room.json | 19 ++++++--------- region/norfair/west/Crocomire Escape.json | 23 +++++++++++++++++-- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json index 265f88f969..3262ad4dc4 100644 --- a/region/lowernorfair/east/Ridley's Room.json +++ b/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." ] }, { diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json index 395c39db3e..67653d79e8 100644 --- a/region/maridia/inner-pink/Draygon's Room.json +++ b/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": { diff --git a/region/norfair/east/Green Bubbles Missile Room.json b/region/norfair/east/Green Bubbles Missile Room.json index 0ab7a48a0a..92ad531ea0 100644 --- a/region/norfair/east/Green Bubbles Missile Room.json +++ b/region/norfair/east/Green Bubbles Missile Room.json @@ -373,15 +373,7 @@ "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": {} @@ -389,9 +381,12 @@ "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, diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json index 9b7c8e8a11..ca5672ef8a 100644 --- a/region/norfair/west/Crocomire Escape.json +++ b/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." ] }, {