Skip to content

Commit 2042b71

Browse files
kjbranchkjbranch
authored
Merge pull request #2428 from kjbranch/r-cf-maridia-easy-2
R-mode CF interrupt: Red Fish, Crab Shaft
2 parents 8e8ebe1 + e4da691 commit 2042b71

2 files changed

Lines changed: 248 additions & 0 deletions

File tree

‎region/maridia/inner-pink/Crab Shaft.json‎

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@
8888
]
8989
}
9090
],
91+
"obstacles": [
92+
{
93+
"id": "R-Mode",
94+
"name": "Entered with R-Mode",
95+
"obstacleType": "abstract"
96+
}
97+
],
9198
"enemies": [
9299
{
93100
"id": "e1",
@@ -127,6 +134,7 @@
127134
{
128135
"from": 3,
129136
"to": [
137+
{"id": 1},
130138
{"id": 3},
131139
{"id": 4}
132140
]
@@ -435,6 +443,7 @@
435443
]}
436444
]}
437445
],
446+
"resetsObstacles": ["R-Mode"],
438447
"farmCycleDrops": [{"enemy": "Sciser", "count": 2}],
439448
"flashSuitChecked": true
440449
},
@@ -445,6 +454,7 @@
445454
"requires": [
446455
"h_CrystalFlash"
447456
],
457+
"resetsObstacles": ["R-Mode"],
448458
"flashSuitChecked": true
449459
},
450460
{
@@ -468,6 +478,59 @@
468478
"gModeRegainMobility": {},
469479
"flashSuitChecked": true
470480
},
481+
{
482+
"link": [1, 1],
483+
"name": "R-Mode Entry",
484+
"entranceCondition": {
485+
"comeInWithRMode": {}
486+
},
487+
"requires": [],
488+
"clearsObstacles": ["R-Mode"],
489+
"flashSuitChecked": true,
490+
"blueSuitChecked": true
491+
},
492+
{
493+
"link": [1, 1],
494+
"name": "R-Mode Crystal Flash Interrupt",
495+
"requires": [
496+
{"obstaclesCleared": ["R-Mode"]},
497+
"canComplexRModeCrystalFlashInterrupt",
498+
{"ammo": {"type": "Missile", "count": 10}},
499+
{"ammo": {"type": "Super", "count": 10}},
500+
{"refill": ["ReserveEnergy"]},
501+
{"autoReserveTrigger": {}}
502+
],
503+
"resetsObstacles": ["R-Mode"],
504+
"flashSuitChecked": true,
505+
"note": [
506+
"Crystal Flash to where the ceiling crab will hit Samus from above.",
507+
"Samus needs to be positioned under the left edge of the large central structure and time the Power Bomb to avoid killing the crab."
508+
],
509+
"detailNote": "The crab only briefly intersects Samus while it is turning the corner, so it won't double hit Samus."
510+
},
511+
{
512+
"link": [1, 1],
513+
"name": "Direct G-mode Morph, Crystal Flash Interrupt",
514+
"entranceCondition": {
515+
"comeInWithGMode": {
516+
"mode": "direct",
517+
"morphed": true
518+
}
519+
},
520+
"requires": [
521+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
522+
{"ammo": {"type": "Missile", "count": 10}},
523+
{"ammo": {"type": "Super", "count": 10}},
524+
{"refill": ["ReserveEnergy"]},
525+
{"autoReserveTrigger": {}}
526+
],
527+
"flashSuitChecked": true,
528+
"note": [
529+
"Crystal Flash to where the ceiling crab will hit Samus from above.",
530+
"Samus needs to be positioned under the left edge of the large central structure and time the Power Bomb to avoid killing the crab."
531+
],
532+
"detailNote": "The crab only briefly intersects Samus while it is turning the corner, so it won't double hit Samus."
533+
},
471534
{
472535
"id": 7,
473536
"link": [1, 2],
@@ -1507,6 +1570,7 @@
15071570
{"cycleFrames": 1120}
15081571
]}
15091572
],
1573+
"resetsObstacles": ["R-Mode"],
15101574
"farmCycleDrops": [{"enemy": "Sciser", "count": 3}],
15111575
"flashSuitChecked": true,
15121576
"devNote": [
@@ -1645,6 +1709,7 @@
16451709
"requires": [
16461710
"h_CrystalFlash"
16471711
],
1712+
"resetsObstacles": ["R-Mode"],
16481713
"flashSuitChecked": true
16491714
},
16501715
{
@@ -1667,6 +1732,17 @@
16671732
"gModeRegainMobility": {},
16681733
"flashSuitChecked": true
16691734
},
1735+
{
1736+
"link": [2, 2],
1737+
"name": "R-Mode Entry",
1738+
"entranceCondition": {
1739+
"comeInWithRMode": {}
1740+
},
1741+
"requires": [],
1742+
"clearsObstacles": ["R-Mode"],
1743+
"flashSuitChecked": true,
1744+
"blueSuitChecked": true
1745+
},
16701746
{
16711747
"id": 54,
16721748
"link": [2, 3],
@@ -1822,6 +1898,30 @@
18221898
"FIXME: end at a new node below the platform; a flash suit is another way to get up."
18231899
]
18241900
},
1901+
{
1902+
"link": [3, 1],
1903+
"name": "Direct G-mode Morph, Crystal Flash Interrupt (Botttom of Shaft)",
1904+
"entranceCondition": {
1905+
"comeInWithGMode": {
1906+
"mode": "direct",
1907+
"morphed": true
1908+
},
1909+
"comesThroughToilet": "no"
1910+
},
1911+
"requires": [
1912+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
1913+
{"ammo": {"type": "Missile", "count": 10}},
1914+
{"ammo": {"type": "Super", "count": 10}},
1915+
{"refill": ["ReserveEnergy"]},
1916+
{"autoReserveTrigger": {}}
1917+
],
1918+
"flashSuitChecked": true,
1919+
"note": [
1920+
"Fall down the shaft then Crystal Flash to where the ceiling crab will hit Samus from above.",
1921+
"Samus needs to be positioned under the left edge of the large central structure and time the Power Bomb to avoid killing the crab."
1922+
],
1923+
"detailNote": "The crab only briefly intersects Samus while it is turning the corner, so it won't double hit Samus."
1924+
},
18251925
{
18261926
"id": 60,
18271927
"link": [3, 3],
@@ -1961,6 +2061,58 @@
19612061
"bypassesDoorShell": "free",
19622062
"flashSuitChecked": true
19632063
},
2064+
{
2065+
"link": [3, 3],
2066+
"name": "R-Mode Entry",
2067+
"entranceCondition": {
2068+
"comeInWithRMode": {},
2069+
"comesThroughToilet": "no"
2070+
},
2071+
"requires": [],
2072+
"clearsObstacles": ["R-Mode"],
2073+
"flashSuitChecked": true,
2074+
"blueSuitChecked": true
2075+
},
2076+
{
2077+
"link": [3, 3],
2078+
"name": "Direct G-mode Morph, Crystal Flash Interrupt (Top of Shaft), Leave with Spark",
2079+
"entranceCondition": {
2080+
"comeInWithGMode": {
2081+
"mode": "direct",
2082+
"morphed": true
2083+
},
2084+
"comesThroughToilet": "no"
2085+
},
2086+
"requires": [
2087+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
2088+
{"ammo": {"type": "Missile", "count": 10}},
2089+
{"ammo": {"type": "Super", "count": 10}},
2090+
{"or": [
2091+
"h_fullEnemyDamageReduction",
2092+
{"and": [
2093+
"h_partialEnemyDamageReduction",
2094+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 39}]}
2095+
]},
2096+
{"and": [
2097+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
2098+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
2099+
]}
2100+
]},
2101+
{"useFlashSuit": {}},
2102+
{"shinespark": {"frames": 7}}
2103+
],
2104+
"exitCondition": {
2105+
"leaveWithSpark": {}
2106+
},
2107+
"unlocksDoors": [
2108+
{"types": ["ammo"], "requires": []}
2109+
],
2110+
"flashSuitChecked": true,
2111+
"note": [
2112+
"Crystal Flash on the top right corner of the central structure to where the crab will hit Samus from below.",
2113+
"Time the Power Bomb to avoid killing the crab."
2114+
]
2115+
},
19642116
{
19652117
"id": 66,
19662118
"link": [3, 4],
@@ -1972,6 +2124,47 @@
19722124
"requires": [],
19732125
"flashSuitChecked": true
19742126
},
2127+
{
2128+
"link": [3, 4],
2129+
"name": "Direct G-mode Morph, Crystal Flash Interrupt (Top of Shaft)",
2130+
"entranceCondition": {
2131+
"comeInWithGMode": {
2132+
"mode": "direct",
2133+
"morphed": true
2134+
},
2135+
"comesThroughToilet": "no"
2136+
},
2137+
"requires": [
2138+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
2139+
{"ammo": {"type": "Missile", "count": 10}},
2140+
{"ammo": {"type": "Super", "count": 10}},
2141+
{"or": [
2142+
"h_fullEnemyDamageReduction",
2143+
{"and": [
2144+
"h_partialEnemyDamageReduction",
2145+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 39}]}
2146+
]},
2147+
{"and": [
2148+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
2149+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
2150+
]}
2151+
]},
2152+
{"or": [
2153+
"Gravity",
2154+
"HiJump",
2155+
"canSpringBallJumpMidAir"
2156+
]}
2157+
],
2158+
"flashSuitChecked": true,
2159+
"note": [
2160+
"Crystal Flash on the top right corner of the central structure to where the crab will hit Samus from below.",
2161+
"Time the Power Bomb to avoid killing the crab."
2162+
],
2163+
"devNote": [
2164+
"A node below the platform might help, but without the extra movement, Samus can always do this at 1 instead.",
2165+
"With Ice, Samus would want to do this at 1 and then climb back up."
2166+
]
2167+
},
19752168
{
19762169
"id": 58,
19772170
"link": [4, 1],
@@ -2108,6 +2301,7 @@
21082301
]}
21092302
]}
21102303
],
2304+
"resetsObstacles": ["R-Mode"],
21112305
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}],
21122306
"flashSuitChecked": true,
21132307
"devNote": "FIXME: for the Grapple case, a water entry above can work as an alternative to wall jump or unmorph."
@@ -2119,6 +2313,7 @@
21192313
"requires": [
21202314
"h_CrystalFlash"
21212315
],
2316+
"resetsObstacles": ["R-Mode"],
21222317
"flashSuitChecked": true
21232318
},
21242319
{

‎region/maridia/outer/Red Fish Room.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@
4848
]
4949
}
5050
],
51+
"obstacles": [
52+
{
53+
"id": "R-Mode",
54+
"name": "Entered with R-Mode",
55+
"obstacleType": "abstract"
56+
}
57+
],
5158
"enemies": [
5259
{
5360
"id": "e1",
@@ -164,6 +171,38 @@
164171
},
165172
"flashSuitChecked": true
166173
},
174+
{
175+
"link": [1, 1],
176+
"name": "R-Mode Entry",
177+
"entranceCondition": {
178+
"comeInWithRMode": {}
179+
},
180+
"requires": [],
181+
"clearsObstacles": ["R-Mode"],
182+
"flashSuitChecked": true,
183+
"blueSuitChecked": true
184+
},
185+
{
186+
"link": [1, 1],
187+
"name": "R-Mode Crystal Flash Interrupt",
188+
"requires": [
189+
{"obstaclesCleared": ["R-Mode"]},
190+
"canRModeCrystalFlashInterrupt",
191+
{"ammo": {"type": "Missile", "count": 10}},
192+
{"ammo": {"type": "Super", "count": 10}}
193+
],
194+
"resetsObstacles": ["R-Mode"],
195+
"flashSuitChecked": true,
196+
"note": [
197+
"Kill the Zebbos and have their drops spawn out of the way.",
198+
"After a breif delay, Crystal Flash on the overhang of their spawn location."
199+
],
200+
"detailNote": "This requires no suits or E-Tanks.",
201+
"devNote": [
202+
"This doesn't normally work in G-mode. Killing the Zebbos in G-mode will make them stop spawning, and from the right Samus will be off-camera.",
203+
"FIXME: It does look possible to place a Power Bomb midair and exit G-mode, collect a single drop and then get hit before the Crystal Flash occurs."
204+
]
205+
},
167206
{
168207
"id": 37,
169208
"link": [1, 2],
@@ -395,6 +434,7 @@
395434
{"cycleFrames": 330}
396435
]}
397436
],
437+
"resetsObstacles": ["R-Mode"],
398438
"farmCycleDrops": [{"enemy": "Skultera", "count": 1}],
399439
"flashSuitChecked": true
400440
},
@@ -405,6 +445,7 @@
405445
"requires": [
406446
"h_CrystalFlash"
407447
],
448+
"resetsObstacles": ["R-Mode"],
408449
"flashSuitChecked": true
409450
},
410451
{
@@ -418,6 +459,18 @@
418459
"flashSuitChecked": true,
419460
"note": "In order to not fall back into the room below, enter on the far left and face and hold left while getting hit, or enter on the far right side while facing left and turn around and hold right white getting hit."
420461
},
462+
{
463+
"link": [2, 2],
464+
"name": "R-Mode Entry",
465+
"entranceCondition": {
466+
"comeInWithRMode": {},
467+
"comesThroughToilet": "no"
468+
},
469+
"requires": [],
470+
"clearsObstacles": ["R-Mode"],
471+
"flashSuitChecked": true,
472+
"blueSuitChecked": true
473+
},
421474
{
422475
"id": 15,
423476
"link": [2, 3],

0 commit comments

Comments
 (0)