From 8893d05eab20661d3002e8c181f705160d9b50a7 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Wed, 16 Apr 2025 14:27:17 -0600 Subject: [PATCH 1/4] G-Mode: Three Musketeers --- .../east/Three Musketeers' Room.json | 182 ++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index 8aa3c545be..cb669d9f43 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -64,6 +64,18 @@ [0, 1, 0, 0], [1, 2, 1, 1] ] + }, + { + "id": 5, + "name": "G-Mode Morph Junction (Above Bomb Block)", + "nodeType": "junction", + "nodeSubType": "g-mode", + "mapTileMask": [ + [0, 1, 0, 0], + [0, 1, 0, 0], + [1, 2, 1, 1] + ], + "note": "Represents being below the Kihunters, above the bomb block with G-Mode" } ], "obstacles": [ @@ -472,6 +484,55 @@ ], "note": "Enter the room while spacejumping and weave between the pillars." }, + { + "link": [2, 5], + "name": "G-Mode", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": false + } + }, + "requires": [ + "Morph", + {"or": [ + "SpaceJump", + "canWalljump", + "HiJump", + {"and": [ + "canInsaneJump", + {"disableEquipment": "SpeedBooster"} + ]} + ]} + ], + "flashSuitChecked": true + }, + { + "link": [2, 5], + "name": "G-Mode Morph", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + {"or": [ + "h_canArtificialMorphJumpIntoIBJ", + {"and": [ + "canTrickyGMode", + "h_canArtificialMorphSpringFling" + ]} + ]} + ], + "flashSuitChecked": true, + "note": [ + "Avoiding the acid completely requires precise movement. Either jump into IBJ or use a precise Spring Fling.", + "Getting a well-timed pause to trigger immediately after Samus jumps can give enough horizontal momentum to cross the second Hibashi and land in the alcove,", + "however, a quick pause with a second spring fling on the descent can help." + ], + "devNote": "This may be possible with a very precise double bomb IBJ." + }, { "id": 22, "link": [3, 3], @@ -1022,6 +1083,127 @@ "h_canHeatedCrystalFlash" ], "flashSuitChecked": true + }, + { + "link": [5, 1], + "name": "G-Mode, KiHunters Already Dead", + "requires": [ + "h_heatedGMode", + {"obstaclesCleared": ["A"]}, + {"or": [ + "h_canCrouchJumpDownGrab", + "canWalljump", + "HiJump", + "canSpringBallJumpMidAir", + "SpaceJump", + "canIBJ" + ]}, + {"heatFrames": 200} + ], + "flashSuitChecked": true, + "note": "Kill the Kihunters then shoot the shot blocks and escape." + }, + { + "link": [5, 1], + "name": "G-Mode, KiHunter Dodge", + "requires": [ + "h_heatedGMode", + {"notable": "Dodge Going Up"}, + "h_canNavigateHeatRooms", + "canInsaneJump", + {"or": [ + {"and": [ + "canWallJumpInstantMorph", + "canPreciseWalljump" + ]}, + {"and": [ + "SpeedBooster", + "HiJump", + "canMidAirMorph" + ]} + ]}, + {"heatFrames": 220} + ], + "flashSuitChecked": true, + "note": "Dodge the Kihunters then shoot the shot blocks and escape." + }, + { + "link": [5, 3], + "name": "G-Mode, To the Item, Simple Blind Movement", + "requires": [ + "h_heatedGMode", + "ScrewAttack", + "Morph", + {"heatFrames": 120} + ], + "flashSuitChecked": true, + "note": [ + "Use Screw Attack to break the bomb block and enter the morph tunnel.", + "Roll to the left without falling off into the acid, unmorph and walk back to the right to press against the morph tunnel.", + "Use X-Ray, Morph, then roll a little to the right to barely touch the camera scroll block, then move left towards the item while the camera fixes itself." + ], + "devNote": "Even with very precise movement, it seems barely not possible to touch the item before PLMs are overloaded." + }, + { + "link": [5, 4], + "name": "Exit G-Mode", + "requires": [ + "h_heatedGMode", + {"heatFrames": 0} + ], + "flashSuitChecked": true, + "note": "If going for the item, it is possible to place a Bomb or Power Bomb then exit G-mode to save a small number of heat frames." + }, + { + "link": [5, 5], + "name": "G-Mode, KiHunter Kill", + "requires": [ + "h_heatedGMode", + {"or": [ + {"enemyKill": { + "enemies": [["Kihunter (red)", "Kihunter (red)", "Kihunter (red)"]], + "explicitWeapons": ["Super", "Missile", "Plasma", "ScrewAttack"] + }}, + {"and": [ + "Ice", + {"or": [ + "Wave", + "Spazer", + "canBeVeryPatient", + {"and": [ + "Charge", + "canBePatient" + ]} + ]} + ]}, + {"and": [ + "Charge", + {"or": [ + "Wave", + "Spazer", + "canBeVeryPatient" + ]} + ]}, + {"and": [ + "Spazer", + {"or": [ + "Wave", + "canBePatient" + ]} + ]} + ]}, + {"or": [ + "h_canCrouchJumpDownGrab", + "canWalljump", + "HiJump", + "canSpringBallJumpMidAir", + "SpaceJump", + "canIBJ" + ]} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": "Kill the Kihunters then either exit the room at the top or go to the item." } ], "notables": [ From f16d3ad565e8abffe685fcf79abfc46165a1b4ae Mon Sep 17 00:00:00 2001 From: kjbranch Date: Wed, 16 Apr 2025 14:29:16 -0600 Subject: [PATCH 2/4] add missing links --- region/lowernorfair/east/Three Musketeers' Room.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index cb669d9f43..f052aea48d 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -110,7 +110,8 @@ "from": 2, "to": [ {"id": 2}, - {"id": 4} + {"id": 4}, + {"id": 5} ] }, { @@ -128,6 +129,15 @@ {"id": 3}, {"id": 4} ] + }, + { + "from": 5, + "to": [ + {"id": 1}, + {"id": 3}, + {"id": 4}, + {"id": 5} + ] } ], "strats": [ From bfa76015485bb9ec27feacce8c86fc4a44844f7f Mon Sep 17 00:00:00 2001 From: kjbranch Date: Wed, 16 Apr 2025 14:32:08 -0600 Subject: [PATCH 3/4] add missing heat frames --- region/lowernorfair/east/Three Musketeers' Room.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index f052aea48d..f732d54518 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -513,7 +513,8 @@ "canInsaneJump", {"disableEquipment": "SpeedBooster"} ]} - ]} + ]}, + {"heatFrames": 0} ], "flashSuitChecked": true }, @@ -533,7 +534,8 @@ "canTrickyGMode", "h_canArtificialMorphSpringFling" ]} - ]} + ]}, + {"heatFrames": 0} ], "flashSuitChecked": true, "note": [ @@ -1209,7 +1211,8 @@ "canSpringBallJumpMidAir", "SpaceJump", "canIBJ" - ]} + ]}, + {"heatFrames": 0} ], "clearsObstacles": ["A"], "flashSuitChecked": true, From 1282e605a6c98009bfd462729c2afed7ec52089d Mon Sep 17 00:00:00 2001 From: kjbranch Date: Fri, 18 Apr 2025 10:30:42 -0600 Subject: [PATCH 4/4] three musketeers precise double bomb jump --- .../lowernorfair/east/Three Musketeers' Room.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index f732d54518..c434e6cde1 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -533,17 +533,24 @@ {"and": [ "canTrickyGMode", "h_canArtificialMorphSpringFling" + ]}, + {"and": [ + "canTrickyGMode", + "h_canArtificialMorphDoubleBombJump", + "h_canArtificialMorphBombHorizontally" ]} ]}, {"heatFrames": 0} ], "flashSuitChecked": true, "note": [ - "Avoiding the acid completely requires precise movement. Either jump into IBJ or use a precise Spring Fling.", - "Getting a well-timed pause to trigger immediately after Samus jumps can give enough horizontal momentum to cross the second Hibashi and land in the alcove,", - "however, a quick pause with a second spring fling on the descent can help." + "Avoiding the acid completely requires precise movement.", + "With Spring Ball and Bombs, jump into IBJ to delay while waiting for the acid.", + "With just Spring Ball, perform a well-timed pause to trigger immediately after Samus jumps to get enough horizontal momentum to cross the second Hibashi and land in the alcove.", + "A quick pause with a second spring fling on the descent can help a bit.", + "With just Bombs, this is possible with well-timed, first-try double IBJs." ], - "devNote": "This may be possible with a very precise double bomb IBJ." + "devNote": "FIXME: Could add strats that take acid damage and are more lenient." }, { "id": 22,