Skip to content

Commit 479cf50

Browse files
kjbranchkjbranch
committed
finish outer maridia
1 parent ab96ca6 commit 479cf50

3 files changed

Lines changed: 228 additions & 122 deletions

File tree

‎region/maridia/outer/Main Street.json‎

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@
195195
[1, 1, 0],
196196
[1, 1, 1],
197197
[1, 1, 0]
198-
]
198+
],
199+
"devNote": "Currently this node is only used to overload the speed blocks then use global crab to collect the item."
199200
},
200201
{
201202
"id": 11,
@@ -211,7 +212,8 @@
211212
[1, 1, 0],
212213
[1, 1, 1],
213214
[1, 1, 0]
214-
]
215+
],
216+
"devNote": "Currently this node is only used to overload the speed blocks then use global crab to collect the item."
215217
},
216218
{
217219
"id": 12,
@@ -227,7 +229,8 @@
227229
[1, 1, 0],
228230
[1, 1, 2],
229231
[1, 1, 0]
230-
]
232+
],
233+
"devNote": "Currently this node is only used to overload the speed blocks then use global crab to collect the item."
231234
},
232235
{
233236
"id": 13,
@@ -1158,6 +1161,7 @@
11581161
"comesThroughToilet": "no"
11591162
},
11601163
"requires": [
1164+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
11611165
"h_navigateUnderwater",
11621166
{"or": [
11631167
"canGravityJump",
@@ -1210,6 +1214,7 @@
12101214
"comesThroughToilet": "any"
12111215
},
12121216
"requires": [
1217+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
12131218
"h_navigateUnderwater",
12141219
{"or": [
12151220
"canGravityJump",
@@ -1264,7 +1269,17 @@
12641269
{"or": [
12651270
{"and": [
12661271
"Gravity",
1267-
"h_artificialMorphIBJ"
1272+
{"or": [
1273+
"h_artificialMorphIBJ",
1274+
{"and": [
1275+
"h_artificialMorphSpringBall",
1276+
"HiJump"
1277+
]},
1278+
{"and": [
1279+
"h_artificialMorphSpringBall",
1280+
"canGravityJump"
1281+
]}
1282+
]}
12681283
]},
12691284
"h_artificialMorphDoubleSpringBallJump"
12701285
]}
@@ -2184,6 +2199,7 @@
21842199
}
21852200
},
21862201
"requires": [
2202+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
21872203
"h_navigateUnderwater",
21882204
{"or": [
21892205
"canGravityJump",
@@ -2235,6 +2251,7 @@
22352251
}
22362252
},
22372253
"requires": [
2254+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
22382255
"h_navigateUnderwater",
22392256
{"or": [
22402257
"canGravityJump",
@@ -2288,7 +2305,17 @@
22882305
{"or": [
22892306
{"and": [
22902307
"Gravity",
2291-
"h_artificialMorphIBJ"
2308+
{"or": [
2309+
"h_artificialMorphIBJ",
2310+
{"and": [
2311+
"h_artificialMorphSpringBall",
2312+
"HiJump"
2313+
]},
2314+
{"and": [
2315+
"h_artificialMorphSpringBall",
2316+
"canGravityJump"
2317+
]}
2318+
]}
22922319
]},
22932320
"h_artificialMorphDoubleSpringBallJump"
22942321
]}
@@ -3396,7 +3423,9 @@
33963423
"morphed": false
33973424
}
33983425
},
3399-
"requires": [],
3426+
"requires": [
3427+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"}
3428+
],
34003429
"clearsObstacles": ["B"],
34013430
"flashSuitChecked": true,
34023431
"devNote": "FIXME: Immobile strats may need canBeVeryPatient if they can't be done before the crab is in position"
@@ -3411,7 +3440,9 @@
34113440
"morphed": false
34123441
}
34133442
},
3414-
"requires": [],
3443+
"requires": [
3444+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"}
3445+
],
34153446
"flashSuitChecked": true,
34163447
"devNote": "FIXME: Immobile strats may need canBeVeryPatient if they can't be done before the crab is in position"
34173448
},
@@ -4381,30 +4412,11 @@
43814412
]}
43824413
],
43834414
"flashSuitChecked": true,
4384-
"note": "The crab will not come through the whole tunnel, so wait for it to pass before going through the vertical portion."
4385-
},
4386-
{
4387-
"id": 119,
4388-
"link": [5, 7],
4389-
"name": "Direct G-Mode Morph",
4390-
"entranceCondition": {
4391-
"comeInWithGMode": {
4392-
"mode": "direct",
4393-
"morphed": true
4394-
}
4395-
},
4396-
"requires": [
4397-
"h_EverestMorphTunnelExpanded",
4398-
{"or": [
4399-
"h_artificialMorphSpringBall",
4400-
{"and": [
4401-
"Gravity",
4402-
"h_artificialMorphBombThings"
4403-
]}
4404-
]}
4405-
],
4406-
"flashSuitChecked": true,
4407-
"note": "The crab will not come through the whole tunnel, so wait for it to pass before going through the vertical portion."
4415+
"note": "The crab will not come through the whole tunnel, so wait for it to pass before going through the vertical portion.",
4416+
"devNote": [
4417+
"The tunnel does not need to be expanded for Samus to get into the morph tunnel without getting stuck,",
4418+
"regardless of if she has Morph or artificial morph, and is in direct or indirect G-mode."
4419+
]
44084420
},
44094421
{
44104422
"id": 120,
@@ -4420,6 +4432,7 @@
44204432
"name": "Kill Frozen Crab with Wave",
44214433
"requires": [
44224434
"canEnterGMode",
4435+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
44234436
"Wave",
44244437
{"obstaclesCleared": ["C"]}
44254438
],
@@ -4432,6 +4445,7 @@
44324445
"name": "Kago Frozen Crab",
44334446
"requires": [
44344447
"canEnterGMode",
4448+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
44354449
"canKago",
44364450
{"or": [
44374451
{"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}},
@@ -5256,6 +5270,7 @@
52565270
"name": "Indirect G-Mode Crystal Flash",
52575271
"requires": [
52585272
"canEnterGMode",
5273+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
52595274
"h_artificialMorphCrystalFlash",
52605275
{"obstaclesNotCleared": ["B"]}
52615276
],

‎region/maridia/outer/Maridia Tube.json‎

Lines changed: 121 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,32 @@
11991199
},
12001200
"flashSuitChecked": true
12011201
},
1202+
{
1203+
"link": [2, 1],
1204+
"name": "Carry G-Mode Morph Through Tube, Bomb Into Spring Ball Jump",
1205+
"entranceCondition": {
1206+
"comeInWithGMode": {
1207+
"mode": "any",
1208+
"morphed": true
1209+
}
1210+
},
1211+
"requires": [
1212+
"f_MaridiaTubeBroken",
1213+
"h_artificialMorphUnderwaterBombIntoSpringBallJump"
1214+
],
1215+
"exitCondition": {
1216+
"leaveWithGMode": {
1217+
"morphed": true
1218+
}
1219+
},
1220+
"flashSuitChecked": true,
1221+
"note": [
1222+
"Pause and jump just before the fade out finishes. Turn off Spring Ball and place a Bomb just above where Samus' head would be if standing.",
1223+
"Pause again between 23-25 frames later and equip Spring Ball; Samus has a three frame window where she has upward momentum from the Bomb and can jump again.",
1224+
"The positioning of the Bomb is quite lenient, with an 11 frame window for where it can be placed.",
1225+
"This must be done twice to climb the room."
1226+
]
1227+
},
12021228
{
12031229
"id": 19,
12041230
"link": [2, 1],
@@ -1351,7 +1377,13 @@
13511377
},
13521378
"requires": [
13531379
"h_artificialMorphPowerBomb",
1354-
"h_artificialMorphMovement"
1380+
{"or": [
1381+
"h_artificialMorphSpringBall",
1382+
{"and": [
1383+
"Gravity",
1384+
"h_artificialMorphIBJ"
1385+
]}
1386+
]}
13551387
],
13561388
"setsFlags": ["f_MaridiaTubeBroken"],
13571389
"flashSuitChecked": true,
@@ -1605,6 +1637,32 @@
16051637
},
16061638
"flashSuitChecked": true
16071639
},
1640+
{
1641+
"link": [2, 3],
1642+
"name": "Carry G-Mode Morph Through Tube, Bomb Into Spring Ball Jump",
1643+
"entranceCondition": {
1644+
"comeInWithGMode": {
1645+
"mode": "any",
1646+
"morphed": true
1647+
}
1648+
},
1649+
"requires": [
1650+
"f_MaridiaTubeBroken",
1651+
"h_artificialMorphUnderwaterBombIntoSpringBallJump"
1652+
],
1653+
"exitCondition": {
1654+
"leaveWithGMode": {
1655+
"morphed": true
1656+
}
1657+
},
1658+
"flashSuitChecked": true,
1659+
"note": [
1660+
"Pause and jump just before the fade out finishes. Turn off Spring Ball and place a Bomb just above where Samus' head would be if standing.",
1661+
"Pause again between 23-25 frames later and equip Spring Ball; Samus has a three frame window where she has upward momentum from the Bomb and can jump again.",
1662+
"The positioning of the Bomb is quite lenient, with an 11 frame window for where it can be placed.",
1663+
"This must be done twice to climb the room."
1664+
]
1665+
},
16081666
{
16091667
"id": 31,
16101668
"link": [2, 4],
@@ -1875,6 +1933,7 @@
18751933
{"notable": "Breaking the Tube Gravity Jump"},
18761934
{"not": "f_MaridiaTubeBroken"},
18771935
"canRiskPermanentLossOfAccess",
1936+
"h_artificialMorphSpringBall",
18781937
"h_artificialMorphPowerBomb",
18791938
"canSuitlessMaridia",
18801939
"canTrickyJump"
@@ -2955,14 +3014,42 @@
29553014
"comesThroughToilet": "any"
29563015
},
29573016
"requires": [
2958-
"f_MaridiaTubeBroken"
3017+
{"or": [
3018+
"f_MaridiaTubeBroken",
3019+
{"and": [
3020+
{"notable": "Tube Clip"},
3021+
"canTunnelCrawl"
3022+
]}
3023+
]}
29593024
],
29603025
"exitCondition": {
29613026
"leaveWithGMode": {
29623027
"morphed": false
29633028
}
29643029
},
2965-
"flashSuitChecked": true
3030+
"flashSuitChecked": true,
3031+
"note": "If the tube is unbroken, this requires a tunnel crawl or unmorph at the top right of the tube in order to clip down through it."
3032+
},
3033+
{
3034+
"link": [4, 1],
3035+
"name": "G-Mode Morph, Carry G-Mode Through Tube (Top to Left)",
3036+
"entranceCondition": {
3037+
"comeInWithGMode": {
3038+
"mode": "any",
3039+
"morphed": true
3040+
},
3041+
"comesThroughToilet": "any"
3042+
},
3043+
"requires": [
3044+
{"notable": "Tube Clip"}
3045+
],
3046+
"exitCondition": {
3047+
"leaveWithGMode": {
3048+
"morphed": false
3049+
}
3050+
},
3051+
"flashSuitChecked": true,
3052+
"note": "If the tube is unbroken, this requires unmorphing at the top right of the tube in order to clip down through it."
29663053
},
29673054
{
29683055
"id": 63,
@@ -3048,14 +3135,42 @@
30483135
"comesThroughToilet": "any"
30493136
},
30503137
"requires": [
3051-
"f_MaridiaTubeBroken"
3138+
{"or": [
3139+
"f_MaridiaTubeBroken",
3140+
{"and": [
3141+
{"notable": "Tube Clip"},
3142+
"canTunnelCrawl"
3143+
]}
3144+
]}
30523145
],
30533146
"exitCondition": {
30543147
"leaveWithGMode": {
30553148
"morphed": false
30563149
}
30573150
},
3058-
"flashSuitChecked": true
3151+
"flashSuitChecked": true,
3152+
"note": "If the tube is unbroken, this requires a tunnel crawl or unmorph at the top right of the tube in order to clip down through it."
3153+
},
3154+
{
3155+
"link": [4, 3],
3156+
"name": "G-Mode Morph, Carry G-Mode Through Tube (Top to Left)",
3157+
"entranceCondition": {
3158+
"comeInWithGMode": {
3159+
"mode": "any",
3160+
"morphed": true
3161+
},
3162+
"comesThroughToilet": "any"
3163+
},
3164+
"requires": [
3165+
{"notable": "Tube Clip"}
3166+
],
3167+
"exitCondition": {
3168+
"leaveWithGMode": {
3169+
"morphed": false
3170+
}
3171+
},
3172+
"flashSuitChecked": true,
3173+
"note": "If the tube is unbroken, this requires unmorphing at the top right of the tube in order to clip down through it."
30593174
},
30603175
{
30613176
"id": 65,
@@ -3122,6 +3237,7 @@
31223237
"requires": [
31233238
{"or": [
31243239
"Gravity",
3240+
"h_artificialMorphDoubleSpringBallJump",
31253241
{"and": [
31263242
{"not": "f_MaridiaTubeBroken"},
31273243
"canRiskPermanentLossOfAccess"

0 commit comments

Comments
 (0)