Skip to content

Commit 65918b2

Browse files
osse101osse101
authored
Merge pull request #2054 from kjbranch/g-red
Refine G-Mode: Red Brinstar
2 parents c7e4893 + 96cbad4 commit 65918b2

4 files changed

Lines changed: 144 additions & 42 deletions

File tree

‎region/brinstar/red/Alpha Power Bomb Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
]},
462462
{"and": [
463463
{"ammo": {"type": "PowerBomb", "count": 4}},
464-
"canTrickyJump",
464+
"canInsaneJump",
465465
"canHitbox"
466466
]},
467467
{"and": [
@@ -473,7 +473,7 @@
473473
{"ammo": {"type": "PowerBomb", "count": 2}},
474474
"h_artificialMorphBombHorizontally",
475475
{"enemyDamage": {"enemy": "Boyon", "type": "contact", "hits": 1}},
476-
"canTrickyJump",
476+
"canInsaneJump",
477477
"canHitbox"
478478
]},
479479
{"and": [
@@ -510,7 +510,7 @@
510510
"requires": [
511511
"canUseIFrames",
512512
"canNeutralDamageBoost",
513-
"canTrickyJump",
513+
"canInsaneJump",
514514
{"thornHits": 5},
515515
"h_artificialMorphPowerBomb",
516516
"h_additionalBomb"
@@ -542,7 +542,7 @@
542542
"requires": [
543543
"canUseIFrames",
544544
"canNeutralDamageBoost",
545-
"canInsaneJump",
545+
"canTrickyGMode",
546546
{"thornHits": 2},
547547
"h_artificialMorphPowerBomb"
548548
],

‎region/brinstar/red/Caterpillar Room.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,6 @@
12191219
"HiJump",
12201220
"canWalljump",
12211221
"SpaceJump",
1222-
"canIBJ",
12231222
"canSpringBallJumpMidAir",
12241223
{"and": [
12251224
"canTrickyDashJump",
@@ -1281,7 +1280,6 @@
12811280
"HiJump",
12821281
"canWalljump",
12831282
"SpaceJump",
1284-
"canIBJ",
12851283
"canSpringBallJumpMidAir",
12861284
{"and": [
12871285
"canTrickyDashJump",
@@ -1836,7 +1834,8 @@
18361834
"morphed": false
18371835
}
18381836
},
1839-
"flashSuitChecked": true
1837+
"flashSuitChecked": true,
1838+
"devNote": "There could be an artificial morph IBJ option, but that would just bypass a crouch jump + down grab requirement."
18401839
},
18411840
{
18421841
"id": 82,
@@ -1862,7 +1861,6 @@
18621861
"HiJump",
18631862
"canWalljump",
18641863
"SpaceJump",
1865-
"canIBJ",
18661864
"canSpringBallJumpMidAir",
18671865
"h_crouchJumpDownGrab"
18681866
]}
@@ -2019,7 +2017,7 @@
20192017
"entranceCondition": {
20202018
"comeInWithGMode": {
20212019
"mode": "indirect",
2022-
"morphed": true
2020+
"morphed": false
20232021
}
20242022
},
20252023
"requires": [],
@@ -2135,7 +2133,7 @@
21352133
"The camera will not scroll through the morph tunnel, but Samus will still be visible;",
21362134
"position where Samus appears to be standing on air one tile to the right of the ledge.",
21372135
"It is possible to test the location, as there is a block on the ceiling one tile left of the gate.",
2138-
"With Morph, Samus can fix the camera by going through the morph tunnel."
2136+
"With Morph, Samus can then fix the camera by going through the morph tunnel."
21392137
]
21402138
}
21412139
],

