diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json index c4a721cb2b..02ed5c94d5 100644 --- a/region/maridia/inner-pink/Colosseum.json +++ b/region/maridia/inner-pink/Colosseum.json @@ -1294,7 +1294,7 @@ ], "note": [ "This applies to Draygon's Room.", - "Start about a tile away from the wall, gain run speed, and time a pause to unequip Gravity after Samus jumps;", + "Start a little less than about a tile away from the wall, gain run speed, and time a pause to unequip Gravity after Samus jumps;", "hold down and back through the unpause to buffer a turnaround." ], "detailNote": [ diff --git a/region/maridia/inner-pink/East Cactus Alley Room.json b/region/maridia/inner-pink/East Cactus Alley Room.json index e8ace56c7b..d25330050b 100644 --- a/region/maridia/inner-pink/East Cactus Alley Room.json +++ b/region/maridia/inner-pink/East Cactus Alley Room.json @@ -871,6 +871,151 @@ ], "note": ["Assumes a runway of at least 18 tiles in the adjacent room."] }, + { + "link": [2, 4], + "name": "Side Platform Cross Room Jump", + "entranceCondition": { + "comeInWithSidePlatform": { + "platforms": [ + { + "minHeight": 2, + "maxHeight": 2, + "minTiles": 27.4375, + "speedBooster": true, + "obstructions": [[1, 0]], + "note": ["This applies to Dust Torizo Room and Noob Bridge."], + "devNote": [ + "The jump could also be done with a shorter runway, with a tricky dash jump using run speed $4.0 or $4.1.", + "But it wouldn't apply to any more rooms in the game." + ] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 28.2472, + "speedBooster": true, + "obstructions": [[1, 0]], + "note": ["This applies to Double Chamber."], + "devNote": [ + "The jump could also be done with a shorter runway, with a tricky dash jump using run speed $4.0 or $4.1.", + "But it wouldn't apply to any more rooms in the game." + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "minTiles": 23.8731, + "speedBooster": true, + "obstructions": [[3, 0]], + "environment": "water", + "requires": [ + "canGravityJump", + "canMomentumConservingMorph" + ], + "note": [ + "This applies to Below Botwoon Energy Tank and Botwoon Energy Tank Room", + "gain run speed, and time a pause to unequip Gravity after Samus jumps and aims down;", + "hold down through the unpause to buffer a morph." + ], + "detailNote": [ + "With a momentum conserving turnaround, this has a 3-frame window for the jump,", + "and between a 1-frame and 3-frame window for the pause, depending on the jump timing", + "(with later jumps corresponding to larger windows for the pause to hit)." + ] + }, + { + "minHeight": 2, + "maxHeight": 2, + "minTiles": 45, + "speedBooster": true, + "obstructions": [[3, 0]], + "requires": [ + "canInsaneJump", + "canMomentumConservingMorph" + ], + "note": ["This applies to Statues Hallway and Baby Kraid Room."], + "devNote": [ + "This almost works from Metroid Room 1 (with $4.1 run speed) but comes up a few pixels short." + ] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 21.4375, + "speedBooster": true, + "obstructions": [[3, 0]], + "environment": "water", + "requires": [ + "canTrickyDashJump", + "canInsaneJump", + "canGravityJump", + "canMomentumConservingMorph" + ], + "note": [ + "This applies to Draygon's Room.", + "Start a little less than a tile away from the wall, gain run speed, and time a pause to unequip Gravity after Samus jumps and aims down;", + "hold down through the unpause to buffer a morph." + ], + "detailNote": [ + "Gain extra run speed of $4.0 or $4.1." + ] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 41.4375, + "speedBooster": true, + "obstructions": [[3, 0]], + "requires": [ + "canInsaneJump", + "canMomentumConservingMorph" + ], + "note": [ + "This applies to Blue Brinstar Energy Tank Room (Power Bomb blocks broken), Bowling Alley (middle), and Basement." + ] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 45, + "speedBooster": true, + "obstructions": [[5, 0]], + "requires": [ + "canInsaneJump", + "canMomentumConservingMorph", + "canInsaneMidAirMorph" + ], + "note": [ + "This applies to Basement (power off)." + ] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 39.4375, + "speedBooster": true, + "obstructions": [[3, 2]], + "requires": [], + "note": ["This applies to Metal Pirates Room."] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 39.4375, + "speedBooster": true, + "obstructions": [[5, 2]], + "requires": [ + "canMomentumConservingMorph" + ], + "note": ["This applies to Flyway"] + } + ] + } + }, + "requires": [ + "canCrossRoomJumpIntoWater" + ] + }, { "id": 34, "link": [2, 4], diff --git a/region/tourian/main/Dust Torizo Room.json b/region/tourian/main/Dust Torizo Room.json index 5713928dff..430f655f4b 100644 --- a/region/tourian/main/Dust Torizo Room.json +++ b/region/tourian/main/Dust Torizo Room.json @@ -94,6 +94,10 @@ "obstruction": [1, 0] } }, + "note": [ + "Avoid backing into the corner;", + "instead press against it and turn around, to put Samus into a better position." + ], "devNote": "Max extra run speed $5.0, or $5.1 with Hi-Jump." }, { @@ -280,6 +284,10 @@ "obstruction": [1, 0] } }, + "note": [ + "Avoid backing into the corner;", + "instead press against it and turn around, to put Samus into a better position." + ], "devNote": "Max extra run speed $5.0, or $5.1 with Hi-Jump." }, {