Skip to content

Commit 062656f

Browse files
kjbranchkjbranch
committed
Upper Norfair West G-Mode: Second Pass
1 parent 9c0fe6c commit 062656f

6 files changed

Lines changed: 101 additions & 38 deletions

File tree

‎region/norfair/west/Crocomire Escape.json‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@
526526
},
527527
"requires": [
528528
"canTrickyUseFrozenEnemies",
529+
"canTrickyDodgeEnemies",
529530
{"or": [
530531
"HiJump",
531532
"canSpringBallJumpMidAir"
@@ -566,12 +567,23 @@
566567
"canInsaneJump",
567568
"h_additionalBomb"
568569
]}
570+
]},
571+
{"and": [
572+
"canHorizontalShinespark",
573+
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
574+
{"shinespark": {"frames": 40, "excessFrames": 18}}
575+
]},
576+
{"and": [
577+
{"notable": "Ceiling Mockball Spring Fling"},
578+
"SpeedBooster",
579+
"canInsaneJump",
580+
"canMomentumConservingMorph",
581+
"canSpringFling"
569582
]}
570583
]},
571584
"h_heatedGModeOpenDifferentDoor"
572585
],
573-
"flashSuitChecked": true,
574-
"devNote": "FIXME: A variant with shinesparking can be added. (Energy from immobile, CF, or energy free sparks)"
586+
"flashSuitChecked": true
575587
},
576588
{
577589
"id": 52,
@@ -729,6 +741,7 @@
729741
},
730742
"requires": [
731743
"canTrickyUseFrozenEnemies",
744+
"canTrickyDodgeEnemies",
732745
{"or": [
733746
"HiJump",
734747
"canSpringBallJumpMidAir"
@@ -767,6 +780,18 @@
767780
"canUnmorphBombBoost",
768781
"h_crouchJumpDownGrab",
769782
"canInsaneJump"
783+
]},
784+
{"and": [
785+
"canHorizontalShinespark",
786+
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
787+
{"shinespark": {"frames": 40, "excessFrames": 18}}
788+
]},
789+
{"and": [
790+
{"notable": "Ceiling Mockball Spring Fling"},
791+
"SpeedBooster",
792+
"canInsaneJump",
793+
"canMomentumConservingMorph",
794+
"canSpringFling"
770795
]}
771796
]},
772797
"h_heatedDirectGModeLeaveSameDoor"
@@ -1213,6 +1238,7 @@
12131238
"requires": [
12141239
"h_heatedGMode",
12151240
"canTrickyUseFrozenEnemies",
1241+
"canTrickyDodgeEnemies",
12161242
{"or": [
12171243
"HiJump",
12181244
"canSpringBallJumpMidAir"
@@ -1255,6 +1281,11 @@
12551281
"h_additionalBomb"
12561282
]}
12571283
]},
1284+
{"and": [
1285+
"canHorizontalShinespark",
1286+
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
1287+
{"shinespark": {"frames": 40, "excessFrames": 18}}
1288+
]},
12581289
{"and": [
12591290
{"notable": "Ceiling Mockball Spring Fling"},
12601291
"SpeedBooster",
@@ -1266,7 +1297,7 @@
12661297
{"heatFrames": 0}
12671298
],
12681299
"flashSuitChecked": true,
1269-
"devNote": "FIXME: Variants with shinesparking or Geruta damage boost can be added. (Energy from immobile, CF, or energy free sparks)"
1300+
"devNote": "FIXME: Variants with Geruta damage boost can be added. (Energy from immobile or CF)"
12701301
},
12711302
{
12721303
"id": 58,
@@ -1301,6 +1332,7 @@
13011332
"requires": [
13021333
"h_heatedGMode",
13031334
"canTrickyUseFrozenEnemies",
1335+
"canTrickyDodgeEnemies",
13041336
{"or": [
13051337
"HiJump",
13061338
"canSpringBallJumpMidAir"
@@ -1347,6 +1379,11 @@
13471379
"h_additionalBomb"
13481380
]}
13491381
]},
1382+
{"and": [
1383+
"canHorizontalShinespark",
1384+
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
1385+
{"shinespark": {"frames": 40, "excessFrames": 18}}
1386+
]},
13501387
{"and": [
13511388
{"notable": "Ceiling Mockball Spring Fling"},
13521389
"SpeedBooster",
@@ -1556,6 +1593,20 @@
15561593
],
15571594
"note": "This strat just waits out the Dragon."
15581595
},
1596+
{
1597+
"link": [3, 2],
1598+
"name": "Frozen Geruta Platform",
1599+
"requires": [
1600+
"h_heatProof",
1601+
"canTrickyUseFrozenEnemies",
1602+
{"or": [
1603+
"HiJump",
1604+
"canTrickyDodgeEnemies"
1605+
]}
1606+
],
1607+
"flashSuitChecked": true,
1608+
"note": "It is possible to lure the Geruta to be used as a platform with nothing but Ice."
1609+
},
15591610
{
15601611
"id": 38,
15611612
"link": [3, 2],

‎region/norfair/west/Crocomire Speedway.json‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -790,26 +790,17 @@
790790
}
791791
},
792792
"requires": [
793-
"canTrickyJump",
793+
"canTrickyDodgeEnemies",
794794
{"or": [
795795
{"ammo": {"type": "PowerBomb", "count": 6}},
796796
{"and": [
797797
{"or": [
798798
{"and": [
799-
"h_artificialMorphSpringBall",
800-
"canTrickyDodgeEnemies"
801-
]},
802-
{"and": [
803-
"h_artificialMorphIBJ",
804-
"canInsaneJump"
805-
]},
806-
{"and": [
807-
{"ammo": {"type": "PowerBomb", "count": 1}},
808-
"h_artificialMorphSpringBall"
809-
]},
810-
{"and": [
811-
{"ammo": {"type": "PowerBomb", "count": 2}},
812-
"h_artificialMorphIBJ"
799+
"h_artificialMorphMovement",
800+
{"or": [
801+
"canInsaneJump",
802+
"h_artificialMorphPowerBomb"
803+
]}
813804
]}
814805
]},
815806
{"or": [
@@ -2203,6 +2194,7 @@
22032194
"link": [7, 2],
22042195
"name": "G-Mode, Heatproof, Fix Camera",
22052196
"requires": [
2197+
"canEnterGMode",
22062198
"h_heatProof",
22072199
{"or": [
22082200
"h_bombThings",
@@ -2230,6 +2222,7 @@
22302222
"link": [7, 2],
22312223
"name": "G-Mode, Fix Camera, Speedy Exit",
22322224
"requires": [
2225+
"h_heatedGMode",
22332226
"h_getBlueSpeedMaxRunway",
22342227
{"heatFrames": 375}
22352228
],

‎region/norfair/west/Crumble Shaft.json‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -293,18 +293,16 @@
293293
}
294294
},
295295
"requires": [
296+
"h_heatedGMode",
296297
{"or": [
298+
{"heatFrames": 45},
297299
{"and": [
298-
"h_heatedGMode",
299-
{"heatFrames": 45}
300-
]},
301-
{"and": [
302-
{"ammo": {"type": "Super", "count": 1}},
303-
"h_heatedGModePauseAbuse"
304-
]},
305-
{"and": [
306-
"canTrickyGMode",
307-
"h_heatedGModePauseAbuse"
300+
"h_heatedGModePauseAbuse",
301+
{"or": [
302+
"canUseGrapple",
303+
"canTrickyGMode",
304+
{"ammo": {"type": "Super", "count": 1}}
305+
]}
308306
]}
309307
]}
310308
],
@@ -652,6 +650,11 @@
652650
{"and": [
653651
{"ammo": {"type": "Super", "count": 1}},
654652
"h_heatedGModePauseAbuse"
653+
]},
654+
{"and": [
655+
"h_heatedGModePauseAbuse",
656+
"canUseGrapple",
657+
"canTrickyGMode"
655658
]}
656659
]}
657660
],

‎region/norfair/west/Hi Jump Energy Tank Room.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,10 @@
401401
"requires": [
402402
{"or": [
403403
"h_artificialMorphIBJ",
404+
{"and": [
405+
"h_artificialMorphSpringBallBombJump",
406+
"h_additionalBomb"
407+
]},
404408
{"and": [
405409
"HiJump",
406410
"h_artificialMorphSpringBall"
@@ -418,7 +422,8 @@
418422
],
419423
"clearsObstacles": ["D"],
420424
"flashSuitChecked": true,
421-
"note": "Get to the item without overloading PLMs by avoiding entering the morph tunnel at the bottom of the room or using Power Bombs near the items."
425+
"note": "Get to the item without overloading PLMs by avoiding entering the morph tunnel at the bottom of the room.",
426+
"devNote": "Spring Ball bomb jumps with Power Bombs are not going to overload many PLMs."
422427
},
423428
{
424429
"id": 11,
@@ -480,7 +485,7 @@
480485
"h_artificialMorphPowerBomb",
481486
"canOffScreenMovement"
482487
],
483-
"collectsItems": [4],
488+
"collectsItems": [3, 4],
484489
"flashSuitChecked": true,
485490
"note": [
486491
"Placing a Power Bomb a 0.5 to 1 tile away from the item plinth to bounce Samus onto it (where the right item usually is) while also overloading PLMs as the explosion hits the left item.",

‎region/norfair/west/Ice Beam Gate Room.json‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@
10371037
"requires": [
10381038
"h_artificialMorphMovement",
10391039
{"or": [
1040-
"canTrickyJump",
1040+
"canTrickyDodgeEnemies",
10411041
{"and": [
10421042
"h_artificialMorphPowerBomb",
10431043
"h_artificialMorphPowerBomb"
@@ -1050,7 +1050,7 @@
10501050
"flashSuitChecked": true,
10511051
"note": [
10521052
"It is tricky but possible to cross the room without any damage by rolling through the room.",
1053-
"The enemies can be killed with extra Power Bombs, but without them, it's arguably easier to roll through the room without the use a Spring Ball or Bombs.",
1053+
"The enemies can be killed with extra Power Bombs, but without them, it's arguably easier to roll through the room without the use of Spring Ball or Bombs.",
10541054
"After crossing the room, use a Power Bomb then quickly exit G-Mode before it explodes in order to break the bomb and Power Bomb blocks above.",
10551055
"Without Spring Ball, it is still possible to place the Power Bomb high enough to break all the blocks above from an IBJ and still exit G-Mode before it explodes."
10561056
]
@@ -1069,18 +1069,23 @@
10691069
"h_artificialMorphMovement",
10701070
{"or": [
10711071
{"and": [
1072-
"canTrickyJump",
1073-
"h_artificialMorphSpringBall",
1074-
"h_artificialMorphPowerBomb"
1072+
"h_artificialMorphPowerBomb",
1073+
"h_additionalBomb"
1074+
]},
1075+
{"and": [
1076+
"h_artificialMorphPowerBomb",
1077+
"canInsaneJump"
10751078
]},
1079+
"canTrickyGMode",
10761080
{"enemyDamage": {"enemy": "Sm. Dessgeega", "type": "contact", "hits": 2}}
10771081
]},
10781082
"h_artificialMorphPowerBomb"
10791083
],
10801084
"clearsObstacles": ["A", "B", "C"],
10811085
"flashSuitChecked": true,
10821086
"note": [
1083-
"It is tricky but possible to cross the room without any damage by jumping over the Small Dessgeega on room entry then using a Power Bomb to kill several enemies.",
1087+
"It is tricky but possible to cross the room without any damage by utilizing Samus' i-frames on room entry.",
1088+
"jumping over the Small Dessgeega on room entry then using a Power Bomb to kill several enemies.",
10841089
"Note that crossing the room damageless is easier in indirect G-Mode.",
10851090
"After crossing the room, use a Power Bomb then quickly exit G-Mode before it explodes in order to break the bomb and Power Bomb blocks above.",
10861091
"Without Spring Ball, it is still possible to place the Power Bomb high enough to break all the blocks above from an IBJ and still exit G-Mode before it explodes."

‎region/norfair/west/Ice Beam Snake Room.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,10 @@
389389
"HiJump",
390390
"h_artificialMorphSpringBall"
391391
]},
392-
"h_artificialMorphSpringBallBombJump"
392+
{"and": [
393+
"h_artificialMorphSpringBallBombJump",
394+
"h_additionalBomb"
395+
]}
393396
]},
394397
"h_heatedGModeOffCameraDoor"
395398
],
@@ -1138,7 +1141,10 @@
11381141
"HiJump",
11391142
"h_artificialMorphSpringBall"
11401143
]},
1141-
"h_artificialMorphSpringBallBombJump"
1144+
{"and": [
1145+
"h_artificialMorphSpringBallBombJump",
1146+
"h_additionalBomb"
1147+
]}
11421148
]},
11431149
"h_heatedGModeOffCameraDoor"
11441150
],

0 commit comments

Comments
 (0)