diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json index 01bef4d9b1..caf7c09693 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 3.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 3.json @@ -256,7 +256,7 @@ {"resourceCapacity": [{"type": "Super", "count": 1}]}, {"obstaclesCleared": ["A"]} ]}, - "canTrickyJump", + "canComplexGMode", {"or": [ {"and": [ "Gravity", @@ -266,21 +266,42 @@ "HiJump", "canSpaceJumpWaterBounce" ]}, + "canTrickyUseFrozenEnemies" + ]} + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, + "unlocksDoors": [{"types": ["ammo"], "requires": []}], + "flashSuitChecked": true, + "note": [ + "Carefully and quickly lure the Gamets to the right door without letting them go off camera.", + "It may help to kill any extra Gamets once they spread apart." + ] + }, + { + "link": [1, 2], + "name": "G-Mode Setup - Get Hit By Gamet, Tricky Manipulation", + "requires": [ + "h_navigateUnderwater", + {"or": [ + {"resourceCapacity": [{"type": "Super", "count": 1}]}, + {"obstaclesCleared": ["A"]} + ]}, + "canTrickyGMode", + {"or": [ {"and": [ "Gravity", "canPreciseGrapple" ]}, {"and": [ "Gravity", - "canTrickyWalljump", - "canInsaneJump" + "canTrickyWalljump" ]}, {"and": [ "HiJump", - "canPreciseGrapple", - "canInsaneJump" - ]}, - "canTrickyUseFrozenEnemies" + "canPreciseGrapple" + ]} ]} ], "exitCondition": { @@ -290,7 +311,8 @@ "flashSuitChecked": true, "note": [ "Carefully and quickly lure the Gamets to the right door without letting them go off camera.", - "It may help to kill any extra Gamets once they spread apart." + "It may help to kill any extra Gamets once they spread apart.", + "With Grapple, it can help to immediately press down after connecting to the block in order to get a quicker swing to the right." ] }, { diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json index 4b4791f030..229582a96a 100644 --- a/region/norfair/crocomire/Indiana Jones Room.json +++ b/region/norfair/crocomire/Indiana Jones Room.json @@ -1357,7 +1357,7 @@ "canManipulateMellas", "canCameraManip", "canBePatient", - "canTrickyJump", + "canComplexGMode", {"or": [ "SpaceJump", "canTrickyUseFrozenEnemies", diff --git a/region/norfair/crocomire/Post Crocomire Farming Room.json b/region/norfair/crocomire/Post Crocomire Farming Room.json index 6d053d459b..631175be55 100644 --- a/region/norfair/crocomire/Post Crocomire Farming Room.json +++ b/region/norfair/crocomire/Post Crocomire Farming Room.json @@ -285,16 +285,34 @@ "link": [1, 1], "name": "G-Mode Setup - Get Hit By Gamet", "requires": [ + "canComplexGMode", + "canTrickyUseFrozenEnemies", + "SpaceJump" + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, + "flashSuitChecked": true, + "note": [ + "Lure the Gamets to the top left door with Ice and Space Jump.", + "First lure the Gamets vertically using the Kamer platform and Ice, which is much easier with HiJump disabled.", + "Then freeze them again after they separate and are high enough to align with the door.", + "Space Jump to the left of them and refreeze them as they move to the left, then quickly climb back up to the top left before they thaw." + ] + }, + { + "link": [1, 1], + "name": "G-Mode Setup - Get Hit By Gamet, Tricky Manipulation", + "requires": [ + "canTrickyGMode", "canTrickyUseFrozenEnemies", {"or": [ - "SpaceJump", "Grapple", {"and": [ - "canTrickyJump", "HiJump", {"or": [ "SpeedBooster", - "canInsaneJump", + "canWalljump", "canSpringBallJumpMidAir" ]} ]} @@ -305,12 +323,13 @@ }, "flashSuitChecked": true, "note": [ - "Lure the Gamets to the top left door with Ice and Space Jump, Grapple, or HiJump.", + "Lure the Gamets to the top left door with Ice and Grapple or HiJump.", "First lure the Gamets vertically using the Kamer platform and Ice, which is much easier with HiJump disabled.", "Then freeze them again after they separate and are high enough to align with the door.", "With HiJump and another jump assist, jump to the left of the Gamets as they thaw and refreeze them a bit more to the left so that they will be on screen when Samus is on the left ledge.", "It is possible with HiJump and Ice alone, but much trickier. Use the Gamets as a platform or perform a running jump from the Kamer platform to get up to the left door." - ] + ], + "devNote": "This is possible with fewer requirements, but it is already pretty terrible." }, { "id": 8, diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json index 8d38a388a9..c60a433f51 100644 --- a/region/norfair/east/Bubble Mountain.json +++ b/region/norfair/east/Bubble Mountain.json @@ -2108,7 +2108,9 @@ "id": 205, "link": [3, 3], "name": "G-Mode Setup - Get Hit By Waver", - "requires": [], + "requires": [ + "canComplexGMode" + ], "exitCondition": { "leaveWithGModeSetup": {} }, @@ -2495,7 +2497,10 @@ "requires": [ {"or": [ {"resetRoom": {"nodes": [4, 5]}}, - {"ammo": {"type": "Super", "count": 1}} + {"and": [ + "canComplexGMode", + {"ammo": {"type": "Super", "count": 1}} + ]} ]} ], "exitCondition": { diff --git a/region/norfair/east/Frog Speedway.json b/region/norfair/east/Frog Speedway.json index 37dc662592..2972fa3b0b 100644 --- a/region/norfair/east/Frog Speedway.json +++ b/region/norfair/east/Frog Speedway.json @@ -850,6 +850,7 @@ "name": "G-Mode Setup - Get Hit By Beetom (Speedless Speedway)", "requires": [ {"notable": "Shot Block Overload (Speedless Speedway)"}, + "canComplexGMode", "Wave", {"or": [ "Spazer", diff --git a/region/norfair/east/Green Bubbles Tunnel.json b/region/norfair/east/Green Bubbles Tunnel.json index c4ec9207f3..f787180fdd 100644 --- a/region/norfair/east/Green Bubbles Tunnel.json +++ b/region/norfair/east/Green Bubbles Tunnel.json @@ -466,6 +466,7 @@ "link": [2, 2], "name": "G-Mode Setup - Get Hit By Geruta", "requires": [ + "canComplexGMode", {"heatFrames": 350} ], "exitCondition": { diff --git a/region/norfair/east/Magdollite Tunnel.json b/region/norfair/east/Magdollite Tunnel.json index f518499e3f..ca82258eff 100644 --- a/region/norfair/east/Magdollite Tunnel.json +++ b/region/norfair/east/Magdollite Tunnel.json @@ -107,12 +107,13 @@ "link": [1, 1], "name": "G-Mode Setup - Get Hit By Multiviola", "requires": [ + "canComplexGMode", {"heatFrames": 1880}, {"or": [ - "canTrickyDodgeEnemies", + "canInsaneJump", "h_heatProof", {"and": [ - "canTrickyJump", + "canTrickyDodgeEnemies", {"heatFrames": 350}, {"enemyDamage": {"enemy": "Magdollite", "type": "flame", "hits": 2}} ]} @@ -697,7 +698,11 @@ "link": [2, 2], "name": "G-Mode Setup - Get Hit By Multiviola", "requires": [ - {"heatFrames": 570} + {"heatFrames": 570}, + {"or": [ + "canTrickyDodgeEnemies", + {"enemyDamage": {"enemy": "Multiviola", "type": "contact", "hits": 1}} + ]} ], "exitCondition": { "leaveWithGModeSetup": {} diff --git a/region/norfair/east/Single Chamber.json b/region/norfair/east/Single Chamber.json index cd712de02c..0bffb2f588 100644 --- a/region/norfair/east/Single Chamber.json +++ b/region/norfair/east/Single Chamber.json @@ -2127,6 +2127,7 @@ "link": [4, 4], "name": "G-Mode Setup - Get Hit By Multiviola", "requires": [ + "canComplexGMode", {"or": [ "canWalljump", "HiJump", diff --git a/region/norfair/east/Speed Booster Hall.json b/region/norfair/east/Speed Booster Hall.json index 035346f225..e74210be3e 100644 --- a/region/norfair/east/Speed Booster Hall.json +++ b/region/norfair/east/Speed Booster Hall.json @@ -190,10 +190,10 @@ "link": [1, 1], "name": "G-Mode Setup - Get Hit By Geruta", "requires": [ + "canComplexGMode", {"heatFrames": 2100}, {"or": [ "h_heatProof", - "canTrickyJump", "canCrumbleJump" ]} ], @@ -409,10 +409,10 @@ "link": [1, 2], "name": "G-Mode Setup - Get Hit By Geruta", "requires": [ + "canComplexGMode", {"heatFrames": 2200}, {"or": [ "h_heatProof", - "canTrickyJump", "canCrumbleJump" ]} ], @@ -791,10 +791,10 @@ "link": [2, 1], "name": "G-Mode Setup - Get Hit By Geruta", "requires": [ + "canComplexGMode", {"heatFrames": 2250}, {"or": [ "h_heatProof", - "canTrickyJump", "canCrumbleJump" ]} ], @@ -901,10 +901,10 @@ "link": [2, 2], "name": "G-Mode Setup - Get Hit By Geruta", "requires": [ + "canComplexGMode", {"heatFrames": 2500}, {"or": [ "h_heatProof", - "canTrickyJump", "canCrumbleJump" ]} ], diff --git a/region/norfair/east/Upper Norfair Farming Room.json b/region/norfair/east/Upper Norfair Farming Room.json index 018e64efd5..cb88bd3d66 100644 --- a/region/norfair/east/Upper Norfair Farming Room.json +++ b/region/norfair/east/Upper Norfair Farming Room.json @@ -1036,10 +1036,12 @@ "link": [5, 1], "name": "G-Mode Setup - Get Hit By Gamet", "requires": [ + "canComplexGMode", {"heatFrames": 480}, {"or": [ "canTrickyUseFrozenEnemies", - "canTrickyJump" + "canMoonwalk", + "canInsaneJump" ]} ], "exitCondition": { diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json index 77f2d507b4..316b4276ca 100644 --- a/region/norfair/west/Crocomire Escape.json +++ b/region/norfair/west/Crocomire Escape.json @@ -364,6 +364,7 @@ "link": [2, 1], "name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Morph", "requires": [ + "canComplexGMode", "h_heatProof", "canBePatient", "canCameraManip", @@ -432,6 +433,7 @@ "link": [2, 1], "name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Morphless", "requires": [ + "canComplexGMode", "h_heatProof", "canBePatient", "canCameraManip", @@ -495,6 +497,7 @@ "link": [2, 1], "name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Frozen Geruta Step", "requires": [ + "canComplexGMode", "h_heatProof", "canBeVeryPatient", "canCameraManip", @@ -701,6 +704,7 @@ "link": [2, 2], "name": "G-Mode Setup - Get Hit By Geruta", "requires": [ + "canComplexGMode", "h_heatProof", "canBePatient", {"or": [ diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index 1a2658860b..049ff71154 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -632,18 +632,11 @@ "link": [2, 4], "name": "G-Mode Setup - Get Hit By Multiviola, Complex Manipulation", "requires": [ + "canTrickyGMode", "h_heatProof", "canBePatient", "canCameraManip", - "SpeedBooster", - {"or": [ - "canTrickyDodgeEnemies", - {"enemyDamage": {"enemy": "Multiviola", "type": "contact", "hits": 3}} - ]}, - {"or": [ - "canTrickyUseFrozenEnemies", - "canTrickyDodgeEnemies" - ]} + "SpeedBooster" ], "exitCondition": { "leaveWithGModeSetup": {} diff --git a/tech.json b/tech.json index 4e3dbecaa1..1269eeeb52 100644 --- a/tech.json +++ b/tech.json @@ -2533,7 +2533,9 @@ "bypassing door locks while in G-mode to maintain indirect G-mode in the next room;", "exiting direct G-mode while in the open door to get very deep doorstuck and X-Ray climb and doorlock bypass a door above;", "exiting G-mode while inside of overloaded blocks in order to have them solidify and be able to X-Ray climb;", - "touching an item in direct G-mode before PLMs are overloaded and obtaining the item remotely when exiting G-mode." + "touching an item in direct G-mode before PLMs are overloaded and obtaining the item remotely when exiting G-mode.", + "Getting a usable amount of Energy for G-mode setups where there is a high risk of taking extra damage beforehand can often benefit from getting close to the correct position,", + "taking an enemy hit and then using X-ray and waiting for Samus's i-frames to expire in order to be able to take additional hits without the enemy moving very much." ], "extensionTechs": [ {