Skip to content

Commit 8345133

Browse files
blkerbyblkerby
authored
Merge pull request #1781 from blkerby/caterpillar-open-gate
More ways to open Caterpillar Room green gate with G-mode
2 parents 0ef761d + 1eb173a commit 8345133

3 files changed

Lines changed: 142 additions & 99 deletions

File tree

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

Lines changed: 138 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@
5959
"nodeSubType": "elevator",
6060
"nodeAddress": "0x00190ba",
6161
"doorOrientation": "up"
62+
},
63+
{
64+
"id": 7,
65+
"name": "G-Mode Morph Junction Indirect (In Morph Tunnel)",
66+
"nodeType": "junction",
67+
"nodeSubType": "g-mode",
68+
"note": "Represents being in the morph tunnel with G-Mode and morph or artificial morph, in indirect G-Mode"
6269
}
6370
],
6471
"obstacles": [
@@ -98,7 +105,8 @@
98105
{"id": 3},
99106
{"id": 4},
100107
{"id": 5},
101-
{"id": 6}
108+
{"id": 6},
109+
{"id": 7}
102110
]
103111
},
104112
{
@@ -108,8 +116,8 @@
108116
{"id": 2},
109117
{"id": 3},
110118
{"id": 4},
111-
{"id": 5},
112-
{"id": 6}
119+
{"id": 6},
120+
{"id": 7}
113121
]
114122
},
115123
{
@@ -128,8 +136,8 @@
128136
{"id": 2},
129137
{"id": 3},
130138
{"id": 4},
131-
{"id": 5},
132-
{"id": 6}
139+
{"id": 6},
140+
{"id": 7}
133141
]
134142
},
135143
{
@@ -144,7 +152,15 @@
144152
"from": 6,
145153
"to": [
146154
{"id": 1},
147-
{"id": 5}
155+
{"id": 7}
156+
]
157+
},
158+
{
159+
"from": 7,
160+
"to": [
161+
{"id": 1},
162+
{"id": 5},
163+
{"id": 6}
148164
]
149165
}
150166
],
@@ -473,27 +489,6 @@
473489
],
474490
"devNote": "It is possible to roll off of the platform above to avoid a mid-air morph."
475491
},
476-
{
477-
"id": 15,
478-
"link": [1, 5],
479-
"name": "G-Mode Morph Despawn the Gate",
480-
"entranceCondition": {
481-
"comeInWithGMode": {
482-
"mode": "indirect",
483-
"morphed": true
484-
}
485-
},
486-
"requires": [
487-
{"or": [
488-
"h_canArtificialMorphMovement",
489-
{"and": [
490-
"h_canArtificialMorphBombThings",
491-
"h_additionalBomb"
492-
]}
493-
]}
494-
],
495-
"flashSuitChecked": true
496-
},
497492
{
498493
"id": 16,
499494
"link": [1, 6],
@@ -598,6 +593,27 @@
598593
},
599594
"flashSuitChecked": true
600595
},
596+
{
597+
"id": 15,
598+
"link": [1, 7],
599+
"name": "G-Mode Morph Despawn the Gate",
600+
"entranceCondition": {
601+
"comeInWithGMode": {
602+
"mode": "indirect",
603+
"morphed": true
604+
}
605+
},
606+
"requires": [
607+
{"or": [
608+
"h_canArtificialMorphMovement",
609+
{"and": [
610+
"h_canArtificialMorphBombThings",
611+
"h_additionalBomb"
612+
]}
613+
]}
614+
],
615+
"flashSuitChecked": true
616+
},
601617
{
602618
"id": 22,
603619
"link": [2, 1],
@@ -1214,44 +1230,6 @@
12141230
],
12151231
"flashSuitChecked": true
12161232
},
1217-
{
1218-
"id": 48,
1219-
"link": [2, 5],
1220-
"name": "G-Mode Morph Despawn the Gate",
1221-
"entranceCondition": {
1222-
"comeInWithGMode": {
1223-
"mode": "indirect",
1224-
"morphed": true
1225-
}
1226-
},
1227-
"requires": [
1228-
{"or": [
1229-
"h_canArtificialMorphIBJ",
1230-
{"and": [
1231-
"h_canArtificialMorphSpringBallBombJump",
1232-
"h_additionalBomb"
1233-
]},
1234-
{"and": [
1235-
"h_canArtificialMorphSpringBall",
1236-
"HiJump"
1237-
]},
1238-
{"and": [
1239-
"Morph",
1240-
{"or": [
1241-
"HiJump",
1242-
"canWalljump",
1243-
"h_canFly",
1244-
"canSpringBallJumpMidAir",
1245-
{"and": [
1246-
"canTrickyDashJump",
1247-
"h_canCrouchJumpDownGrab"
1248-
]}
1249-
]}
1250-
]}
1251-
]}
1252-
],
1253-
"flashSuitChecked": true
1254-
},
12551233
{
12561234
"id": 49,
12571235
"link": [2, 6],
@@ -1301,6 +1279,44 @@
13011279
},
13021280
"flashSuitChecked": true
13031281
},
1282+
{
1283+
"id": 48,
1284+
"link": [2, 7],
1285+
"name": "G-Mode Morph Despawn the Gate",
1286+
"entranceCondition": {
1287+
"comeInWithGMode": {
1288+
"mode": "indirect",
1289+
"morphed": true
1290+
}
1291+
},
1292+
"requires": [
1293+
{"or": [
1294+
"h_canArtificialMorphIBJ",
1295+
{"and": [
1296+
"h_canArtificialMorphSpringBallBombJump",
1297+
"h_additionalBomb"
1298+
]},
1299+
{"and": [
1300+
"h_canArtificialMorphSpringBall",
1301+
"HiJump"
1302+
]},
1303+
{"and": [
1304+
"Morph",
1305+
{"or": [
1306+
"HiJump",
1307+
"canWalljump",
1308+
"h_canFly",
1309+
"canSpringBallJumpMidAir",
1310+
{"and": [
1311+
"canTrickyDashJump",
1312+
"h_canCrouchJumpDownGrab"
1313+
]}
1314+
]}
1315+
]}
1316+
]}
1317+
],
1318+
"flashSuitChecked": true
1319+
},
13041320
{
13051321
"id": 51,
13061322
"link": [3, 1],
@@ -1926,9 +1942,35 @@
19261942
"note": "Let the Caterpillar climb the right wall and jump on top of it in Morph Ball form to bounce up to the Cacatac platform.",
19271943
"devNote": "It takes around 50 seconds to get the Zero to this door."
19281944
},
1945+
{
1946+
"id": 83,
1947+
"link": [4, 6],
1948+
"name": "G-Mode Up the Elevator",
1949+
"entranceCondition": {
1950+
"comeInWithGMode": {
1951+
"mode": "any",
1952+
"morphed": false
1953+
}
1954+
},
1955+
"requires": [
1956+
{"or": [
1957+
"HiJump",
1958+
"canWalljump",
1959+
"h_canFly",
1960+
"canSpringBallJumpMidAir",
1961+
"h_canCrouchJumpDownGrab"
1962+
]}
1963+
],
1964+
"exitCondition": {
1965+
"leaveWithGMode": {
1966+
"morphed": false
1967+
}
1968+
},
1969+
"flashSuitChecked": true
1970+
},
19291971
{
19301972
"id": 82,
1931-
"link": [4, 5],
1973+
"link": [4, 7],
19321974
"name": "G-Mode Morph Despawn the Gate",
19331975
"entranceCondition": {
19341976
"comeInWithGMode": {
@@ -1958,32 +2000,6 @@
19582000
],
19592001
"flashSuitChecked": true
19602002
},
1961-
{
1962-
"id": 83,
1963-
"link": [4, 6],
1964-
"name": "G-Mode Up the Elevator",
1965-
"entranceCondition": {
1966-
"comeInWithGMode": {
1967-
"mode": "any",
1968-
"morphed": false
1969-
}
1970-
},
1971-
"requires": [
1972-
{"or": [
1973-
"HiJump",
1974-
"canWalljump",
1975-
"h_canFly",
1976-
"canSpringBallJumpMidAir",
1977-
"h_canCrouchJumpDownGrab"
1978-
]}
1979-
],
1980-
"exitCondition": {
1981-
"leaveWithGMode": {
1982-
"morphed": false
1983-
}
1984-
},
1985-
"flashSuitChecked": true
1986-
},
19872003
{
19882004
"id": 84,
19892005
"link": [5, 1],
@@ -2139,7 +2155,7 @@
21392155
"requires": [],
21402156
"clearsObstacles": ["A"],
21412157
"flashSuitChecked": true,
2142-
"note": "Exit G-Mode whle under the gate to open it without a Super."
2158+
"note": "Exit G-Mode while under the gate to open it without a Super."
21432159
},
21442160
{
21452161
"id": 92,
@@ -2155,7 +2171,8 @@
21552171
{"or": [
21562172
"h_canArtificialMorphMovement",
21572173
"h_canArtificialMorphBombThings"
2158-
]}
2174+
]},
2175+
"canOffScreenMovement"
21592176
],
21602177
"exitCondition": {
21612178
"leaveWithGMode": {
@@ -2203,7 +2220,7 @@
22032220
},
22042221
{
22052222
"id": 95,
2206-
"link": [6, 5],
2223+
"link": [6, 7],
22072224
"name": "G-Mode Despawn the Gate",
22082225
"entranceCondition": {
22092226
"comeInWithGMode": {
@@ -2215,6 +2232,32 @@
22152232
"Morph"
22162233
],
22172234
"flashSuitChecked": true
2235+
},
2236+
{
2237+
"link": [7, 5],
2238+
"name": "Exit G-Mode",
2239+
"requires": [
2240+
"canEnterGMode"
2241+
],
2242+
"flashSuitChecked": true,
2243+
"note": "Exit G-Mode near the door to pass the gate."
2244+
},
2245+
{
2246+
"link": [7, 5],
2247+
"name": "Exit G-Mode, Open Gate",
2248+
"requires": [
2249+
"canEnterGMode",
2250+
"canOffScreenMovement"
2251+
],
2252+
"clearsObstacles": ["A"],
2253+
"flashSuitChecked": true,
2254+
"note": [
2255+
"Exit G-Mode while under the gate to open it without a Super.",
2256+
"The camera will not scroll through the morph tunnel, but Samus will still be visible;",
2257+
"position where Samus appears to be standing on air one tile to the right of the ledge.",
2258+
"It is possible to test the location, as there is a block on the ceiling one tile left of the gate.",
2259+
"With Morph, Samus can fix the camera by going through the morph tunnel."
2260+
]
22182261
}
22192262
],
22202263
"nextStratId": 97,

‎region/maridia/outer/Crab Tunnel.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"flashSuitChecked": true,
235235
"note": [
236236
"The gate will not spawn in indirect G-Mode, and can be freely passed.",
237-
"Exit G-Mode whle under the gate to open it without a Super."
237+
"Exit G-Mode while under the gate to open it without a Super."
238238
]
239239
},
240240
{
@@ -342,7 +342,7 @@
342342
"flashSuitChecked": true,
343343
"note": [
344344
"The gate will not spawn in indirect G-Mode, and can be freely passed.",
345-
"Exit G-Mode whle under the gate to open it without a Super."
345+
"Exit G-Mode while under the gate to open it without a Super."
346346
]
347347
},
348348
{

‎region/norfair/crocomire/Grapple Tutorial Room 3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@
731731
"requires": [],
732732
"clearsObstacles": ["A"],
733733
"flashSuitChecked": true,
734-
"note": "Exit G-Mode whle under the gate to open it without a Super."
734+
"note": "Exit G-Mode while under the gate to open it without a Super."
735735
},
736736
{
737737
"id": 34,
@@ -768,7 +768,7 @@
768768
"resetsObstacles": ["B"],
769769
"clearsObstacles": ["A"],
770770
"flashSuitChecked": true,
771-
"note": "Exit G-Mode whle under the gate to open it without a Super."
771+
"note": "Exit G-Mode while under the gate to open it without a Super."
772772
},
773773
{
774774
"id": 39,

0 commit comments

Comments
 (0)