Skip to content

Commit 047d5e2

Browse files
aquanightaquanight
authored
Merge branch 'vg-json-data:master' into rsi-gb-main-shaft
2 parents 880a92f + 2af0a69 commit 047d5e2

48 files changed

Lines changed: 4526 additions & 678 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎helpers.json‎

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,15 @@
10411041
{"gainBlueSuit": {}}
10421042
]
10431043
},
1044+
{
1045+
"name": "h_CrystalSparkWithoutLenience",
1046+
"requires": [
1047+
{"tech": "canCrystalSpark"},
1048+
"canMidAirMorph",
1049+
"h_CrystalFlash",
1050+
{"gainBlueSuit": {}}
1051+
]
1052+
},
10441053
{
10451054
"name": "h_heatedCrystalSpark",
10461055
"requires": [
@@ -1365,6 +1374,15 @@
13651374
]}
13661375
]
13671376
},
1377+
{
1378+
"name": "h_heatedRemoteRunway",
1379+
"requires": [
1380+
{"or": [
1381+
"h_heatProof",
1382+
"canTrickyJump"
1383+
]}
1384+
]
1385+
},
13681386
{
13691387
"name": "h_heatedRemoteRunwaySpaceJump",
13701388
"requires": [
@@ -1403,8 +1421,16 @@
14031421
"canInsaneJump"
14041422
]}
14051423
]
1424+
},
1425+
{
1426+
"name": "h_storedSpark",
1427+
"requires": [
1428+
{"or": [
1429+
{"useFlashSuit": {}},
1430+
{"blueSuitShinecharge": {}}
1431+
]}
1432+
]
14061433
}
1407-
14081434
]
14091435
},
14101436
{
@@ -1597,6 +1623,21 @@
15971623
"IBJ is not usable for underwater rooms without Gravity."
15981624
]
15991625
},
1626+
{
1627+
"name": "h_RModeCanRefillReserves",
1628+
"requires": [
1629+
{"or": [
1630+
{"and": [
1631+
{"resourceAvailable": [{"type": "RegularEnergy", "count": 99}]},
1632+
{"disableEquipment": "ETank"}
1633+
]},
1634+
{"and": [
1635+
{"resourceMissingAtMost": [{"type": "RegularEnergy", "count": 0}]},
1636+
"canRiskPermanentLossOfAccess"
1637+
]}
1638+
]}
1639+
]
1640+
},
16001641
{
16011642
"name": "h_RModeKnockbackSpark",
16021643
"requires": [
@@ -1619,7 +1660,7 @@
16191660
{"spikeHits": 1}
16201661
]
16211662
},
1622-
{
1663+
{
16231664
"name": "h_ThornXModeSpikeSuit",
16241665
"requires": [
16251666
"h_XModeThornHit",
@@ -1631,7 +1672,26 @@
16311672
"canXModeSpikeSuit",
16321673
{"thornHits": 1}
16331674
]
1634-
}
1675+
},
1676+
{
1677+
"name": "h_spikeXModeShinecharge",
1678+
"requires": [
1679+
"canXMode",
1680+
"h_XModeSpikeHit",
1681+
"h_XModeSpikeHit",
1682+
"h_shinechargeMaxRunway",
1683+
"canShinechargeMovement"
1684+
]
1685+
},
1686+
{
1687+
"name": "h_thornXModeShinecharge",
1688+
"requires": [
1689+
"canXMode",
1690+
"h_XModeThornHit",
1691+
"h_shinechargeMaxRunway",
1692+
"canShinechargeMovement"
1693+
]
1694+
}
16351695
]
16361696
}
16371697
]

