Skip to content

Commit 5c49ce1

Browse files
kjbranchkjbranch
authored
Merge pull request #2433 from kjbranch/r-cf-maridia-easy-4
R-mode CF Interrupt - Below Botwoon, Halfie Climb
2 parents 94339b8 + bd86336 commit 5c49ce1

2 files changed

Lines changed: 211 additions & 23 deletions

File tree

‎region/maridia/inner-pink/Below Botwoon Energy Tank.json‎

Lines changed: 67 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
"id": "A",
5050
"name": "Owtch",
5151
"obstacleType": "enemies"
52+
},
53+
{
54+
"id": "R-Mode",
55+
"name": "Entered with R-Mode",
56+
"obstacleType": "abstract"
5257
}
5358
],
5459
"enemies": [
@@ -87,27 +92,23 @@
8792
"to": [
8893
{"id": 1},
8994
{"id": 2},
90-
{
91-
"id": 3,
92-
"devNote": "This link refers specifically to crossing on frozen enemies."
93-
}
95+
{"id": 3}
9496
]
9597
},
9698
{
9799
"from": 2,
98100
"to": [
99101
{"id": 1},
102+
{"id": 2},
100103
{"id": 3}
101104
]
102105
},
103106
{
104107
"from": 3,
105108
"to": [
106-
{
107-
"id": 1,
108-
"devNote": "This link refers specifically to crossing on frozen enemies."
109-
},
110-
{"id": 2}
109+
{"id": 1},
110+
{"id": 2},
111+
{"id": 3}
111112
]
112113
}
113114
],
@@ -386,6 +387,38 @@
386387
"Lure the Zoas. Jump so that they start moving horizontally higher, use spin jumps to move horizontally faster while keeping them on screen."
387388
]
388389
},
390+
{
391+
"link": [1, 1],
392+
"name": "R-Mode Entry",
393+
"entranceCondition": {
394+
"comeInWithRMode": {}
395+
},
396+
"requires": [],
397+
"clearsObstacles": ["R-Mode"],
398+
"flashSuitChecked": true,
399+
"blueSuitChecked": true
400+
},
401+
{
402+
"link": [1, 1],
403+
"name": "R-Mode Crystal Flash Interrupt",
404+
"requires": [
405+
{"obstaclesCleared": ["R-Mode"]},
406+
"canComplexRModeCrystalFlashInterrupt",
407+
{"ammo": {"type": "Missile", "count": 10}}
408+
],
409+
"resetsObstacles": ["R-Mode"],
410+
"flashSuitChecked": true,
411+
"note": [
412+
"Kill the Zoas so that their drops appear away from the sand pit.",
413+
"Quickly sink to the bottom middle of the pit, directly above the Zoa spawn point, then Crystal Flash.",
414+
"This sand is easy to escape without accidentally using the flash suit - hold down then press jump."
415+
],
416+
"detailNote": [
417+
"This can only be done suitless and without and E-Tanks, otherwise the Zoas can't deal enough damage to trigger Samus' reserves.",
418+
"This sand is easy to escape without accidentally using the flash suit - hold down then press jump."
419+
],
420+
"devNote": "This doesn't work in G-mode because the Power Bomb will kill the Zoas and prevent them from respawning."
421+
},
389422
{
390423
"id": 12,
391424
"link": [1, 2],
@@ -404,19 +437,6 @@
404437
],
405438
"flashSuitChecked": true
406439
},
407-
{
408-
"id": 14,
409-
"link": [1, 3],
410-
"name": "G-Mode",
411-
"entranceCondition": {
412-
"comeInWithGMode": {
413-
"mode": "any",
414-
"morphed": false
415-
}
416-
},
417-
"requires": [],
418-
"flashSuitChecked": true
419-
},
420440
{
421441
"id": 15,
422442
"link": [2, 1],
@@ -425,7 +445,19 @@
425445
"h_navigateUnderwater"
426446
],
427447
"flashSuitChecked": true,
428-
"devNote": "The expectation is to fall down the left side of the sand entrance."
448+
"note": "Fall down the left side of the sand entrance. If Samus gets stuck in the left sand pit, simply hold down and press jump to escape."
449+
},
450+
{
451+
"link": [2, 2],
452+
"name": "R-Mode Entry",
453+
"entranceCondition": {
454+
"comeInWithRMode": {},
455+
"comesThroughToilet": "no"
456+
},
457+
"requires": [],
458+
"clearsObstacles": ["R-Mode"],
459+
"flashSuitChecked": true,
460+
"blueSuitChecked": true
429461
},
430462
{
431463
"id": 16,
@@ -499,6 +531,18 @@
499531
]}
500532
],
501533
"flashSuitChecked": true
534+
},
535+
{
536+
"link": [3, 3],
537+
"name": "R-Mode Entry",
538+
"entranceCondition": {
539+
"comeInWithRMode": {},
540+
"comesThroughToilet": "no"
541+
},
542+
"requires": [],
543+
"clearsObstacles": ["R-Mode"],
544+
"flashSuitChecked": true,
545+
"blueSuitChecked": true
502546
}
503547
],
504548
"notables": [],

