From 4172a54f5a1379b0206069add6156fa641f45730 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Sun, 24 Aug 2025 08:34:37 -0600 Subject: [PATCH 1/5] Main uses of canComplexCarryFlashSuit --- helpers.json | 36 +++++++++++++++++++++++- region/maridia/outer/Crab Gate Room.json | 2 +- tech.json | 16 ++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/helpers.json b/helpers.json index d969824747..e2ae7e672b 100644 --- a/helpers.json +++ b/helpers.json @@ -638,7 +638,10 @@ "canGateGlitch", {"or": [ {"noFlashSuit": {}}, - "h_useSpringBall", + {"and": [ + "h_useSpringBall", + "canComplexCarryFlashSuit" + ]}, {"and": [ "Morph", "canInsaneJump", @@ -647,6 +650,29 @@ ]} ] }, + { + "name": "h_underwaterGateGlitch", + "requires": [ + "canGateGlitch", + {"or": [ + {"noFlashSuit": {}}, + {"and": [ + "canComplexCarryFlashSuit", + {"or": [ + {"and": [ + {"disableEquipment": "Gravity"}, + "canMidAirMorph" + ]}, + "h_useSpringBall" + ]} + ]}, + {"and": [ + "canTrickyCarryFlashSuit", + "canInsaneMidAirMorph" + ]} + ]} + ] + }, { "name": "h_blueGateGlitch", "requires": [ @@ -666,6 +692,14 @@ "h_greenGateGlitchLeniency" ] }, + { + "name": "h_underwaterGreenGateGlitch", + "requires": [ + "h_underwaterGateGlitch", + {"ammo": {"type": "Super", "count": 1}}, + "h_greenGateGlitchLeniency" + ] + }, { "name": "h_heatedBlueGateGlitch", "requires": [ diff --git a/region/maridia/outer/Crab Gate Room.json b/region/maridia/outer/Crab Gate Room.json index 1ef3b326ad..7da30daa9d 100644 --- a/region/maridia/outer/Crab Gate Room.json +++ b/region/maridia/outer/Crab Gate Room.json @@ -579,7 +579,7 @@ "requires": [ {"notable": "Suitless Green Gate Glitch"}, {"or": [ - "h_greenGateGlitch", + "h_underwaterGreenGateGlitch", {"obstaclesCleared": ["A"]} ]} ], diff --git a/tech.json b/tech.json index 2cd8517548..abb23f0752 100644 --- a/tech.json +++ b/tech.json @@ -1424,6 +1424,11 @@ {"or": [ "SpringBall", "canMidAirMorph" + ]}, + {"or": [ + {"noFlashSuit": {}}, + "HiJump", + "canComplexCarryFlashSuit" ]} ], "note": "The ability to start an IBJ from a jump or a spring ball jump. It is most often used in strats that need Samus to IBJ up faster or to avoid something near the ground." @@ -1534,6 +1539,10 @@ {"or": [ "Bombs", {"ammo": {"type": "PowerBomb", "count": 1}} + ]}, + {"or": [ + {"noFlashSuit": {}}, + "canComplexCarryFlashSuit" ]} ], "note": "From a submerged platform, setting up a single bomb jump above the water line to propel Samus up and out of the water.", @@ -1588,7 +1597,12 @@ "techRequires": [ "canNeutralDamageBoost" ], - "otherRequires": [], + "otherRequires": [ + {"or": [ + {"noFlashSuit": {}}, + "canComplexCarryFlashSuit" + ]} + ], "note": [ "Using the knockback from taking enemy damage to give Samus a large movement boost by holding the jump and backwards buttons.", "By changing the timing of the directional input, the way that Samus is knocked back can be changed and has situational uses.", From 02d33c86c0be95811ac27cd6c45549b418409081 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Sun, 24 Aug 2025 09:53:04 -0600 Subject: [PATCH 2/5] reqs for h_midAirShootUp and canGrappleJump --- helpers.json | 5 ++++- tech.json | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/helpers.json b/helpers.json index e2ae7e672b..ae39c6c85f 100644 --- a/helpers.json +++ b/helpers.json @@ -1115,7 +1115,10 @@ "requires": [ {"or": [ {"noFlashSuit": {}}, - "Morph" + {"and": [ + "Morph", + "canComplexCarryFlashSuit" + ]} ]} ] }, diff --git a/tech.json b/tech.json index abb23f0752..d624876c7b 100644 --- a/tech.json +++ b/tech.json @@ -742,7 +742,18 @@ "HiJump", "can4HighMidAirMorph" ]}, - {"noFlashSuit": {}} + {"or": [ + {"noFlashSuit": {}}, + {"and": [ + "HiJump", + "canPreciseGrappleJump", + "canComplexCarryFlashSuit" + ]}, + {"and": [ + "canTrickyGrappleJump", + "canTrickyCarryFlashSuit" + ]} + ]} ], "note": [ "Using Grapple to propel Samus upwards, then continuously morphing/unmorphing/jumping in mid-air to climb upwards.", From 82da07a9486a553cd44a8ecde73ba936d1602fa8 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Sun, 24 Aug 2025 10:26:22 -0600 Subject: [PATCH 3/5] add detailNote for canPreciseGrappleJump --- tech.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tech.json b/tech.json index d624876c7b..7f8b239ba7 100644 --- a/tech.json +++ b/tech.json @@ -776,6 +776,12 @@ "3) Performing actions between individual grapple jumps, such as arm pumping, shooting, or kago-ing an enemy,", "4) Breaking a water line while grapple jumping." ], + "detailNote": [ + "If carrying a flash suit, special care is needed to avoid activating the shinespark:", + "avoid holding jump during the initial fling,", + "and hold forward after unmorphing in order to spin jump rather than crouch jump;", + "underwater another option is to hold shot (after deselecting Grapple) in order to crouch jump." + ], "extensionTechs": [ { "id": 53, From f1c06d2d9dc9e709e2330c54257940bbc6eb37b0 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Mon, 25 Aug 2025 08:50:38 -0600 Subject: [PATCH 4/5] remove canGrappleJump circular dependencies --- tech.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tech.json b/tech.json index 7f8b239ba7..e160b6d749 100644 --- a/tech.json +++ b/tech.json @@ -746,13 +746,9 @@ {"noFlashSuit": {}}, {"and": [ "HiJump", - "canPreciseGrappleJump", "canComplexCarryFlashSuit" ]}, - {"and": [ - "canTrickyGrappleJump", - "canTrickyCarryFlashSuit" - ]} + "canTrickyCarryFlashSuit" ]} ], "note": [ From 21129daef2c1e572d7f9beb55cf77c0b5a3b3115 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Mon, 25 Aug 2025 15:01:33 -0600 Subject: [PATCH 5/5] Update helpers.json Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com> --- helpers.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helpers.json b/helpers.json index ae39c6c85f..083a325e6b 100644 --- a/helpers.json +++ b/helpers.json @@ -643,8 +643,7 @@ "canComplexCarryFlashSuit" ]}, {"and": [ - "Morph", - "canInsaneJump", + "canInsaneMidAirMorph", "canTrickyCarryFlashSuit" ]} ]}