Skip to content

Commit cf2cde6

Browse files
osse101osse101
authored
Merge pull request #1910 from kjbranch/g-double-spring
Artificial Morph Double Spring, G/P/Y Maridia
2 parents 4919766 + 37b54c2 commit cf2cde6

9 files changed

Lines changed: 209 additions & 40 deletions

‎helpers.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,14 @@
10851085
"SpringBall"
10861086
]
10871087
},
1088+
{
1089+
"name": "h_canArtificialMorphDoubleSpringBallJump",
1090+
"requires": [
1091+
{"tech": "canDoubleSpringBallJumpMidAir"},
1092+
"HiJump",
1093+
"SpringBall"
1094+
]
1095+
},
10881096
{
10891097
"name": "h_canArtificialMorphBombThings",
10901098
"requires": [

‎region/maridia/inner-pink/Aqueduct.json‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,12 @@
465465
"HiJump",
466466
"canConsecutiveWalljump",
467467
"canPreciseWalljump"
468+
]},
469+
"h_canArtificialMorphDoubleSpringBallJump",
470+
{"and": [
471+
"Gravity",
472+
"HiJump",
473+
"h_canArtificialMorphSpringBallBombJump"
468474
]}
469475
]}
470476
],
@@ -483,13 +489,23 @@
483489
},
484490
"requires": [
485491
"h_canArtificialMorphBombs",
486-
"Gravity",
487492
{"or": [
488-
"h_canArtificialMorphLongIBJ",
489-
"h_canArtificialMorphJumpIntoIBJ",
493+
{"and": [
494+
"Gravity",
495+
{"or": [
496+
"h_canArtificialMorphLongIBJ",
497+
"h_canArtificialMorphJumpIntoIBJ"
498+
]}
499+
]},
490500
{"and": [
491501
"canGravityJump",
492502
"h_canArtificialMorphSpringBall"
503+
]},
504+
"h_canArtificialMorphDoubleSpringBallJump",
505+
{"and": [
506+
"Gravity",
507+
"HiJump",
508+
"h_canArtificialMorphSpringBallBombJump"
493509
]}
494510
]}
495511
],
@@ -526,6 +542,12 @@
526542
"HiJump",
527543
"canConsecutiveWalljump",
528544
"canPreciseWalljump"
545+
]},
546+
"h_canArtificialMorphDoubleSpringBallJump",
547+
{"and": [
548+
"Gravity",
549+
"HiJump",
550+
"h_canArtificialMorphSpringBallBombJump"
529551
]}
530552
]}
531553
],

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,13 @@
646646
}
647647
},
648648
"requires": [
649-
"Gravity",
650-
"h_canArtificialMorphIBJ"
649+
{"or": [
650+
{"and": [
651+
"Gravity",
652+
"h_canArtificialMorphIBJ"
653+
]},
654+
"h_canArtificialMorphDoubleSpringBallJump"
655+
]}
651656
],
652657
"flashSuitChecked": true
653658
},

‎region/maridia/inner-pink/East Sand Hole.json‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -434,21 +434,23 @@
434434
"comesThroughToilet": "any"
435435
},
436436
"requires": [
437-
"Gravity",
438437
{"or": [
439-
"h_canArtificialMorphIBJ",
440438
{"and": [
441-
"h_canArtificialMorphSpringBallBombJump",
442-
"h_additionalBomb"
443-
]}
439+
"Gravity",
440+
{"or": [
441+
"h_canArtificialMorphIBJ",
442+
{"and": [
443+
"h_canArtificialMorphSpringBallBombJump",
444+
"h_additionalBomb"
445+
]}
446+
]}
447+
]},
448+
"h_canArtificialMorphDoubleSpringBallJump"
444449
]}
445450
],
446451
"flashSuitChecked": true,
447452
"note": "IBJ or Spring Ball Bomb Jump through two sets of Crumble Blocks.",
448-
"devNote": [
449-
"Without this being Morph, there is no way to escape. PLMs are already overloaded from the sand.",
450-
"FIXME Add a morphless double spring ball jump."
451-
]
453+
"devNote": "Without this being Morph, there is no way to escape. PLMs are already overloaded from the sand."
452454
},
453455
{
454456
"id": 5,

‎region/maridia/inner-pink/The Precious Room.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,13 @@
566566
}
567567
},
568568
"requires": [
569-
"Gravity",
570-
"h_canArtificialMorphIBJ"
569+
{"or": [
570+
{"and": [
571+
"Gravity",
572+
"h_canArtificialMorphIBJ"
573+
]},
574+
"h_canArtificialMorphDoubleSpringBallJump"
575+
]}
571576
],
572577
"flashSuitChecked": true
573578
},

