Skip to content

Commit 924441e

Browse files
kjbranchkjbranch
authored
Merge branch 'vg-json-data:master' into r-cf-maridia-easy-2
2 parents 8f9e42f + 37b1606 commit 924441e

11 files changed

Lines changed: 214 additions & 31 deletions

File tree

‎helpers.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,9 +1656,9 @@
16561656
]
16571657
},
16581658
{
1659-
"name": "h_artificialMorphTrickyRModeCrystalFlashInterrupt",
1659+
"name": "h_artificialMorphComplexRModeCrystalFlashInterrupt",
16601660
"requires": [
1661-
{"tech": "canTrickyRModeCrystalFlashInterrupt"},
1661+
{"tech": "canComplexRModeCrystalFlashInterrupt"},
16621662
"h_artificialMorphRModeCrystalFlashInterrupt"
16631663
]
16641664
},

‎region/lowernorfair/east/Plowerhouse Room.json‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,60 @@
384384
"It is possible to kill a Zebbo by the door and pause abuse to grab its Energy drop on G-mode exit, which requires not killing the right Zebbo until it is in location."
385385
]
386386
},
387+
{
388+
"link": [1, 2],
389+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
390+
"entranceCondition": {
391+
"comeInWithRMode": {}
392+
},
393+
"requires": [
394+
"Gravity",
395+
{"or": [
396+
{"and": [
397+
"canDodgeWhileShooting",
398+
{"or": ["Plasma", {"and": ["Ice", "Wave", "Spazer"]}]},
399+
{"heatFrames": 550}
400+
]},
401+
{"and": [
402+
{"enemyKill": {"enemies": [["Holtz", "Holtz"]], "explicitWeapons": ["ScrewAttack", "Ice+Wave+Plasma"]}},
403+
{"heatFrames": 100}
404+
]},
405+
{"and": [
406+
"canDodgeWhileShooting",
407+
{"enemyKill": {"enemies": [["Holtz", "Holtz"]], "explicitWeapons": ["Super"]}},
408+
{"heatFrames": 300}
409+
]},
410+
{"and": [
411+
"canTrickyJump",
412+
{"enemyKill": {"enemies": [["Holtz", "Holtz"]], "explicitWeapons": ["PowerBomb"]}},
413+
{"heatFrames": 600}
414+
]}
415+
]},
416+
{"or": [
417+
"h_heatedCrystalFlashForReserveEnergy",
418+
{"and": [
419+
"h_heatProof",
420+
"h_RModeCanRefillReserves",
421+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
422+
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
423+
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
424+
{"refill": ["Energy"]}
425+
]}
426+
]},
427+
{"canShineCharge": {"usedTiles": 38, "openEnd": 0}},
428+
{"heatFrames": 390},
429+
{"acidFrames": 133},
430+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
431+
"canRModeSparkInterrupt",
432+
{"heatFrames": 80}
433+
],
434+
"flashSuitChecked": true,
435+
"blueSuitChecked": true,
436+
"note": [
437+
"Clear the two Holtzes that greet you and collect their drops. With heat protection, you can",
438+
"farm up at a Zebbo pipe. Run across the acid then jump up to a Zebbo pipe for the interrupt."
439+
]
440+
},
387441
{
388442
"id": 5,
389443
"link": [1, 3],
@@ -490,6 +544,71 @@
490544
"Continue placing power bombs while avoiding the Holtzes and avoiding luring the third one to the right."
491545
]
492546
},
547+
{
548+
"link": [2, 1],
549+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
550+
"entranceCondition": {
551+
"comeInWithRMode": {}
552+
},
553+
"requires": [
554+
"Gravity",
555+
{"or": [
556+
{"and": [
557+
"canBePatient",
558+
"canDodgeWhileShooting",
559+
{"heatFrames": 2400}
560+
]},
561+
{"and": [
562+
{"or": [
563+
"Wave",
564+
"Spazer"
565+
]},
566+
{"heatFrames": 950}
567+
]},
568+
{"and": [
569+
{"or": ["Plasma", {"and": ["Ice", "Wave", "Spazer"]}]},
570+
{"heatFrames": 500}
571+
]},
572+
{"and": [
573+
{"enemyKill": {"enemies": [["Holtz", "Holtz"]], "explicitWeapons": ["ScrewAttack", "Ice+Wave+Plasma"]}},
574+
{"heatFrames": 100}
575+
]},
576+
{"and": [
577+
"canDodgeWhileShooting",
578+
{"enemyKill": {"enemies": [["Holtz", "Holtz"]], "explicitWeapons": ["Super", "PowerBomb"]}},
579+
{"heatFrames": 550}
580+
]}
581+
]},
582+
{"or": [
583+
"h_heatedCrystalFlashForReserveEnergy",
584+
{"and": [
585+
"h_RModeCanRefillReserves",
586+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
587+
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
588+
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
589+
{"or": [
590+
{"partialRefill": {"type": "ReserveEnergy", "limit": 40}},
591+
{"and": [
592+
"h_heatProof",
593+
{"refill": ["Energy"]}
594+
]}
595+
]}
596+
]}
597+
]},
598+
{"canShineCharge": {"usedTiles": 38, "openEnd": 0}},
599+
{"heatFrames": 390},
600+
{"acidFrames": 133},
601+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
602+
"canRModeSparkInterrupt",
603+
{"heatFrames": 80}
604+
],
605+
"flashSuitChecked": true,
606+
"blueSuitChecked": true,
607+
"note": [
608+
"Clear the two Holtzes that greet you and collect their drops. With heat protection, you can",
609+
"farm up at a Zebbo pipe. Run across the acid then jump up to a Zebbo pipe for the interrupt."
610+
]
611+
},
493612
{
494613
"id": 11,
495614
"link": [2, 1],

‎region/lowernorfair/east/Wasteland.json‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,11 @@
147147
"id": "E",
148148
"name": "Shutter Under Spikes",
149149
"obstacleType": "inanimate"
150+
},
151+
{
152+
"id": "R-Mode",
153+
"name": "Entered with R-Mode",
154+
"obstacleType": "abstract"
150155
}
151156
],
152157
"enemies": [
@@ -254,6 +259,17 @@
254259
}
255260
],
256261
"strats": [
262+
{
263+
"link": [1, 1],
264+
"name": "R-Mode Entry",
265+
"entranceCondition": {
266+
"comeInWithRMode": {}
267+
},
268+
"requires": [ {"heatFrames": 0} ],
269+
"flashSuitChecked": true,
270+
"blueSuitChecked": true,
271+
"clearsObstacles": ["R-Mode"]
272+
},
257273
{
258274
"id": 1,
259275
"link": [1, 1],
@@ -419,6 +435,18 @@
419435
"flashSuitChecked": true,
420436
"note": "Climb up 2 screens."
421437
},
438+
{
439+
"link": [2, 2],
440+
"name": "R-Mode Entry",
441+
"entranceCondition": {
442+
"comeInWithRMode": {},
443+
"comesThroughToilet": "no"
444+
},
445+
"requires": [ {"heatFrames": 0} ],
446+
"flashSuitChecked": true,
447+
"blueSuitChecked": true,
448+
"clearsObstacles": ["R-Mode"]
449+
},
422450
{
423451
"id": 10,
424452
"link": [2, 2],
@@ -641,6 +669,42 @@
641669
"clearsObstacles": ["A", "B"],
642670
"flashSuitChecked": true
643671
},
672+
{
673+
"link": [4, 4],
674+
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
675+
"requires": [
676+
{"obstaclesCleared": ["R-Mode"]},
677+
{"obstaclesCleared": ["C", "D"]},
678+
{"or": [
679+
"h_heatedCrystalFlashForReserveEnergy",
680+
{"and": [
681+
"h_RModeCanRefillReserves",
682+
{"or": [
683+
{"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
684+
{"and": [
685+
"canBeVeryPatient",
686+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
687+
]}
688+
]}
689+
]}
690+
]},
691+
{"heatFrames": 90},
692+
{"canShineCharge": {"usedTiles": 30, "openEnd": 0}},
693+
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
694+
"canRModeSparkInterrupt"
695+
],
696+
"resetsObstacles": ["R-Mode"],
697+
"flashSuitChecked": true,
698+
"blueSuitChecked": true,
699+
"note": [
700+
"Farm the Dessgeegas, their energy rate is poor. Keep one Dessgeega alive to use for interrupt.",
701+
"Or kill all four and use heat with pause abuse to interrupt."
702+
],
703+
"devNote": [
704+
"FIXME: Evaluate unprotected heat option with disable E-Tank + CF for full reserves, once heated",
705+
"bluesuit movement is implemented."
706+
]
707+
},
644708
{
645709
"id": 20,
646710
"link": [4, 4],

‎region/maridia/inner-green/Shaktool Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
]},
296296
{"and": [
297297
{"ammo": {"type": "Missile", "count": 2}},
298-
"canTrickyRModeCrystalFlashInterrupt"
298+
"canComplexRModeCrystalFlashInterrupt"
299299
]}
300300
]}
301301
],
@@ -330,7 +330,7 @@
330330
]},
331331
{"and": [
332332
{"ammo": {"type": "Missile", "count": 2}},
333-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt"
333+
"h_artificialMorphComplexRModeCrystalFlashInterrupt"
334334
]}
335335
]},
336336
{"or": [
@@ -930,7 +930,7 @@
930930
]},
931931
{"and": [
932932
{"ammo": {"type": "Missile", "count": 2}},
933-
"canTrickyRModeCrystalFlashInterrupt"
933+
"canComplexRModeCrystalFlashInterrupt"
934934
]}
935935
]}
936936
],
@@ -966,7 +966,7 @@
966966
]},
967967
{"and": [
968968
{"ammo": {"type": "Missile", "count": 2}},
969-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt"
969+
"h_artificialMorphComplexRModeCrystalFlashInterrupt"
970970
]}
971971
]}
972972
],

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
"h_artificialMorphBombThings",
420420
"h_artificialMorphSpringBall"
421421
]},
422-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
422+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
423423
{"ammo": {"type": "Missile", "count": 10}},
424424
{"ammo": {"type": "Super", "count": 10}},
425425
{"or": [
@@ -1162,7 +1162,7 @@
11621162
"name": "R-Mode Crystal Flash Interrupt",
11631163
"requires": [
11641164
{"obstaclesCleared": ["R-Mode"]},
1165-
"canTrickyRModeCrystalFlashInterrupt",
1165+
"canComplexRModeCrystalFlashInterrupt",
11661166
{"ammo": {"type": "Missile", "count": 10}},
11671167
{"ammo": {"type": "Super", "count": 10}},
11681168
{"or": [
@@ -1207,7 +1207,7 @@
12071207
]},
12081208
"h_artificialMorphSpringBall"
12091209
]},
1210-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
1210+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
12111211
{"ammo": {"type": "Missile", "count": 10}},
12121212
{"ammo": {"type": "Super", "count": 10}},
12131213
{"or": [
@@ -1543,7 +1543,7 @@
15431543
}
15441544
},
15451545
"requires": [
1546-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
1546+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
15471547
{"ammo": {"type": "Missile", "count": 10}},
15481548
{"ammo": {"type": "Super", "count": 10}},
15491549
{"or": [
@@ -2323,7 +2323,7 @@
23232323
}
23242324
},
23252325
"requires": [
2326-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
2326+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
23272327
{"ammo": {"type": "Missile", "count": 10}},
23282328
{"ammo": {"type": "Super", "count": 10}},
23292329
{"or": [

‎region/maridia/inner-yellow/The Beach.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
"comeInWithRMode": {}
419419
},
420420
"requires": [
421-
"canTrickyRModeCrystalFlashInterrupt",
421+
"canComplexRModeCrystalFlashInterrupt",
422422
{"ammo": {"type": "Missile", "count": 10}},
423423
{"ammo": {"type": "Super", "count": 10}},
424424
{"or": [
@@ -455,7 +455,7 @@
455455
}
456456
},
457457
"requires": [
458-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
458+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
459459
{"ammo": {"type": "Missile", "count": 10}},
460460
{"ammo": {"type": "Super", "count": 10}},
461461
{"or": [
@@ -859,7 +859,7 @@
859859
"comesThroughToilet": "no"
860860
},
861861
"requires": [
862-
"canTrickyRModeCrystalFlashInterrupt",
862+
"canComplexRModeCrystalFlashInterrupt",
863863
{"ammo": {"type": "Missile", "count": 10}},
864864
{"ammo": {"type": "Super", "count": 10}},
865865
{"or": [
@@ -897,7 +897,7 @@
897897
"comesThroughToilet": "no"
898898
},
899899
"requires": [
900-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
900+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
901901
{"ammo": {"type": "Missile", "count": 10}},
902902
{"ammo": {"type": "Super", "count": 10}},
903903
{"or": [

‎region/maridia/outer/Fish Tank.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
"name": "R-Mode Crystal Flash Interrupt (Skultera)",
467467
"requires": [
468468
{"obstaclesCleared": ["R-Mode"]},
469-
"canTrickyRModeCrystalFlashInterrupt",
469+
"canComplexRModeCrystalFlashInterrupt",
470470
{"ammo": {"type": "Missile", "count": 10}},
471471
{"ammo": {"type": "Super", "count": 10}},
472472
{"or": [
@@ -506,7 +506,7 @@
506506
}
507507
},
508508
"requires": [
509-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
509+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
510510
{"ammo": {"type": "Missile", "count": 10}},
511511
{"ammo": {"type": "Super", "count": 10}},
512512
{"or": [
@@ -2602,7 +2602,7 @@
26022602
]}
26032603
]}
26042604
]},
2605-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
2605+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
26062606
{"ammo": {"type": "Missile", "count": 10}},
26072607
{"ammo": {"type": "Super", "count": 10}},
26082608
{"or": [
@@ -2922,7 +2922,7 @@
29222922
"comesThroughToilet": "no"
29232923
},
29242924
"requires": [
2925-
"h_artificialMorphTrickyRModeCrystalFlashInterrupt",
2925+
"h_artificialMorphComplexRModeCrystalFlashInterrupt",
29262926
{"ammo": {"type": "Missile", "count": 10}},
29272927
{"ammo": {"type": "Super", "count": 10}},
29282928
{"or": [

0 commit comments

Comments
 (0)