diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json index 1e096c324..9381e131c 100644 --- a/region/brinstar/green/Etecoon Energy Tank Room.json +++ b/region/brinstar/green/Etecoon Energy Tank Room.json @@ -2558,10 +2558,14 @@ "h_artificialMorphMovement", {"or": [ {"and": [ - {"ammo": {"type": "PowerBomb", "count": 3}}, + {"ammo": {"type": "PowerBomb", "count": 2}}, {"or": [ "canComplexGMode", {"ammo": {"type": "PowerBomb", "count": 1}} + ]}, + {"or": [ + "canTrickyGMode", + {"ammo": {"type": "PowerBomb", "count": 1}} ]} ]}, {"and": [ diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index ccab3f5ba..4fce648b7 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -1505,8 +1505,7 @@ "note": [ "Overload PLMs by touching the sand, then move through the speed blocks. Avoiding the sand pits is easier without Gravity or HiJump.", "Exit G-mode while inside the speed blocks then X-Ray climb up." - ], - "devNote": "This requires canInsaneJump even though it is not difficult, because it is not very intuitive." + ] }, { "id": 47, diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index e145380f5..29eca73f0 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -1403,6 +1403,38 @@ "FIXME: Check if this strat works through Toilet (either from Indiana Jones Room or Crocomire's Room)" ] }, + { + "link": [2, 6], + "name": "Leave Shinecharged", + "requires": [ + "Gravity", + "canMidAirMorph", + "h_EverestMorphTunnelExpanded", + "h_shinechargeMaxRunway", + "canShinechargeMovementTricky", + {"or": [ + {"and": [ + "canWallJump", + {"shineChargeFrames": 145} + ]}, + {"and": [ + "canGravityJump", + {"shineChargeFrames": 155} + ]} + ]} + ], + "exitCondition": { + "leaveShinecharged": {} + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "Climb to the morph tunnel with wall jumps or a Gravity Jump.", + "devNote": [ + "The frames remaining accounts for time needed to unmorph before going through the transition.", + "Leaving with a shinecharge could be done even if the morph tunnel isn't expanded,", + "but this would mean leaving shinecharged while morphed, which wouldn't technically adhere to what this exit condition specifies." + ] + }, { "id": 224, "link": [2, 6], @@ -5560,6 +5592,7 @@ "steepDownTiles": 5, "openEnd": 1 }}, + "canShinechargeMovementTricky", {"shineChargeFrames": 110} ], "exitCondition": { diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json index 44cfeec5e..c6c5b5002 100644 --- a/region/norfair/east/Double Chamber.json +++ b/region/norfair/east/Double Chamber.json @@ -3379,6 +3379,52 @@ "to obtain a boost in horizontal speed before mid-air Spring Ball jumping." ] }, + { + "link": [3, 4], + "name": "Speedy Jump over the Spikes", + "entranceCondition": { + "comeInRunning": { + "speedBooster": "yes", + "minTiles": 11.4375 + } + }, + "requires": [ + "canSpeedyJump", + "canTrickyJump", + {"heatFrames": 100} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "A running jump over the pit without a wall jump requires a runway in the previous room of 12 tiles with a last-frame jump.", + "devNote": "This becomes easier with a very long runway, but probably not easy enough to remove the canTrickyJump, since a missed jump likely means death." + }, + { + "link": [3, 4], + "name": "Speedy Jump over the Spikes, With Assist", + "entranceCondition": { + "comeInRunning": { + "speedBooster": "yes", + "minTiles": 8 + } + }, + "requires": [ + "canSpeedyJump", + "canInsaneJump", + {"or": [ + {"and": [ + "canPreciseWallJump", + {"heatFrames": 150} + ]}, + {"and": [ + "canLateralMidAirMorph", + {"heatFrames": 110} + ]} + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "devNote": "A running jump over the pit requires a runway in the previous room of 8 tiles with an open end, with a last-frame jump into a very precise air ball or wall jump." + }, { "id": 52, "link": [3, 4], diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index 34f0c1aea..ecff89907 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -3531,6 +3531,29 @@ "blueSuitChecked": true, "note": "Jump over the Cacatacs. Their projectiles remain inside of them and their hitbox is a bit smaller than it appears." }, + { + "link": [7, 1], + "name": "G-Mode Overload PLMs, Speed Block X-Ray Climb", + "requires": [ + "h_heatProof", + "canComplexGMode", + {"noBlueSuit": {}}, + "canGModeXRayClimb", + "canLongXRayClimb" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "bypassesDoorShell": "yes", + "note": [ + "Enter the right-most speed block, to where Samus is fully within it and between 0 and 5 pixels from the left edge of the block.", + "Exit G-mode while inside the speed blocks then X-Ray climb up. The camera will move up slightly once Samus is high enough, as she is pushed up from a slope below the door.", + "Stand up one more time, face left, then perform a turnaround buffered spin-jump away from the door to trigger the transition." + ], + "detailNote": [ + "Note that it is possible to be slightly left of this range if a low transition is usable in the next room,", + "or if very precisely timed X-Ray climbs are performed while inside the door transition to prevent triggering it." + ] + }, { "id": 84, "link": [7, 2], @@ -3693,6 +3716,32 @@ "FIXME: It is possible to X-Ray climb from inside the speed blocks. Count shots to determine Samus' position." ] }, + { + "link": [8, 1], + "name": "G-Mode Overload PLMs, Blind Speed Block X-Ray Climb", + "requires": [ + "h_heatProof", + "canComplexGMode", + "canOffScreenMovement", + {"noBlueSuit": {}}, + "canGModeXRayClimb", + "canLongXRayClimb" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "bypassesDoorShell": "yes", + "note": [ + "Enter the right-most speed block, to where Samus is fully within it and between 0 and 5 pixels from the left edge of the block.", + "This is when Samus enters the screen again and then moves right so there is just over one full tile gap between her and the left edge of the screen.", + "Alternatively, go past that and press against the left edge of the top stair, then jump up to the next stair and move left exactly or slightly less than 2 tiles.", + "Exit G-mode while inside the speed blocks then X-Ray climb up. The camera will move up slightly once Samus is high enough, as she is pushed up from a slope below the door.", + "Stand up one more time, face left, then perform a turnaround buffered spin-jump away from the door to trigger the transition." + ], + "detailNote": [ + "Note that it is possible to be slightly left of this range if a low transition is usable in the next room,", + "or if very precisely timed X-Ray climbs are performed while inside the door transition to prevent triggering it." + ] + }, { "id": 89, "link": [8, 3],