‎region/brinstar/red/Red Brinstar Fireflea Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
{
356356
"id": 15,
357357
"link": [1, 2],
358-
"name": "Long Ceiling Bomb Jump (Artificial Morph)",
358+
"name": "G-Mode Morph Long Ceiling Bomb Jump",
359359
"entranceCondition": {
360360
"comeInWithGMode": {
361361
"mode": "any",
@@ -366,7 +366,7 @@
366366
{"notable": "Long Ceiling Bomb Jump"},
367367
"h_artificialMorphLongCeilingBombJump",
368368
"canBeVeryPatient",
369-
"canInsaneJump"
369+
"canTrickyGMode"
370370
],
371371
"flashSuitChecked": true,
372372
"note": [
@@ -636,7 +636,7 @@
636636
{
637637
"id": 32,
638638
"link": [2, 1],
639-
"name": "Long Ceiling Bomb Jump (Artificial Morph)",
639+
"name": "G-Mode Morph Long Ceiling Bomb Jump",
640640
"entranceCondition": {
641641
"comeInWithGMode": {
642642
"mode": "any",
@@ -649,7 +649,7 @@
649649
"h_artificialMorphIBJ",
650650
"h_artificialMorphLongCeilingBombJump",
651651
"canBeVeryPatient",
652-
"canInsaneJump"
652+
"canTrickyGMode"
653653
],
654654
"flashSuitChecked": true,
655655
"note": [

‎region/brinstar/red/Red Tower.json‎

Lines changed: 132 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,6 +1309,67 @@
13091309
},
13101310
"bypassesDoorShell": true
13111311
},
1312+
{
1313+
"id": 62,
1314+
"link": [3, 2],
1315+
"name": "G-mode Morph IBJ, Power Bomb the Rippers",
1316+
"entranceCondition": {
1317+
"comeInWithGMode": {
1318+
"mode": "any",
1319+
"morphed": true
1320+
}
1321+
},
1322+
"requires": [
1323+
"h_artificialMorphLongIBJ",
1324+
"h_artificialMorphPowerBomb",
1325+
{"or": [
1326+
"h_artificialMorphStaggeredIBJ",
1327+
"h_artificialMorphPowerBomb"
1328+
]},
1329+
"h_artificialMorphPowerBomb",
1330+
{"or": [
1331+
"canWalljump",
1332+
"HiJump"
1333+
]}
1334+
],
1335+
"clearsObstacles": ["A"],
1336+
"flashSuitChecked": true,
1337+
"note": [
1338+
"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.",
1339+
"Exit G-Mode before the Power Bomb explodes in order to break the wall."
1340+
],
1341+
"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."
1342+
},
1343+
{
1344+
"id": 63,
1345+
"link": [3, 2],
1346+
"name": "G-Mode Morph IBJ Between the Bottom Rippers, Power Bomb the Blocks",
1347+
"entranceCondition": {
1348+
"comeInWithGMode": {
1349+
"mode": "any",
1350+
"morphed": true
1351+
}
1352+
},
1353+
"requires": [
1354+
{"notable": "IBJ Between the Bottom Rippers"},
1355+
"h_artificialMorphDoubleBombJump",
1356+
"h_artificialMorphStaggeredIBJ",
1357+
"h_artificialMorphPowerBomb",
1358+
"h_artificialMorphLongIBJ",
1359+
{"or": [
1360+
"canWalljump",
1361+
"HiJump"
1362+
]}
1363+
],
1364+
"clearsObstacles": ["A"],
1365+
"flashSuitChecked": true,
1366+
"note": [
1367+
"Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.",
1368+
"Exit G-Mode before the Power Bomb explodes in order to break the wall.",
1369+
"With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers."
1370+
],
1371+
"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."
1372+
},
13121373
{
13131374
"id": 48,
13141375
"link": [3, 2],
@@ -1605,7 +1666,6 @@
16051666
]
16061667
},
16071668
{
1608-
"id": 62,
16091669
"link": [3, 6],
16101670
"name": "G-mode Morph IBJ, Power Bomb the Rippers",
16111671
"entranceCondition": {
@@ -1618,22 +1678,16 @@
16181678
"h_artificialMorphLongIBJ",
16191679
"h_artificialMorphPowerBomb",
16201680
{"or": [
1621-
"canTrickyJump",
1681+
"h_artificialMorphStaggeredIBJ",
16221682
"h_artificialMorphPowerBomb"
1623-
]},
1624-
"h_artificialMorphPowerBomb"
1683+
]}
16251684
],
1626-
"clearsObstacles": ["A"],
16271685
"flashSuitChecked": true,
1628-
"note": [
1629-
"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.",
1630-
"Exit G-Mode before the Power Bomb explodes in order to break the wall."
1631-
]
1686+
"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."
16321687
},
16331688
{
1634-
"id": 63,
16351689
"link": [3, 6],
1636-
"name": "IBJ Between the Bottom Rippers (Artificial Morph)",
1690+
"name": "G-Mode Morph IBJ Between the Bottom Rippers",
16371691
"entranceCondition": {
16381692
"comeInWithGMode": {
16391693
"mode": "any",
@@ -1647,12 +1701,10 @@
16471701
"h_artificialMorphPowerBomb",
16481702
"h_artificialMorphLongIBJ"
16491703
],
1650-
"clearsObstacles": ["A"],
16511704
"flashSuitChecked": true,
16521705
"note": [
16531706
"Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.",
1654-
"Exit G-Mode before the Power Bomb explodes in order to break the wall.",
1655-
"With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers."
1707+
"With a Power Bomb, it can help to kill some of the Rippers."
16561708
]
16571709
},
16581710
{
@@ -1720,6 +1772,67 @@
17201772
"FIXME: This might also be possible with Spring Ball instead of HiJump, but if so it seems really bad."
17211773
]
17221774
},
1775+
{
1776+
"id": 81,
1777+
"link": [4, 2],
1778+
"name": "G-mode Morph IBJ, Power Bomb the Rippers",
1779+
"entranceCondition": {
1780+
"comeInWithGMode": {
1781+
"mode": "any",
1782+
"morphed": true
1783+
}
1784+
},
1785+
"requires": [
1786+
"h_artificialMorphLongIBJ",
1787+
"h_artificialMorphPowerBomb",
1788+
{"or": [
1789+
"h_artificialMorphStaggeredIBJ",
1790+
"h_artificialMorphPowerBomb"
1791+
]},
1792+
"h_artificialMorphPowerBomb",
1793+
{"or": [
1794+
"canWalljump",
1795+
"HiJump"
1796+
]}
1797+
],
1798+
"clearsObstacles": ["A"],
1799+
"flashSuitChecked": true,
1800+
"note": [
1801+
"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.",
1802+
"Exit G-Mode before the Power Bomb explodes in order to break the wall."
1803+
],
1804+
"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."
1805+
},
1806+
{
1807+
"id": 82,
1808+
"link": [4, 2],
1809+
"name": "G-Mode Morph IBJ Between the Bottom Rippers, Power Bomb the Blocks",
1810+
"entranceCondition": {
1811+
"comeInWithGMode": {
1812+
"mode": "any",
1813+
"morphed": true
1814+
}
1815+
},
1816+
"requires": [
1817+
{"notable": "IBJ Between the Bottom Rippers"},
1818+
"h_artificialMorphDoubleBombJump",
1819+
"h_artificialMorphStaggeredIBJ",
1820+
"h_artificialMorphPowerBomb",
1821+
"h_artificialMorphLongIBJ",
1822+
{"or": [
1823+
"canWalljump",
1824+
"HiJump"
1825+
]}
1826+
],
1827+
"clearsObstacles": ["A"],
1828+
"flashSuitChecked": true,
1829+
"note": [
1830+
"Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.",
1831+
"Exit G-Mode before the Power Bomb explodes in order to break the wall.",
1832+
"With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers."
1833+
],
1834+
"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."
1835+
},
17231836
{
17241837
"id": 68,
17251838
"link": [4, 2],
@@ -1966,7 +2079,6 @@
19662079
"flashSuitChecked": true
19672080
},
19682081
{
1969-
"id": 81,
19702082
"link": [4, 6],
19712083
"name": "G-mode Morph IBJ, Power Bomb the Rippers",
19722084
"entranceCondition": {
@@ -1979,22 +2091,16 @@
19792091
"h_artificialMorphLongIBJ",
19802092
"h_artificialMorphPowerBomb",
19812093
{"or": [
1982-
"canTrickyJump",
2094+
"h_artificialMorphStaggeredIBJ",
19832095
"h_artificialMorphPowerBomb"
1984-
]},
1985-
"h_artificialMorphPowerBomb"
2096+
]}
19862097
],
1987-
"clearsObstacles": ["A"],
19882098
"flashSuitChecked": true,
1989-
"note": [
1990-
"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.",
1991-
"Exit G-Mode before the Power Bomb explodes in order to break the wall."
1992-
]
2099+
"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."
19932100
},
19942101
{
1995-
"id": 82,
19962102
"link": [4, 6],
1997-
"name": "IBJ Between the Bottom Rippers (Artificial Morph)",
2103+
"name": "G-Mode Morph IBJ Between the Bottom Rippers",
19982104
"entranceCondition": {
19992105
"comeInWithGMode": {
20002106
"mode": "any",
@@ -2008,12 +2114,10 @@
20082114
"h_artificialMorphPowerBomb",
20092115
"h_artificialMorphLongIBJ"
20102116
],
2011-
"clearsObstacles": ["A"],
20122117
"flashSuitChecked": true,
20132118
"note": [
20142119
"Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable.",
2015-
"Exit G-Mode before the Power Bomb explodes in order to break the wall.",
2016-
"With an extra Power Bomb, it may be worthwhile to use it to kill some of the Rippers."
2120+
"With a Power Bomb, it can help to kill some of the Rippers."
20172121
]
20182122
},
20192123
{

0 commit comments

Comments
 (0)