From 7ad32e7752409be617bd958d01ac3b64147d3f40 Mon Sep 17 00:00:00 2001 From: Michael McKenzie Date: Sat, 25 Apr 2026 10:10:04 -0230 Subject: [PATCH 1/4] Red Pirate Traversal --- region/norfair/east/Red Pirate Shaft.json | 87 +++++++++++++++++++---- 1 file changed, 73 insertions(+), 14 deletions(-) diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json index 25fb3395c..b09859940 100644 --- a/region/norfair/east/Red Pirate Shaft.json +++ b/region/norfair/east/Red Pirate Shaft.json @@ -195,27 +195,41 @@ { "id": 5, "link": [1, 2], - "name": "Base", + "name": "Tank the Damage", "requires": [ - {"enemyDamage": { - "enemy": "Red Space Pirate (standing)", - "type": "contact", - "hits": 1 - }} + {"or": [ + {"enemyDamage": { + "enemy": "Red Space Pirate (standing)", + "type": "contact", + "hits": 3 + }}, + {"and": [ + {"enemyDamage": { + "enemy": "Geemer (grey)", + "type": "contact", + "hits": 3 + }}, + "canCarefulJump", + {"or": [ + "canWalljump", + "HiJump", + "SpaceJump", + "canTrickySpringBallJump", + "canUseIFrames" + ]} + ]} + ]} ], "flashSuitChecked": true, "blueSuitChecked": true, - "note": [ - "Wait for the pirates to step towards the wall then jump on their platform. Shoot them to momentarily prevent them from shooting lasers.", - "This strat assumes getting hit once. Note that the Geemers do much less damage than the Pirates" - ] + "note": ["Note that the Geemers do much less damage than the Pirates"] }, { "id": 6, "link": [1, 2], "name": "Avoid the Enemies", "requires": [ - "canCarefulJump" + "canTrickyJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -236,6 +250,25 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [1, 2], + "name": "Kill the Geemers", + "requires": [ + {"or": [ + "ScrewAttack", + "canUseGrapple" + ]}, + {"or": [ + "canWalljump", + "HiJump", + "SpaceJump", + "canSpringBallJumpMidAir" + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "devNote": "PowerBombs would use Kill the Pirates." + }, { "id": 8, "link": [1, 2], @@ -251,13 +284,39 @@ "blueSuitChecked": true, "note": "Enter on the either side of the doorway to make it to the top." }, + { + "link": [2, 1], + "name": "Avoid the Enemies", + "requires": [ + "canDodgeWhileShooting" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "Fall onto the Geemer platforms while avoiding the pirates." + }, { "id": 9, "link": [2, 1], - "name": "Base", - "requires": [], + "name": "Tank the Damage", + "requires": [ + {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 3}} + ], "flashSuitChecked": true, - "blueSuitChecked": true + "blueSuitChecked": true, + "note": "Land on the Geemers to avoid taking damage from the Red Space Pirates." + }, + { + "link": [2, 1], + "name": "Kill the Enemies", + "requires": [ + {"or": [ + {"enemyKill": {"enemies": [["Geemer (grey)"],["Geemer (grey)"],["Geemer (grey)"]]}}, + {"enemyKill": {"enemies": [["Red Space Pirate (standing)", "Red Space Pirate (standing)"], ["Red Space Pirate (standing)"]]}} + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "Carefully shoot the enemies from above." }, { "id": 14, From 03243ecb156369f353bb79cb8861733631401487 Mon Sep 17 00:00:00 2001 From: Michael McKenzie Date: Sat, 25 Apr 2026 10:23:24 -0230 Subject: [PATCH 2/4] merge conflict --- region/norfair/east/Red Pirate Shaft.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json index b09859940..39f6baccd 100644 --- a/region/norfair/east/Red Pirate Shaft.json +++ b/region/norfair/east/Red Pirate Shaft.json @@ -211,7 +211,7 @@ }}, "canCarefulJump", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canTrickySpringBallJump", @@ -259,7 +259,7 @@ "canUseGrapple" ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canSpringBallJumpMidAir" From 8872929df856ae50c6dc1a79b0b4b686ebfe8f08 Mon Sep 17 00:00:00 2001 From: Michael McKenzie Date: Mon, 27 Apr 2026 07:47:11 -0230 Subject: [PATCH 3/4] Review pass --- region/norfair/east/Red Pirate Shaft.json | 36 +++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json index 39f6baccd..2710323ab 100644 --- a/region/norfair/east/Red Pirate Shaft.json +++ b/region/norfair/east/Red Pirate Shaft.json @@ -209,11 +209,16 @@ "type": "contact", "hits": 3 }}, - "canCarefulJump", {"or": [ - "canWallJump", - "HiJump", - "SpaceJump", + {"and": [ + "canCarefulJump", + "HiJump" + ]}, + "canPreciseWalljump", + {"and": [ + "canDodgeWhileShooting", + "SpaceJump" + ]}, "canTrickySpringBallJump", "canUseIFrames" ]} @@ -229,7 +234,13 @@ "link": [1, 2], "name": "Avoid the Enemies", "requires": [ - "canTrickyJump" + {"or": [ + "canTrickyJump", + {"and": [ + "canDodgeWhileShooting", + "HiJump" + ]} + ]} ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -254,10 +265,7 @@ "link": [1, 2], "name": "Kill the Geemers", "requires": [ - {"or": [ - "ScrewAttack", - "canUseGrapple" - ]}, + "canUseGrapple", {"or": [ "canWallJump", "HiJump", @@ -267,7 +275,7 @@ ], "flashSuitChecked": true, "blueSuitChecked": true, - "devNote": "PowerBombs would use Kill the Pirates." + "devNote": "ScrewAttack and PowerBombs would use Kill the Pirates." }, { "id": 8, @@ -299,7 +307,11 @@ "link": [2, 1], "name": "Tank the Damage", "requires": [ - {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 3}} + {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 1}}, + {"or": [ + "canUseIFrames", + {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 2}} + ]} ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -310,7 +322,7 @@ "name": "Kill the Enemies", "requires": [ {"or": [ - {"enemyKill": {"enemies": [["Geemer (grey)"],["Geemer (grey)"],["Geemer (grey)"]]}}, + "canUseGrapple", {"enemyKill": {"enemies": [["Red Space Pirate (standing)", "Red Space Pirate (standing)"], ["Red Space Pirate (standing)"]]}} ]} ], From 4ba15e4118b52e468b9cebbee1582f7ccec78287 Mon Sep 17 00:00:00 2001 From: Michael McKenzie Date: Mon, 27 Apr 2026 07:50:27 -0230 Subject: [PATCH 4/4] merge conflict --- region/norfair/east/Red Pirate Shaft.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json index 2710323ab..f255705fc 100644 --- a/region/norfair/east/Red Pirate Shaft.json +++ b/region/norfair/east/Red Pirate Shaft.json @@ -214,7 +214,7 @@ "canCarefulJump", "HiJump" ]}, - "canPreciseWalljump", + "canPreciseWallJump", {"and": [ "canDodgeWhileShooting", "SpaceJump"