Skip to content

Commit eb64633

Browse files
osse101osse101
authored
Merge pull request #2377 from aquanight/rsi-cc-climb
Climb R-Mode Spark Interrupt
2 parents 3bee6db + ddb02ba commit eb64633

1 file changed

Lines changed: 300 additions & 0 deletions

File tree

‎region/crateria/central/Climb.json‎

Lines changed: 300 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,47 @@
583583
"blueSuitChecked": true,
584584
"note": "Overload PLMs using the scroll block next to the bomb blocks."
585585
},
586+
{
587+
"link": [1, 6],
588+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
589+
"entranceCondition": {
590+
"comeInWithRMode": {},
591+
"comesThroughToilet": "no"
592+
},
593+
"requires": [
594+
{"not": "f_ZebesSetAblaze"},
595+
"h_ZebesIsAwake",
596+
{"or": [
597+
"h_CrystalFlash",
598+
{"and": [
599+
"h_RModeCanRefillReserves",
600+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
601+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
602+
]}
603+
]},
604+
{"or":[
605+
{"and": [
606+
"h_destroyBombWalls",
607+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}}
608+
]},
609+
{"and": [
610+
{"doorUnlockedAtNode": 5},
611+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
612+
]},
613+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
614+
]},
615+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
616+
"canRModeSparkInterrupt"
617+
],
618+
"unlocksDoors": [{"nodeId": 5, "types": ["ammo"], "requires": []}],
619+
"clearsObstacles": ["A"],
620+
"flashSuitChecked": true,
621+
"blueSuitChecked": true,
622+
"note": [
623+
"Farm wall pirates while leaving one left. Lead it to the bottom of the shaft, get shine charge,",
624+
"then windup in front of it to get shot and interrupted."
625+
]
626+
},
586627
{
587628
"id": 16,
588629
"link": [1, 6],
@@ -881,6 +922,56 @@
881922
"Enemies will not hurt Samus since they are non-global and also off-camera."
882923
]
883924
},
925+
{
926+
"link": [2, 5],
927+
"name": "Zebes Ablaze - R-Mode Spark Interrupt (Gain Blue Suit)",
928+
"entranceCondition": {
929+
"comeInWithRMode": {}
930+
},
931+
"requires": [
932+
"Gravity",
933+
"f_ZebesSetAblaze",
934+
{"or": [
935+
{"enemyDamage": {"enemy": "Custom Climb Pirate", "type": "contact", "hits": 1}},
936+
{"enemyKill": {
937+
"enemies": [ ["Custom Climb Pirate", "Custom Climb Pirate"]],
938+
"explicitWeapons": ["Plasma", "Super", "PowerBomb"]
939+
}}
940+
]},
941+
"h_CrystalFlash",
942+
{"acidFrames": 320},
943+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
944+
{"or": [
945+
{"and": [
946+
{"disableEquipment": "ETank"},
947+
{"refill": [ "ReserveEnergy" ]},
948+
{"autoReserveTrigger": {}}
949+
]},
950+
{"autoReserveTrigger": {"maxReserveEnergy": 50}}
951+
]},
952+
"canRModeSparkInterrupt",
953+
{"acidFrames": 80},
954+
{"resetRoom": {"nodes": [2, 5]}}
955+
],
956+
"clearsObstacles": ["A", "B"],
957+
"unlocksDoors": [
958+
{"nodeId": 2, "types": ["ammo"], "requires": []},
959+
{"nodeId": 5, "types": ["ammo"], "requires": []}
960+
],
961+
"flashSuitChecked": true,
962+
"blueSuitChecked": true,
963+
"note": [
964+
"With Zebes set ablaze, Climb only spawns two pirates that drop nothing, and the bomb",
965+
"wall is automatically cleared. The rising lava is now acid instead, so Speed Booster works normally with Gravity Suit.",
966+
"Jump up the platforms to get high enough above the rising acid to",
967+
"safely Crystal Flash, then dive back into the acid against either bottom door. Wait in the acid",
968+
"until your energy is low enough and shinecharge. Windup right before energy runs out to interrupt",
969+
"then *immediately* leave to limit acid damage."
970+
],
971+
"devNote": [
972+
"FIXME: Needs to support Hyper Beam kill also."
973+
]
974+
},
884975
{
885976
"id": 29,
886977
"link": [2, 5],
@@ -973,6 +1064,51 @@
9731064
"blueSuitChecked": true,
9741065
"note": "Break the Bomb blocks using Screw Attack in a Moonfall, then escape the tiles with Grapple Beam."
9751066
},
1067+
{
1068+
"link": [2, 6],
1069+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
1070+
"entranceCondition": {
1071+
"comeInWithRMode": {}
1072+
},
1073+
"requires": [
1074+
"h_ClimbWithoutLava",
1075+
{"or":[
1076+
"h_destroyBombWalls",
1077+
{"getBlueSpeed": {"usedTiles": 14, "openEnd": 0}},
1078+
{"and": [
1079+
{"getBlueSpeed": {"usedTiles": 15, "openEnd": 0}},
1080+
{"doorUnlockedAtNode": 2}
1081+
]}
1082+
]},
1083+
{"not": "f_ZebesSetAblaze"},
1084+
"h_ZebesIsAwake",
1085+
{"or": [
1086+
"h_CrystalFlash",
1087+
{"and": [
1088+
"h_RModeCanRefillReserves",
1089+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
1090+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
1091+
]}
1092+
]},
1093+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
1094+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
1095+
"canRModeSparkInterrupt"
1096+
],
1097+
"clearsObstacles": ["A", "B"],
1098+
"unlocksDoors": [
1099+
{"nodeId": 2, "types": ["ammo"], "requires": []},
1100+
{"nodeId": 5, "types": ["ammo"], "requires": []}
1101+
],
1102+
"flashSuitChecked": true,
1103+
"blueSuitChecked": true,
1104+
"note": [
1105+
"Farm wall pirates while leaving one left. Lead it to the bottom of the shaft, get shine charge,",
1106+
"then windup in front of it to get shot and interrupted."
1107+
],
1108+
"devNote": [
1109+
"This door triggers the rising lava, which will prevent gaining shinecharge."
1110+
]
1111+
},
9761112
{
9771113
"id": 32,
9781114
"link": [2, 6],
@@ -1238,6 +1374,47 @@
12381374
"Enter the room with a super sink, in order to clip down through several screens and reach the door below."
12391375
]
12401376
},
1377+
{
1378+
"link": [3, 6],
1379+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
1380+
"entranceCondition": {
1381+
"comeInWithRMode": {}
1382+
},
1383+
"requires": [
1384+
{"not": "f_ZebesSetAblaze"},
1385+
"h_ZebesIsAwake",
1386+
"h_bombThings",
1387+
{"or": [
1388+
"h_CrystalFlash",
1389+
{"and": [
1390+
"h_RModeCanRefillReserves",
1391+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
1392+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
1393+
]}
1394+
]},
1395+
{"or":[
1396+
{"and": [
1397+
"h_destroyBombWalls",
1398+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}}
1399+
]},
1400+
{"and": [
1401+
{"doorUnlockedAtNode": 5},
1402+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
1403+
]},
1404+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
1405+
]},
1406+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
1407+
"canRModeSparkInterrupt"
1408+
],
1409+
"clearsObstacles": ["A"],
1410+
"unlocksDoors": [{"nodeId": 5, "types": ["ammo"], "requires": []}],
1411+
"flashSuitChecked": true,
1412+
"blueSuitChecked": true,
1413+
"note": [
1414+
"Farm wall pirates while leaving one left. Lead it to the bottom of the shaft, get shine charge,",
1415+
"then windup in front of it to get shot and interrupted."
1416+
]
1417+
},
12411418
{
12421419
"id": 46,
12431420
"link": [3, 6],
@@ -1550,6 +1727,47 @@
15501727
"flashSuitChecked": true,
15511728
"blueSuitChecked": true
15521729
},
1730+
{
1731+
"link": [4, 6],
1732+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
1733+
"entranceCondition": {
1734+
"comeInWithRMode": {}
1735+
},
1736+
"requires": [
1737+
{"not": "f_ZebesSetAblaze"},
1738+
"h_bombThings",
1739+
"h_ZebesIsAwake",
1740+
{"or": [
1741+
"h_CrystalFlash",
1742+
{"and": [
1743+
"h_RModeCanRefillReserves",
1744+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
1745+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
1746+
]}
1747+
]},
1748+
{"or":[
1749+
{"and": [
1750+
"h_destroyBombWalls",
1751+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}}
1752+
]},
1753+
{"and": [
1754+
{"doorUnlockedAtNode": 5},
1755+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
1756+
]},
1757+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
1758+
]},
1759+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
1760+
"canRModeSparkInterrupt"
1761+
],
1762+
"clearsObstacles": ["A"],
1763+
"unlocksDoors": [{"nodeId": 5, "types": ["ammo"], "requires": []}],
1764+
"flashSuitChecked": true,
1765+
"blueSuitChecked": true,
1766+
"note": [
1767+
"Farm wall pirates while leaving one left. Lead it to the bottom of the shaft, get shine charge,",
1768+
"then windup in front of it to get shot and interrupted."
1769+
]
1770+
},
15531771
{
15541772
"id": 60,
15551773
"link": [4, 6],
@@ -2096,6 +2314,48 @@
20962314
"If using a PB to kill the pirates, overload the PLMs at the bottom. If the top bomb block is hit with a PB before PLMs are overloaded, they will remain solid."
20972315
]
20982316
},
2317+
{
2318+
"link": [5, 5],
2319+
"name": "Zebes Ablaze - R-Mode Spark Interrupt (Gain Blue Suit)",
2320+
"entranceCondition": {
2321+
"comeInWithRMode": {}
2322+
},
2323+
"requires": [
2324+
"Gravity",
2325+
"f_ZebesSetAblaze",
2326+
"h_CrystalFlash",
2327+
{"acidFrames": 320},
2328+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
2329+
{"or": [
2330+
{"and": [
2331+
{"disableEquipment": "ETank"},
2332+
{"refill": [ "ReserveEnergy" ]},
2333+
{"autoReserveTrigger": {}}
2334+
]},
2335+
{"autoReserveTrigger": {"maxReserveEnergy": 50}}
2336+
]},
2337+
"canRModeSparkInterrupt",
2338+
{"acidFrames": 80}
2339+
],
2340+
"clearsObstacles": ["A", "B"],
2341+
"unlocksDoors": [
2342+
{"nodeId": 2, "types": ["ammo"], "requires": []},
2343+
{"nodeId": 5, "types": ["ammo"], "requires": []}
2344+
],
2345+
"flashSuitChecked": true,
2346+
"blueSuitChecked": true,
2347+
"note": [
2348+
"With Zebes set ablaze, Climb only spawns two pirates that drop nothing, and the bomb",
2349+
"wall is automatically cleared. The rising lava is now acid instead, so Gravity Suit works normally.",
2350+
"Jump up the platforms to get high enough above the rising acid to",
2351+
"safely Crystal Flash, then dive back into the acid against either bottom door. Wait in the acid",
2352+
"until your energy is low enough and shinecharge. Windup right before energy runs out to interrupt",
2353+
"then *immediately* leave to limit acid damage."
2354+
],
2355+
"devNote": [
2356+
"FIXME: Needs enemyKill requirements for the escape pirates."
2357+
]
2358+
},
20992359
{
21002360
"id": 84,
21012361
"link": [5, 5],
@@ -2156,6 +2416,46 @@
21562416
"flashSuitChecked": true,
21572417
"blueSuitChecked": true
21582418
},
2419+
{
2420+
"link": [5, 6],
2421+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
2422+
"entranceCondition": {
2423+
"comeInWithRMode": {}
2424+
},
2425+
"requires": [
2426+
{"not": "f_ZebesSetAblaze"},
2427+
"h_ZebesIsAwake",
2428+
{"or": [
2429+
"h_CrystalFlash",
2430+
{"and": [
2431+
"h_RModeCanRefillReserves",
2432+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
2433+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
2434+
]}
2435+
]},
2436+
{"or":[
2437+
{"and": [
2438+
"h_destroyBombWalls",
2439+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}}
2440+
]},
2441+
{"and": [
2442+
{"doorUnlockedAtNode": 5},
2443+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
2444+
]},
2445+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
2446+
]},
2447+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
2448+
"canRModeSparkInterrupt"
2449+
],
2450+
"clearsObstacles": ["A"],
2451+
"unlocksDoors": [{"nodeId": 5, "types": ["ammo"], "requires": []}],
2452+
"flashSuitChecked": true,
2453+
"blueSuitChecked": true,
2454+
"note": [
2455+
"Farm wall pirates while leaving one left. Lead it to the bottom of the shaft, get shine charge,",
2456+
"then windup in front of it to get shot and interrupted."
2457+
]
2458+
},
21592459
{
21602460
"id": 87,
21612461
"link": [5, 6],

0 commit comments

Comments
 (0)