From d7629fce5ab41015e5124be8107444eab52176ec Mon Sep 17 00:00:00 2001 From: kjbranch Date: Tue, 23 Jun 2026 16:51:28 -0600 Subject: [PATCH 1/2] some videos --- .../red/Red Brinstar Fireflea Room.json | 20 ++++-- .../west/Gauntlet Energy Tank Room.json | 64 +++++++++++++++---- region/maridia/inner-pink/West Sand Pit.json | 49 ++++++++++++-- 3 files changed, 110 insertions(+), 23 deletions(-) diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json index 2d919b77f2..168e1e8789 100644 --- a/region/brinstar/red/Red Brinstar Fireflea Room.json +++ b/region/brinstar/red/Red Brinstar Fireflea Room.json @@ -1901,15 +1901,27 @@ { "id": 55, "link": [4, 1], - "name": "Ice and HiJump", + "name": "Frozen Waver Platform", "requires": [ "canTrickyUseFrozenEnemies", - "HiJump", - "canCarefulJump" + "canCarefulJump", + {"or": [ + "HiJump", + "canWallJump", + "canTrickyJump", + "canTrickySpringBallJump" + ]}, + {"or": [ + "canTrickyJump", + {"enemyDamage": {"enemy": "Waver", "type": "contact", "hits": 1}} + ]} ], "flashSuitChecked": true, "blueSuitChecked": true, - "note": "Freeze the Waver that gets stuck in the left pit as high as possible in order to avoid a wall jump." + "note": [ + "Freeze the Waver that gets stuck in the left pit to get to the top ledge.", + "It is possible to do this without a wall jump or any other items but it requires freezing it at a moderately precise height." + ] }, { "id": 56, diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index 9a4c685c68..060d8cb77e 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -664,7 +664,7 @@ { "id": 15, "link": [1, 4], - "name": "Shinespark in Room", + "name": "Come in Shinecharging, Shinespark", "entranceCondition": { "comeInShinecharging": { "length": 5, @@ -687,7 +687,7 @@ { "id": 16, "link": [1, 4], - "name": "Shinespark in Room, Kill Zebo on Entry", + "name": "Come in Shinecharging, Shinespark, Kill Zebo on Entry", "entranceCondition": { "comeInShinecharging": { "length": 14, @@ -726,7 +726,7 @@ { "id": 17, "link": [1, 4], - "name": "Blue Space Jump", + "name": "Come In Getting Blue Speed, Blue Space Jump", "entranceCondition": { "comeInGettingBlueSpeed": { "length": 5, @@ -737,7 +737,6 @@ }, "requires": [ "canBlueSpaceJump", - "canCarefulJump", "h_complexToCarryFlashSuit" ], "clearsObstacles": ["A", "B"], @@ -745,9 +744,8 @@ "blueSuitChecked": true }, { - "id": 18, "link": [1, 4], - "name": "Blue Space Jump, Kill Zebo on Entry", + "name": "Come In Getting Blue Speed, Blue Space Jump, Kill Zebo on Entry", "entranceCondition": { "comeInGettingBlueSpeed": { "length": 14, @@ -764,16 +762,56 @@ {"acidFrames": 5} ]}, "canBlueSpaceJump", - "canCarefulJump" + "h_complexToCarryFlashSuit" ], "clearsObstacles": ["A", "B"], "flashSuitChecked": true, - "blueSuitChecked": true, - "note": "To use the full runway, kill the Zebbo with Wave.", - "devNote": [ - "FIXME: Running through acid doesn't stop a shinecharge, but does inhibit tapping without gravity.", - "And the acid frame count may change slightly with speed." - ] + "blueSuitChecked": true + }, + { + "link": [1, 4], + "name": "Blue Space Jump, In-Room Runway", + "requires": [ + {"obstaclesCleared": ["B"]}, + {"or": [ + {"getBlueSpeed": { + "usedTiles": 14, + "steepUpTiles": 1, + "steepDownTiles": 1, + "openEnd": 0 + }}, + {"and": [ + {"getBlueSpeed": { + "usedTiles": 15, + "steepUpTiles": 1, + "steepDownTiles": 1, + "openEnd": 0 + }}, + {"doorUnlockedAtNode": 1} + ]} + ]}, + "canBlueSpaceJump", + "h_complexToCarryFlashSuit" + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [1, 4], + "name": "Come In Blue Spinning, Blue Space Jump", + "entranceCondition": { + "comeInBlueSpinning": { + "unusableTiles": 0 + } + }, + "requires": [ + "canBlueSpaceJump", + "h_complexToCarryFlashSuit" + ], + "clearsObstacles": ["A", "B"], + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 19, diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json index f21c896cfe..91945605ac 100644 --- a/region/maridia/inner-pink/West Sand Pit.json +++ b/region/maridia/inner-pink/West Sand Pit.json @@ -703,18 +703,55 @@ "Gravity", "h_useSpringBall", {"or": [ - {"and": [ - {"tech": "canJumpIntoIBJ"}, - "h_bombThings" - ]}, "canSpringBallBombJump", "HiJump" ]} ], "flashSuitChecked": true, "blueSuitChecked": true, - "note": "Spring Ball bounce on top of the crumble blocks. Use either a bomb or HiJump to gain a little bit of extra height.", - "devNote": "The tech requirement is `catching yourself on an aerial bomb` which is what canJumpIntoIBJ adds to canIBJ. Only one bomb or powerbomb is needed." + "note": [ + "With Spring Ball it is safe to bounce on top of the crumble blocks while continuing to jump.", + "Climb with HiJump, or use a bomb into Spring Ball jump to gain a little bit of extra height." + ] + }, + { + "link": [7, 5], + "name": "Spring Ball into IBJ", + "requires": [ + {"or": [ + "Gravity", + "HiJump" + ]}, + "h_useSpringBall", + "canJumpIntoIBJ" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Spring Ball bounce on top of the crumble blocks. Time a Bomb above the water into the start of an IBJ.", + "With Gravity, this is possible with a single Bomb boost." + ] + }, + { + "link": [7, 5], + "name": "Gravity, Spring Ball, Power Bomb Boost", + "requires": [ + "Gravity", + "h_useSpringBall", + {"tech": "canJumpIntoIBJ"}, + "canTrickyJump", + "h_usePowerBomb", + {"or": [ + {"tech": "canUnmorphBombBoost"}, + "h_additionalBomb" + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Spring Ball bounce on top of the crumble blocks. Land on a well-timed Power Bomb to boost up into the tunnel.", + "There is a 4-frame window to land on the Power Bomb, only the first frame will boost Samus high enough." + ] }, { "id": 33, From f5a829dec7998180f44ba722f84d3c268d6f3b54 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Sat, 27 Jun 2026 09:13:34 -0600 Subject: [PATCH 2/2] remove complexFlash from BlueSpace strats --- region/crateria/west/Gauntlet Energy Tank Room.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index 060d8cb77e..691034208f 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -736,8 +736,7 @@ } }, "requires": [ - "canBlueSpaceJump", - "h_complexToCarryFlashSuit" + "canBlueSpaceJump" ], "clearsObstacles": ["A", "B"], "flashSuitChecked": true, @@ -761,8 +760,7 @@ "Gravity", {"acidFrames": 5} ]}, - "canBlueSpaceJump", - "h_complexToCarryFlashSuit" + "canBlueSpaceJump" ], "clearsObstacles": ["A", "B"], "flashSuitChecked": true, @@ -790,8 +788,7 @@ {"doorUnlockedAtNode": 1} ]} ]}, - "canBlueSpaceJump", - "h_complexToCarryFlashSuit" + "canBlueSpaceJump" ], "clearsObstacles": ["A"], "flashSuitChecked": true, @@ -806,8 +803,7 @@ } }, "requires": [ - "canBlueSpaceJump", - "h_complexToCarryFlashSuit" + "canBlueSpaceJump" ], "clearsObstacles": ["A", "B"], "flashSuitChecked": true,