Skip to content

Commit 89c8d51

Browse files
osse101osse101
authored
Merge pull request #2411 from kjbranch/cf-skultera
R-Mode CF Interrupt for Maridia Skulteras
2 parents cfc4bfd + c418579 commit 89c8d51

6 files changed

Lines changed: 808 additions & 21 deletions

File tree

‎helpers.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,6 +1647,8 @@
16471647
{"resourceAvailable": [{"type": "Missile", "count": 10}]},
16481648
{"resourceAvailable": [{"type": "Super", "count": 10}]},
16491649
{"resourceAvailable": [{"type": "PowerBomb", "count": 10}]},
1650+
{"disableEquipment": "Varia"},
1651+
{"disableEquipment": "Gravity"},
16501652
{"gainFlashSuit": {}}
16511653
]
16521654
},

‎region/maridia/inner-yellow/Plasma Spark Room.json‎

Lines changed: 248 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@
129129
]
130130
}
131131
],
132+
"obstacles": [
133+
{
134+
"id": "R-Mode",
135+
"name": "Entered with R-Mode",
136+
"obstacleType": "abstract"
137+
}
138+
],
132139
"enemies": [
133140
{
134141
"id": "e1",
@@ -205,6 +212,7 @@
205212
{
206213
"from": 4,
207214
"to": [
215+
{"id": 2},
208216
{"id": 3},
209217
{"id": 4},
210218
{
@@ -308,6 +316,7 @@
308316
{"cycleFrames": 220}
309317
]}
310318
],
319+
"resetsObstacles": ["R-Mode"],
311320
"farmCycleDrops": [{"enemy": "Choot", "count": 1}],
312321
"flashSuitChecked": true
313322
},
@@ -360,6 +369,7 @@
360369
{"cycleFrames": 1080}
361370
]}
362371
],
372+
"resetsObstacles": ["R-Mode"],
363373
"farmCycleDrops": [{"enemy": "Choot", "count": 3}],
364374
"flashSuitChecked": true
365375
},
@@ -370,15 +380,69 @@
370380
"requires": [
371381
"h_CrystalFlash"
372382
],
383+
"resetsObstacles": ["R-Mode"],
373384
"flashSuitChecked": true
374385
},
386+
{
387+
"link": [1, 1],
388+
"name": "R-Mode Entry",
389+
"entranceCondition": {
390+
"comeInWithRMode": {},
391+
"comesThroughToilet": "no"
392+
},
393+
"requires": [],
394+
"clearsObstacles": ["R-Mode"],
395+
"flashSuitChecked": true,
396+
"blueSuitChecked": true
397+
},
375398
{
376399
"id": 4,
377400
"link": [1, 2],
378401
"name": "Base",
379402
"requires": [],
380403
"flashSuitChecked": true
381404
},
405+
{
406+
"link": [1, 2],
407+
"name": "Direct G-mode Morph, Crystal Flash Interrupt",
408+
"entranceCondition": {
409+
"comeInWithGMode": {
410+
"mode": "direct",
411+
"morphed": true
412+
},
413+
"comesThroughToilet": "no"
414+
},
415+
"requires": [
416+
{"or": [
417+
"h_artificialMorphBombThings",
418+
"h_artificialMorphSpringBall"
419+
]},
420+
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
421+
{"ammo": {"type": "Missile", "count": 10}},
422+
{"ammo": {"type": "Super", "count": 10}},
423+
{"or": [
424+
"h_partialEnemyDamageReduction",
425+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 19}]},
426+
{"and": [
427+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
428+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
429+
]}
430+
]}
431+
],
432+
"flashSuitChecked": true,
433+
"note": [
434+
"It is required to avoid double hitting the Skultera with the Power Bomb,",
435+
"and to position the Crystal Flash so that the Skultera can hit Samus from above so it avoids the light orb.",
436+
"To do this, Crystal Flash just left of the top left corner of the raised floor and time the Power Bomb so that its first hit is when the Skultera is far to the left."
437+
],
438+
"detailNote": [
439+
"This can be done with no enemy damage reduction and up to 2 E-Tanks or a 50% enemy damage reduction and no E-Tanks;",
440+
"a 75% reduction is not recommended and would require disabling and reenabling suits with a precise pause abuse."
441+
],
442+
"devNote": [
443+
"FIXME: A 75% damage reduction method needs to be documented for if Samus only has Gravity and it provides 75% reduction."
444+
]
445+
},
382446
{
383447
"id": 5,
384448
"link": [1, 4],
@@ -1075,8 +1139,95 @@
10751139
"requires": [
10761140
"h_CrystalFlash"
10771141
],
1142+
"resetsObstacles": ["R-Mode"],
10781143
"flashSuitChecked": true
10791144
},
1145+
{
1146+
"link": [2, 2],
1147+
"name": "R-Mode Entry",
1148+
"entranceCondition": {
1149+
"comeInWithRMode": {}
1150+
},
1151+
"requires": [],
1152+
"clearsObstacles": ["R-Mode"],
1153+
"flashSuitChecked": true,
1154+
"blueSuitChecked": true
1155+
},
1156+
{
1157+
"link": [2, 2],
1158+
"name": "R-Mode Crystal Flash Interrupt",
1159+
"requires": [
1160+
{"obstaclesCleared": ["R-Mode"]},
1161+
"canTrickyRModeCrystalFlashInterrupt",
1162+
{"ammo": {"type": "Missile", "count": 10}},
1163+
{"ammo": {"type": "Super", "count": 10}},
1164+
{"or": [
1165+
"h_partialEnemyDamageReduction",
1166+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 19}]},
1167+
{"and": [
1168+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
1169+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
1170+
]}
1171+
]}
1172+
],
1173+
"resetsObstacles": ["R-Mode"],
1174+
"flashSuitChecked": true,
1175+
"note": [
1176+
"It is required to avoid double hitting the Skultera with the Power Bomb,",
1177+
"and to position the Crystal Flash so that the Skultera can hit Samus from above so it avoids the light orb.",
1178+
"To do this, Crystal Flash just left of the top left corner of the raised floor and time the Power Bomb so that its first hit is when the Skultera is far to the left."
1179+
],
1180+
"detailNote": [
1181+
"This can be done with no enemy damage reduction and up to 2 E-Tanks or a 50% enemy damage reduction and no E-Tanks;",
1182+
"a 75% reduction is not recommended and would require disabling and reenabling suits with a precise pause abuse."
1183+
],
1184+
"devNote": [
1185+
"FIXME: A 75% damage reduction method needs to be documented for if Samus only has Gravity and it provides 75% reduction."
1186+
]
1187+
},
1188+
{
1189+
"link": [2, 2],
1190+
"name": "Direct G-mode Morph, Crystal Flash Interrupt",
1191+
"entranceCondition": {
1192+
"comeInWithGMode": {
1193+
"mode": "direct",
1194+
"morphed": true
1195+
}
1196+
},
1197+
"requires": [
1198+
{"or": [
1199+
{"and": [
1200+
"Gravity",
1201+
"h_artificialMorphIBJ"
1202+
]},
1203+
"h_artificialMorphSpringBall"
1204+
]},
1205+
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
1206+
{"ammo": {"type": "Missile", "count": 10}},
1207+
{"ammo": {"type": "Super", "count": 10}},
1208+
{"or": [
1209+
"h_partialEnemyDamageReduction",
1210+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 19}]},
1211+
{"and": [
1212+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
1213+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
1214+
]}
1215+
]}
1216+
],
1217+
"flashSuitChecked": true,
1218+
"note": [
1219+
"It is required to avoid double hitting the Skultera with the Power Bomb,",
1220+
"and to position the Crystal Flash so that the Skultera can hit Samus from above so it avoids the light orb.",
1221+
"To do this, Crystal Flash just left of the top left corner of the raised floor and time the Power Bomb so that its first hit is when the Skultera is far to the left."
1222+
],
1223+
"detailNote": [
1224+
"This can be done with no enemy damage reduction and up to 2 E-Tanks or a 50% enemy damage reduction and no E-Tanks;",
1225+
"a 75% reduction is not recommended and would require disabling and reenabling suits with a precise pause abuse."
1226+
],
1227+
"devNote": [
1228+
"FIXME: A 75% damage reduction method needs to be documented for if Samus only has Gravity and it provides 75% reduction."
1229+
]
1230+
},
10801231
{
10811232
"id": 17,
10821233
"link": [2, 3],
@@ -1376,6 +1527,42 @@
13761527
"requires": [],
13771528
"flashSuitChecked": true
13781529
},
1530+
{
1531+
"link": [3, 2],
1532+
"name": "Direct G-mode Morph, Crystal Flash Interrupt",
1533+
"entranceCondition": {
1534+
"comeInWithGMode": {
1535+
"mode": "direct",
1536+
"morphed": true
1537+
}
1538+
},
1539+
"requires": [
1540+
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
1541+
{"ammo": {"type": "Missile", "count": 10}},
1542+
{"ammo": {"type": "Super", "count": 10}},
1543+
{"or": [
1544+
"h_partialEnemyDamageReduction",
1545+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 19}]},
1546+
{"and": [
1547+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
1548+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
1549+
]}
1550+
]}
1551+
],
1552+
"flashSuitChecked": true,
1553+
"note": [
1554+
"It is required to avoid double hitting the Skultera with the Power Bomb,",
1555+
"and to position the Crystal Flash so that the Skultera can hit Samus from above so it avoids the light orb.",
1556+
"To do this, Crystal Flash just left of the top left corner of the raised floor and time the Power Bomb so that its first hit is when the Skultera is far to the left."
1557+
],
1558+
"detailNote": [
1559+
"This can be done with no enemy damage reduction and up to 2 E-Tanks or a 50% enemy damage reduction and no E-Tanks;",
1560+
"a 75% reduction is not recommended and would require disabling and reenabling suits with a precise pause abuse."
1561+
],
1562+
"devNote": [
1563+
"FIXME: A 75% damage reduction method needs to be documented for if Samus only has Gravity and it provides 75% reduction."
1564+
]
1565+
},
13791566
{
13801567
"id": 29,
13811568
"link": [3, 3],
@@ -1615,6 +1802,7 @@
16151802
{"cycleFrames": 640}
16161803
]}
16171804
],
1805+
"resetsObstacles": ["R-Mode"],
16181806
"farmCycleDrops": [{"enemy": "Choot", "count": 2}],
16191807
"flashSuitChecked": true
16201808
},
@@ -1625,8 +1813,20 @@
16251813
"requires": [
16261814
"h_CrystalFlash"
16271815
],
1816+
"resetsObstacles": ["R-Mode"],
16281817
"flashSuitChecked": true
16291818
},
1819+
{
1820+
"link": [3, 3],
1821+
"name": "R-Mode Entry",
1822+
"entranceCondition": {
1823+
"comeInWithRMode": {}
1824+
},
1825+
"requires": [],
1826+
"clearsObstacles": ["R-Mode"],
1827+
"flashSuitChecked": true,
1828+
"blueSuitChecked": true
1829+
},
16301830
{
16311831
"id": 38,
16321832
"link": [3, 4],
@@ -2105,6 +2305,42 @@
21052305
"but there might be cases where the player could X-Ray climb to somewhere useful after passing through this wrong-facing transition."
21062306
]
21072307
},
2308+
{
2309+
"link": [4, 2],
2310+
"name": "Direct G-mode Morph, Crystal Flash Interrupt",
2311+
"entranceCondition": {
2312+
"comeInWithGMode": {
2313+
"mode": "direct",
2314+
"morphed": true
2315+
}
2316+
},
2317+
"requires": [
2318+
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
2319+
{"ammo": {"type": "Missile", "count": 10}},
2320+
{"ammo": {"type": "Super", "count": 10}},
2321+
{"or": [
2322+
"h_partialEnemyDamageReduction",
2323+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 19}]},
2324+
{"and": [
2325+
{"resourceCapacity": [{"type": "RegularEnergy", "count": 199}]},
2326+
{"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
2327+
]}
2328+
]}
2329+
],
2330+
"flashSuitChecked": true,
2331+
"note": [
2332+
"It is required to avoid double hitting the Skultera with the Power Bomb,",
2333+
"and to position the Crystal Flash so that the Skultera can hit Samus from above so it avoids the light orb.",
2334+
"To do this, Crystal Flash just left of the top left corner of the raised floor and time the Power Bomb so that its first hit is when the Skultera is far to the left."
2335+
],
2336+
"detailNote": [
2337+
"This can be done with no enemy damage reduction and up to 2 E-Tanks or a 50% enemy damage reduction and no E-Tanks;",
2338+
"a 75% reduction is not recommended and would require disabling and reenabling suits with a precise pause abuse."
2339+
],
2340+
"devNote": [
2341+
"FIXME: A 75% damage reduction method needs to be documented for if Samus only has Gravity and it provides 75% reduction."
2342+
]
2343+
},
21082344
{
21092345
"id": 55,
21102346
"link": [4, 3],
@@ -2177,8 +2413,20 @@
21772413
"requires": [
21782414
"h_CrystalFlash"
21792415
],
2416+
"resetsObstacles": ["R-Mode"],
21802417
"flashSuitChecked": true
21812418
},
2419+
{
2420+
"link": [4, 4],
2421+
"name": "R-Mode Entry",
2422+
"entranceCondition": {
2423+
"comeInWithRMode": {}
2424+
},
2425+
"requires": [],
2426+
"clearsObstacles": ["R-Mode"],
2427+
"flashSuitChecked": true,
2428+
"blueSuitChecked": true
2429+
},
21822430
{
21832431
"id": 78,
21842432
"link": [4, 5],

0 commit comments

Comments
 (0)