‎region/maridia/inner-pink/Halfie Climb Room.json‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@
112112
]
113113
}
114114
],
115+
"obstacles": [
116+
{
117+
"id": "R-Mode",
118+
"name": "Entered with R-Mode",
119+
"obstacleType": "abstract"
120+
}
121+
],
115122
"enemies": [
116123
{
117124
"id": "e1",
@@ -278,6 +285,7 @@
278285
]}
279286
]}
280287
],
288+
"resetsObstacles": ["R-Mode"],
281289
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 1}],
282290
"flashSuitChecked": true
283291
},
@@ -288,6 +296,7 @@
288296
"requires": [
289297
"h_CrystalFlash"
290298
],
299+
"resetsObstacles": ["R-Mode"],
291300
"flashSuitChecked": true
292301
},
293302
{
@@ -302,6 +311,17 @@
302311
},
303312
"flashSuitChecked": true
304313
},
314+
{
315+
"link": [1, 1],
316+
"name": "R-Mode Entry",
317+
"entranceCondition": {
318+
"comeInWithRMode": {}
319+
},
320+
"requires": [],
321+
"clearsObstacles": ["R-Mode"],
322+
"flashSuitChecked": true,
323+
"blueSuitChecked": true
324+
},
305325
{
306326
"id": 5,
307327
"link": [1, 1],
@@ -1891,6 +1911,7 @@
18911911
]}
18921912
]}
18931913
],
1914+
"resetsObstacles": ["R-Mode"],
18941915
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 1}],
18951916
"flashSuitChecked": true
18961917
},
@@ -1957,6 +1978,7 @@
19571978
]}
19581979
]}
19591980
],
1981+
"resetsObstacles": ["R-Mode"],
19601982
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 3}],
19611983
"flashSuitChecked": true,
19621984
"devNote": ["FIXME: other options for this are possible (e.g. suitless)"]
@@ -1968,6 +1990,7 @@
19681990
"requires": [
19691991
"h_CrystalFlash"
19701992
],
1993+
"resetsObstacles": ["R-Mode"],
19711994
"flashSuitChecked": true
19721995
},
19731996
{
@@ -2144,6 +2167,17 @@
21442167
},
21452168
"flashSuitChecked": true
21462169
},
2170+
{
2171+
"link": [2, 2],
2172+
"name": "R-Mode Entry",
2173+
"entranceCondition": {
2174+
"comeInWithRMode": {}
2175+
},
2176+
"requires": [],
2177+
"clearsObstacles": ["R-Mode"],
2178+
"flashSuitChecked": true,
2179+
"blueSuitChecked": true
2180+
},
21472181
{
21482182
"id": 56,
21492183
"link": [2, 2],
@@ -3622,8 +3656,105 @@
36223656
"requires": [
36233657
"h_CrystalFlash"
36243658
],
3659+
"resetsObstacles": ["R-Mode"],
36253660
"flashSuitChecked": true
36263661
},
3662+
{
3663+
"link": [3, 3],
3664+
"name": "R-Mode Entry",
3665+
"entranceCondition": {
3666+
"comeInWithRMode": {}
3667+
},
3668+
"requires": [],
3669+
"clearsObstacles": ["R-Mode"],
3670+
"flashSuitChecked": true,
3671+
"blueSuitChecked": true
3672+
},
3673+
{
3674+
"link": [3, 3],
3675+
"name": "R-Mode Crystal Flash Interrupt",
3676+
"requires": [
3677+
{"obstaclesCleared": ["R-Mode"]},
3678+
"canRModeCrystalFlashInterrupt",
3679+
{"ammo": {"type": "Missile", "count": 10}},
3680+
{"or": [
3681+
{"tech": "canComplexRModeCrystalFlashInterrupt"},
3682+
{"ammo": {"type": "Super", "count": 10}}
3683+
]},
3684+
{"or": [
3685+
"h_fullEnemyDamageReduction",
3686+
{"and": [
3687+
"h_partialEnemyDamageReduction",
3688+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 49}]}
3689+
]},
3690+
{"and": [
3691+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
3692+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
3693+
]}
3694+
]}
3695+
],
3696+
"resetsObstacles": ["R-Mode"],
3697+
"flashSuitChecked": true,
3698+
"note": [
3699+
"Time the Crystal Flash so that the Oum can hit Samus.",
3700+
"This is fairly lenient, but one method is to Crystal Flash near the shot block pillar while the Oum is to the right of Samus, near the door."
3701+
]
3702+
},
3703+
{
3704+
"link": [3, 3],
3705+
"name": "Direct G-mode Morph, Crystal Flash Interrupt",
3706+
"entranceCondition": {
3707+
"comeInWithGMode": {
3708+
"mode": "direct",
3709+
"morphed": true
3710+
}
3711+
},
3712+
"requires": [
3713+
{"or": [
3714+
{"and": [
3715+
"HiJump",
3716+
"h_artificialMorphSpringBall"
3717+
]},
3718+
{"and": [
3719+
"Gravity",
3720+
"h_artificialMorphIBJ"
3721+
]},
3722+
"h_artificialMorphUnderwaterBombIntoSpringBallJump"
3723+
]},
3724+
"h_artificialMorphRModeCrystalFlashInterrupt",
3725+
{"ammo": {"type": "Missile", "count": 10}},
3726+
{"or": [
3727+
{"tech": "canComplexRModeCrystalFlashInterrupt"},
3728+
{"ammo": {"type": "Super", "count": 10}}
3729+
]},
3730+
{"or": [
3731+
"h_fullEnemyDamageReduction",
3732+
{"and": [
3733+
"h_partialEnemyDamageReduction",
3734+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 49}]}
3735+
]},
3736+
{"and": [
3737+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
3738+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
3739+
]}
3740+
]}
3741+
],
3742+
"flashSuitChecked": true,
3743+
"note": [
3744+
"Climb up and lure and Oum to the right pit, then time the Crystal Flash so that the Oum can hit Samus.",
3745+
"This is fairly lenient, but one method is to Crystal Flash near the shot block pillar while the Oum is to the right of Samus moving right.",
3746+
"With some testing, it seemed like the Oum was more likely to hit Samus when it is moving to the left."
3747+
],
3748+
"detailNote": [
3749+
"This is possible with a Bomb into Spring Ball jump without HiJump.",
3750+
"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.",
3751+
"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.",
3752+
"The positioning of the Bomb is quite lenient, with an 11 frame window for where it can be placed."
3753+
],
3754+
"devNote": [
3755+
"It is possible to enter with G-mode for the left side of the room and do this off-camera, but it is unreasonably difficult."
3756+
]
3757+
},
36273758
{
36283759
"id": 111,
36293760
"link": [3, 4],
@@ -4242,6 +4373,7 @@
42424373
]}
42434374
]}
42444375
],
4376+
"resetsObstacles": ["R-Mode"],
42454377
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 1}],
42464378
"flashSuitChecked": true
42474379
},
@@ -4252,6 +4384,7 @@
42524384
"requires": [
42534385
"h_CrystalFlash"
42544386
],
4387+
"resetsObstacles": ["R-Mode"],
42554388
"flashSuitChecked": true
42564389
},
42574390
{
@@ -4308,6 +4441,17 @@
43084441
"bypassesDoorShell": "free",
43094442
"flashSuitChecked": true
43104443
},
4444+
{
4445+
"link": [4, 4],
4446+
"name": "R-Mode Entry",
4447+
"entranceCondition": {
4448+
"comeInWithRMode": {}
4449+
},
4450+
"requires": [],
4451+
"clearsObstacles": ["R-Mode"],
4452+
"flashSuitChecked": true,
4453+
"blueSuitChecked": true
4454+
},
43114455
{
43124456
"id": 129,
43134457
"link": [4, 4],

0 commit comments

Comments
 (0)