diff --git a/region/brinstar/red/Alpha Power Bomb Room.json b/region/brinstar/red/Alpha Power Bomb Room.json index e126f077fa..8b45e178d2 100644 --- a/region/brinstar/red/Alpha Power Bomb Room.json +++ b/region/brinstar/red/Alpha Power Bomb Room.json @@ -461,7 +461,7 @@ ]}, {"and": [ {"ammo": {"type": "PowerBomb", "count": 4}}, - "canTrickyJump", + "canInsaneJump", "canHitbox" ]}, {"and": [ @@ -473,7 +473,7 @@ {"ammo": {"type": "PowerBomb", "count": 2}}, "h_artificialMorphBombHorizontally", {"enemyDamage": {"enemy": "Boyon", "type": "contact", "hits": 1}}, - "canTrickyJump", + "canInsaneJump", "canHitbox" ]}, {"and": [ @@ -510,7 +510,7 @@ "requires": [ "canUseIFrames", "canNeutralDamageBoost", - "canTrickyJump", + "canInsaneJump", {"thornHits": 5}, "h_artificialMorphPowerBomb", "h_additionalBomb" @@ -542,7 +542,7 @@ "requires": [ "canUseIFrames", "canNeutralDamageBoost", - "canInsaneJump", + "canTrickyGMode", {"thornHits": 2}, "h_artificialMorphPowerBomb" ], diff --git a/region/brinstar/red/Caterpillar Room.json b/region/brinstar/red/Caterpillar Room.json index 1d21581c1c..f3ee770038 100644 --- a/region/brinstar/red/Caterpillar Room.json +++ b/region/brinstar/red/Caterpillar Room.json @@ -1219,7 +1219,6 @@ "HiJump", "canWalljump", "SpaceJump", - "canIBJ", "canSpringBallJumpMidAir", {"and": [ "canTrickyDashJump", @@ -1281,7 +1280,6 @@ "HiJump", "canWalljump", "SpaceJump", - "canIBJ", "canSpringBallJumpMidAir", {"and": [ "canTrickyDashJump", @@ -1836,7 +1834,8 @@ "morphed": false } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "devNote": "There could be an artificial morph IBJ option, but that would just bypass a crouch jump + down grab requirement." }, { "id": 82, @@ -1862,7 +1861,6 @@ "HiJump", "canWalljump", "SpaceJump", - "canIBJ", "canSpringBallJumpMidAir", "h_crouchJumpDownGrab" ]} @@ -2019,7 +2017,7 @@ "entranceCondition": { "comeInWithGMode": { "mode": "indirect", - "morphed": true + "morphed": false } }, "requires": [], @@ -2135,7 +2133,7 @@ "The camera will not scroll through the morph tunnel, but Samus will still be visible;", "position where Samus appears to be standing on air one tile to the right of the ledge.", "It is possible to test the location, as there is a block on the ceiling one tile left of the gate.", - "With Morph, Samus can fix the camera by going through the morph tunnel." + "With Morph, Samus can then fix the camera by going through the morph tunnel." ] } ], diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json index b1dff6a297..213eb45cf6 100644 --- a/region/brinstar/red/Red Brinstar Fireflea Room.json +++ b/region/brinstar/red/Red Brinstar Fireflea Room.json @@ -355,7 +355,7 @@ { "id": 15, "link": [1, 2], - "name": "Long Ceiling Bomb Jump (Artificial Morph)", + "name": "G-Mode Morph Long Ceiling Bomb Jump", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -366,7 +366,7 @@ {"notable": "Long Ceiling Bomb Jump"}, "h_artificialMorphLongCeilingBombJump", "canBeVeryPatient", - "canInsaneJump" + "canTrickyGMode" ], "flashSuitChecked": true, "note": [ @@ -636,7 +636,7 @@ { "id": 32, "link": [2, 1], - "name": "Long Ceiling Bomb Jump (Artificial Morph)", + "name": "G-Mode Morph Long Ceiling Bomb Jump", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -649,7 +649,7 @@ "h_artificialMorphIBJ", "h_artificialMorphLongCeilingBombJump", "canBeVeryPatient", - "canInsaneJump" + "canTrickyGMode" ], "flashSuitChecked": true, "note": [ diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json index 85d7b210c9..1439206227 100644 --- a/region/brinstar/red/Red Tower.json +++ b/region/brinstar/red/Red Tower.json @@ -1309,6 +1309,67 @@ }, "bypassesDoorShell": true }, + { + "id": 62, + "link": [3, 2], + "name": "G-mode Morph IBJ, Power Bomb the Rippers", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_artificialMorphLongIBJ", + "h_artificialMorphPowerBomb", + {"or": [ + "h_artificialMorphStaggeredIBJ", + "h_artificialMorphPowerBomb" + ]}, + "h_artificialMorphPowerBomb", + {"or": [ + "canWalljump", + "HiJump" + ]} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Use two Power Bombs to kill the Rippers, or carefully pass the first two and place a single Power Bomb on the left ledge to kill them all.", + "Exit G-Mode before the Power Bomb explodes in order to break the wall." + ], + "devNote": "This will kill the Beetom, which could prevent using it to get up, so this needs to get all the way to 2. Anything with Morph can exit G-Mode at 6." + }, + { + "id": 63, + "link": [3, 2], + "name": "G-Mode Morph IBJ Between the Bottom Rippers, Power Bomb the Blocks", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + {"notable": "IBJ Between the Bottom Rippers"}, + "h_artificialMorphDoubleBombJump", + "h_artificialMorphStaggeredIBJ", + "h_artificialMorphPowerBomb", + "h_artificialMorphLongIBJ", + {"or": [ + "canWalljump", + "HiJump" + ]} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.", + "Exit G-Mode before the Power Bomb explodes in order to break the wall.", + "With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers." + ], + "devNote": "This will kill the Beetom, which could prevent using it to get up, so this needs to get all the way to 2. Anything with Morph can exit G-Mode at 6." + }, { "id": 48, "link": [3, 2], @@ -1605,7 +1666,6 @@ ] }, { - "id": 62, "link": [3, 6], "name": "G-mode Morph IBJ, Power Bomb the Rippers", "entranceCondition": { @@ -1618,22 +1678,16 @@ "h_artificialMorphLongIBJ", "h_artificialMorphPowerBomb", {"or": [ - "canTrickyJump", + "h_artificialMorphStaggeredIBJ", "h_artificialMorphPowerBomb" - ]}, - "h_artificialMorphPowerBomb" + ]} ], - "clearsObstacles": ["A"], "flashSuitChecked": true, - "note": [ - "Use two Power Bombs to kill the Rippers, or carefully pass the first two and place a single Power Bomb on the left ledge to kill them all.", - "Exit G-Mode before the Power Bomb explodes in order to break the wall." - ] + "note": "Use two Power Bombs to kill the Rippers, or carefully pass the first two and place a single Power Bomb on the left ledge to kill them all." }, { - "id": 63, "link": [3, 6], - "name": "IBJ Between the Bottom Rippers (Artificial Morph)", + "name": "G-Mode Morph IBJ Between the Bottom Rippers", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1647,12 +1701,10 @@ "h_artificialMorphPowerBomb", "h_artificialMorphLongIBJ" ], - "clearsObstacles": ["A"], "flashSuitChecked": true, "note": [ "Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.", - "Exit G-Mode before the Power Bomb explodes in order to break the wall.", - "With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers." + "With a Power Bomb, it can help to kill some of the Rippers." ] }, { @@ -1720,6 +1772,67 @@ "FIXME: This might also be possible with Spring Ball instead of HiJump, but if so it seems really bad." ] }, + { + "id": 81, + "link": [4, 2], + "name": "G-mode Morph IBJ, Power Bomb the Rippers", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_artificialMorphLongIBJ", + "h_artificialMorphPowerBomb", + {"or": [ + "h_artificialMorphStaggeredIBJ", + "h_artificialMorphPowerBomb" + ]}, + "h_artificialMorphPowerBomb", + {"or": [ + "canWalljump", + "HiJump" + ]} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Use two Power Bombs to kill the Rippers, or carefully pass the first two and place a single Power Bomb on the left ledge to kill them all.", + "Exit G-Mode before the Power Bomb explodes in order to break the wall." + ], + "devNote": "This will kill the Beetom, which could prevent using it to get up, so this needs to get all the way to 2. Anything with Morph can exit G-Mode at 6." + }, + { + "id": 82, + "link": [4, 2], + "name": "G-Mode Morph IBJ Between the Bottom Rippers, Power Bomb the Blocks", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + {"notable": "IBJ Between the Bottom Rippers"}, + "h_artificialMorphDoubleBombJump", + "h_artificialMorphStaggeredIBJ", + "h_artificialMorphPowerBomb", + "h_artificialMorphLongIBJ", + {"or": [ + "canWalljump", + "HiJump" + ]} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.", + "Exit G-Mode before the Power Bomb explodes in order to break the wall.", + "With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers." + ], + "devNote": "This will kill the Beetom, which could prevent using it to get up, so this needs to get all the way to 2. Anything with Morph can exit G-Mode at 6." + }, { "id": 68, "link": [4, 2], @@ -1966,7 +2079,6 @@ "flashSuitChecked": true }, { - "id": 81, "link": [4, 6], "name": "G-mode Morph IBJ, Power Bomb the Rippers", "entranceCondition": { @@ -1979,22 +2091,16 @@ "h_artificialMorphLongIBJ", "h_artificialMorphPowerBomb", {"or": [ - "canTrickyJump", + "h_artificialMorphStaggeredIBJ", "h_artificialMorphPowerBomb" - ]}, - "h_artificialMorphPowerBomb" + ]} ], - "clearsObstacles": ["A"], "flashSuitChecked": true, - "note": [ - "Use two Power Bombs to kill the Rippers, or carefully pass the first two and place a single Power Bomb on the left ledge to kill them all.", - "Exit G-Mode before the Power Bomb explodes in order to break the wall." - ] + "note": "Use two Power Bombs to kill the Rippers, or carefully pass the first two and place a single Power Bomb on the left ledge to kill them all." }, { - "id": 82, "link": [4, 6], - "name": "IBJ Between the Bottom Rippers (Artificial Morph)", + "name": "G-Mode Morph IBJ Between the Bottom Rippers", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2008,12 +2114,10 @@ "h_artificialMorphPowerBomb", "h_artificialMorphLongIBJ" ], - "clearsObstacles": ["A"], "flashSuitChecked": true, "note": [ "Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.", - "Exit G-Mode before the Power Bomb explodes in order to break the wall.", - "With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers." + "With a Power Bomb, it can help to kill some of the Rippers." ] }, {