‎region/brinstar/blue/Blue Brinstar Energy Tank Room.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -521,10 +521,9 @@
521521
{"or": [
522522
"h_CrystalFlash",
523523
{"and": [
524-
{"disableEquipment": "ETank"},
525-
{"resourceAvailable": [{"type": "Energy", "count": 90}]},
524+
"h_RModeCanRefillReserves",
526525
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
527-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}}
526+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
528527
]}
529528
]},
530529
{"canShineCharge": {"usedTiles": 30, "openEnd": 0}},
@@ -870,10 +869,9 @@
870869
{"and": [
871870
"Morph",
872871
"h_destroyBombWalls",
873-
{"disableEquipment": "ETank"},
874-
{"resourceAvailable": [{"type": "Energy", "count": 90}]},
872+
"h_RModeCanRefillReserves",
875873
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
876-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}}
874+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
877875
]}
878876
]},
879877
{"canShineCharge": {"usedTiles": 30, "openEnd": 0}},

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,19 @@
263263
{"or": [
264264
"h_CrystalFlash",
265265
{"and": [
266-
{"disableEquipment": "ETank"},
267-
{"resourceAvailable": [{"type": "Energy", "count": 95}]},
266+
"h_RModeCanRefillReserves",
268267
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
269268
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
270-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}},
271-
"canBePatient"
269+
{"or": [
270+
{"and": [
271+
{"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
272+
"canBePatient"
273+
]},
274+
{"and": [
275+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
276+
"canBeExtremelyPatient"
277+
]}
278+
]}
272279
]}
273280
]},
274281
"canTrickyDodgeEnemies",
@@ -1263,12 +1270,20 @@
12631270
"h_CrystalFlash",
12641271
{"and": [
12651272
"h_usePowerBomb",
1266-
{"disableEquipment": "ETank"},
1267-
{"resourceAvailable": [{"type": "Energy", "count": 95}]},
1273+
"h_RModeCanRefillReserves",
12681274
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
12691275
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
12701276
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}},
1271-
"canBePatient"
1277+
{"or": [
1278+
{"and": [
1279+
{"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
1280+
"canBePatient"
1281+
]},
1282+
{"and": [
1283+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
1284+
"canBeVeryPatient"
1285+
]}
1286+
]}
12721287
]}
12731288
]},
12741289
{"or": [

‎region/brinstar/green/Brinstar Pre-Map Room.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,36 @@
170170
"gModeRegainMobility": {},
171171
"flashSuitChecked": true
172172
},
173+
{
174+
"link": [1, 2],
175+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
176+
"entranceCondition": {
177+
"comeInWithRMode": {}
178+
},
179+
"requires": [
180+
"Morph",
181+
{"or": [
182+
"h_CrystalFlash",
183+
{"and": [
184+
"h_bombThings",
185+
"h_RModeCanRefillReserves",
186+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
187+
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
188+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
189+
]}
190+
]},
191+
{"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
192+
{"autoReserveTrigger": { }},
193+
"canRModeSparkInterrupt"
194+
],
195+
"clearsObstacles": ["A"],
196+
"flashSuitChecked": true,
197+
"blueSuitChecked": true,
198+
"note": [
199+
"Kill Zeela for reserves or Crystal Flash. Lead one Zeela above the runway and perform Spark Interrupt.",
200+
"Crystal Flash can be used to clear the bomb blocks for access to the runway."
201+
]
202+
},
173203
{
174204
"id": 5,
175205
"link": [1, 2],
@@ -386,6 +416,32 @@
386416
"bypassesDoorShell": true,
387417
"flashSuitChecked": true
388418
},
419+
{
420+
"link": [2, 2],
421+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
422+
"entranceCondition": {
423+
"comeInWithRMode": {}
424+
},
425+
"requires": [
426+
{"or": [
427+
"h_CrystalFlash",
428+
{"and": [
429+
"h_RModeCanRefillReserves",
430+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
431+
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
432+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
433+
]}
434+
]},
435+
{"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
436+
{"autoReserveTrigger": { }},
437+
"canRModeSparkInterrupt"
438+
],
439+
"flashSuitChecked": true,
440+
"blueSuitChecked": true,
441+
"note": [
442+
"Kill Zeela for reserves or Crystal Flash. Lead one Zeela above the runway and perform Spark Interrupt."
443+
]
444+
},
389445
{
390446
"id": 18,
391447
"link": [2, 2],

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,30 @@
496496
"Note that if Samus takes more than 35 seconds after entering the room, before shooting the ceiling, the Waver will not come down."
497497
]
498498
},
499+
{
500+
"link": [1, 3],
501+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
502+
"entranceCondition": {
503+
"comeInWithRMode": {}
504+
},
505+
"requires": [
506+
"Morph",
507+
{"refill": ["Energy"]},
508+
{"canShineCharge": {"usedTiles": 30, "openEnd": 1}},
509+
{"autoReserveTrigger": { }},
510+
"canRModeSparkInterrupt"
511+
],
512+
"clearsObstacles": ["A"],
513+
"flashSuitChecked": true,
514+
"blueSuitChecked": true,
515+
"note": [
516+
"Use the respawning Zeb to set up with reserves and enough energy to tank one Small Sidehopper hit without triggering Reserves",
517+
"then perform a 'slow short-charge' across the speedway: you must hold run at least until you have enough speed to get under the shutters.",
518+
"1-tap shinecharge is used to shinecharge over the Small Sidehopper Pit, before passing the 2nd to last shutter. Fall in, take a hit for",
519+
"i-frames so you can land and be ready to wind up before you get hit again.",
520+
"Once you have blue suit you can simply Morph and roll through the bomb blocks to escape."
521+
]
522+
},
499523
{
500524
"id": 18,
501525
"link": [1, 3],
@@ -520,6 +544,34 @@
520544
],
521545
"devNote": "This setup takes damage, but you can farm before and after."
522546
},
547+
{
548+
"link": [1, 4],
549+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
550+
"entranceCondition": {
551+
"comeInWithRMode": {}
552+
},
553+
"requires": [
554+
{"refill": ["Energy"]},
555+
{"or": [
556+
"canWalljump",
557+
"HiJump",
558+
"SpaceJump",
559+
"canIBJ",
560+
"canSpringBallJumpMidAir",
561+
"h_crouchJumpDownGrab"
562+
]},
563+
{"canShineCharge": {"usedTiles": 25, "openEnd": 1}},
564+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
565+
"canRModeSparkInterrupt"
566+
],
567+
"clearsObstacles": ["A"],
568+
"flashSuitChecked": true,
569+
"blueSuitChecked": true,
570+
"note": [
571+
"Before running across the speedway, use the Zeb spawner to get enough Reserves.",
572+
"Use the runway on the upper screen. There are many enemies up there to clear out of the way, but leave one alive."
573+
]
574+
},
523575
{
524576
"id": 20,
525577
"link": [1, 4],
@@ -978,6 +1030,43 @@
9781030
"After the crumbles are broken, shoot the ceiling block and wait by the door for the Waver to come."
9791031
]
9801032
},
1033+
{
1034+
"link": [2, 4],
1035+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
1036+
"entranceCondition": {
1037+
"comeInWithRMode": {}
1038+
},
1039+
"requires": [
1040+
{"or": [
1041+
"canWalljump",
1042+
"HiJump",
1043+
"SpaceJump",
1044+
"canIBJ",
1045+
"canSpringBallJumpMidAir",
1046+
"h_crouchJumpDownGrab"
1047+
]},
1048+
{"or": [
1049+
"h_CrystalFlash",
1050+
{"and": [
1051+
{"disableEquipment": "ETank"},
1052+
{"resourceAvailable": [{"type": "Energy", "count": 80}]},
1053+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
1054+
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
1055+
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}}
1056+
]}
1057+
]},
1058+
{"canShineCharge": {"usedTiles": 25, "openEnd": 1}},
1059+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
1060+
"canRModeSparkInterrupt"
1061+
],
1062+
"clearsObstacles": ["A"],
1063+
"flashSuitChecked": true,
1064+
"blueSuitChecked": true,
1065+
"note": [
1066+
"Use the runway on the upper screen. There are many enemies up there to clear out of the way and will helpfully provide Reserves.",
1067+
"Or else Crystal Flash. Leave one waver or small hopper alive. You can farm the rest for drops."
1068+
]
1069+
},
9811070
{
9821071
"id": 31,
9831072
"link": [2, 4],
@@ -1025,6 +1114,16 @@
10251114
],
10261115
"flashSuitChecked": true
10271116
},
1117+
{
1118+
"link": [3, 1],
1119+
"name": "Blue Suit",
1120+
"requires": [
1121+
"Morph",
1122+
{"haveBlueSuit": {}}
1123+
],
1124+
"flashSuitChecked": true,
1125+
"blueSuitChecked": true
1126+
},
10281127
{
10291128
"id": 35,
10301129
"link": [3, 1],

0 commit comments

Comments
 (0)