‎region/maridia/inner-pink/West Cactus Alley Room.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,28 @@
603603
],
604604
"flashSuitChecked": true
605605
},
606+
{
607+
"link": [1, 2],
608+
"name": "G-Mode Morph",
609+
"entranceCondition": {
610+
"comeInWithGMode": {
611+
"mode": "any",
612+
"morphed": true
613+
}
614+
},
615+
"requires": [
616+
"h_canArtificialMorphDoubleSpringBallJump",
617+
{"or": [
618+
"h_canArtificialMorphPowerBomb",
619+
{"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 2}},
620+
{"and": [
621+
"canInsaneJump",
622+
{"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}}
623+
]}
624+
]}
625+
],
626+
"flashSuitChecked": true
627+
},
606628
{
607629
"id": 22,
608630
"link": [1, 2],

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,12 +553,20 @@
553553
}
554554
},
555555
"requires": [
556-
"Gravity",
557556
{"or": [
558-
"h_canArtificialMorphLongIBJ",
559557
{"and": [
560-
"h_canArtificialMorphIBJ",
561-
"h_canArtificialMorphBombHorizontally"
558+
"Gravity",
559+
{"or": [
560+
"h_canArtificialMorphLongIBJ",
561+
{"and": [
562+
"h_canArtificialMorphIBJ",
563+
"h_canArtificialMorphBombHorizontally"
564+
]}
565+
]}
566+
]},
567+
{"and": [
568+
"h_canArtificialMorphDoubleSpringBallJump",
569+
"h_canCrouchJumpDownGrab"
562570
]}
563571
]}
564572
],

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

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -610,26 +610,6 @@
610610
],
611611
"devNote": "This strat is applicable with Crocomire's Room and the Post Crocomire Jump Room."
612612
},
613-
{
614-
"id": 24,
615-
"link": [2, 1],
616-
"name": "G-Mode Morph",
617-
"entranceCondition": {
618-
"comeInWithGMode": {
619-
"mode": "any",
620-
"morphed": true
621-
},
622-
"comesThroughToilet": "any"
623-
},
624-
"requires": [
625-
"Gravity",
626-
{"or": [
627-
"h_canArtificialMorphIBJ",
628-
"h_canArtificialMorphSpringBallBombJump"
629-
]}
630-
],
631-
"flashSuitChecked": true
632-
},
633613
{
634614
"id": 25,
635615
"link": [2, 2],
@@ -1351,6 +1331,31 @@
13511331
"If a third tile is available, the jump can be done more easily."
13521332
]
13531333
},
1334+
{
1335+
"id": 24,
1336+
"link": [2, 4],
1337+
"name": "G-Mode Morph",
1338+
"entranceCondition": {
1339+
"comeInWithGMode": {
1340+
"mode": "any",
1341+
"morphed": true
1342+
},
1343+
"comesThroughToilet": "any"
1344+
},
1345+
"requires": [
1346+
{"or": [
1347+
{"and": [
1348+
"Gravity",
1349+
{"or": [
1350+
"h_canArtificialMorphIBJ",
1351+
"h_canArtificialMorphSpringBallBombJump"
1352+
]}
1353+
]},
1354+
"h_canArtificialMorphDoubleSpringBallJump"
1355+
]}
1356+
],
1357+
"flashSuitChecked": true
1358+
},
13541359
{
13551360
"id": 66,
13561361
"link": [2, 4],

‎region/maridia/inner-yellow/Watering Hole.json‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,98 @@
224224
},
225225
"flashSuitChecked": true
226226
},
227+
{
228+
"link": [1, 1],
229+
"name": "G-Mode Morph - Remote Acquire Left Item",
230+
"entranceCondition": {
231+
"comeInWithGMode": {
232+
"mode": "direct",
233+
"morphed": true
234+
}
235+
},
236+
"requires": [
237+
"canOffScreenMovement",
238+
{"or": [
239+
{"and": [
240+
"canTrickyJump",
241+
"h_canArtificialMorphBombs",
242+
"h_canArtificialMorphSpringBall"
243+
]},
244+
{"and": [
245+
"canInsaneJump",
246+
"h_canArtificialMorphBombs"
247+
]},
248+
{"and": [
249+
"h_canArtificialMorphPowerBomb",
250+
"h_canArtificialMorphPowerBomb"
251+
]},
252+
{"and": [
253+
"h_canArtificialMorphBombs",
254+
{"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
255+
]}
256+
]},
257+
{"or": [
258+
{"and": [
259+
"Gravity",
260+
{"or": [
261+
"h_canArtificialMorphIBJ",
262+
"h_canArtificialMorphSpringBallBombJump"
263+
]}
264+
]},
265+
"h_canArtificialMorphDoubleSpringBallJump"
266+
]}
267+
],
268+
"collectsItems": [2],
269+
"flashSuitChecked": true,
270+
"note": "Carefully avoid or kill the Zebs and the Choot. The Choot will be easiest to kill with Bombs by staying against the left wall.",
271+
"devNote": "It is possible but unreasonable to collect both items simultaneously."
272+
},
273+
{
274+
"link": [1, 1],
275+
"name": "G-Mode Morph - Remote Acquire Right Item",
276+
"entranceCondition": {
277+
"comeInWithGMode": {
278+
"mode": "direct",
279+
"morphed": true
280+
}
281+
},
282+
"requires": [
283+
"canOffScreenMovement",
284+
{"or": [
285+
{"and": [
286+
"canTrickyJump",
287+
"h_canArtificialMorphBombs",
288+
"h_canArtificialMorphSpringBall"
289+
]},
290+
{"and": [
291+
"canInsaneJump",
292+
"h_canArtificialMorphBombs"
293+
]},
294+
{"and": [
295+
"h_canArtificialMorphPowerBomb",
296+
"h_canArtificialMorphPowerBomb"
297+
]},
298+
{"and": [
299+
"h_canArtificialMorphBombs",
300+
{"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
301+
]}
302+
]},
303+
{"or": [
304+
{"and": [
305+
"Gravity",
306+
{"or": [
307+
"h_canArtificialMorphIBJ",
308+
"h_canArtificialMorphSpringBallBombJump"
309+
]}
310+
]},
311+
"h_canArtificialMorphDoubleSpringBallJump"
312+
]}
313+
],
314+
"collectsItems": [3],
315+
"flashSuitChecked": true,
316+
"note": "Carefully avoid or kill the Zebs and the Choot. The Choot will be easiest to kill with Bombs by staying against the left wall.",
317+
"devNote": "It is possible but unreasonable to collect both items simultaneously."
318+
},
227319
{
228320
"id": 10,
229321
"link": [1, 2],

0 commit comments

Comments
 (0)