Skip to content

Commit ff061ef

Browse files
osse101osse101
authored
Merge pull request #2145 from kjbranch/g-pink-m-2
Most of Pink Maridia G-Mode: Second Pass
2 parents 6eef5c0 + e0b796e commit ff061ef

3 files changed

Lines changed: 91 additions & 24 deletions

File tree

‎region/maridia/inner-pink/Botwoon Energy Tank Room.json‎

Lines changed: 70 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@
143143
"id": 4,
144144
"devNote": "Direct link passing below. Passage above should go 1 -> 5 -> 4."
145145
},
146-
{"id": 5}
146+
{"id": 5},
147+
{"id": 6}
147148
]
148149
},
149150
{
@@ -520,6 +521,11 @@
520521
"h_artificialMorphSpringBall",
521522
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 3}}
522523
]},
524+
{"and": [
525+
"Gravity",
526+
"h_artificialMorphSpringBall",
527+
"canTrickyDodgeEnemies"
528+
]},
523529
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 7}}
524530
]}
525531
],
@@ -604,11 +610,14 @@
604610
{"and": [
605611
"Gravity",
606612
"h_artificialMorphSpringBall",
607-
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
613+
{"or": [
614+
"canTrickyDodgeEnemies",
615+
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
616+
]}
608617
]},
609618
{"and": [
610619
"h_artificialMorphSpringBall",
611-
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 3}}
620+
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}}
612621
]},
613622
{"and": [
614623
"Gravity",
@@ -1075,8 +1084,13 @@
10751084
"HiJump"
10761085
]},
10771086
{"or": [
1078-
"canTrickyJump",
1079-
"h_artificialMorphPowerBomb"
1087+
"canInsaneJump",
1088+
{"and": [
1089+
"Gravity",
1090+
"canTrickyDodgeEnemies"
1091+
]},
1092+
"h_artificialMorphBombThings",
1093+
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
10801094
]}
10811095
]}
10821096
]}
@@ -1109,8 +1123,13 @@
11091123
"HiJump"
11101124
]},
11111125
{"or": [
1112-
"canTrickyJump",
1113-
"h_artificialMorphPowerBomb"
1126+
"canInsaneJump",
1127+
{"and": [
1128+
"Gravity",
1129+
"canTrickyDodgeEnemies"
1130+
]},
1131+
"h_artificialMorphBombThings",
1132+
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
11141133
]}
11151134
]}
11161135
]}
@@ -1239,6 +1258,28 @@
12391258
"or by the forward input being not immediately processed if Samus is still in the standing animation."
12401259
]
12411260
},
1261+
{
1262+
"link": [1, 6],
1263+
"name": "G-Mode Overload PLMs, Speed Block X-Ray Climb",
1264+
"entranceCondition": {
1265+
"comeInWithGMode": {
1266+
"mode": "any",
1267+
"morphed": false
1268+
}
1269+
},
1270+
"requires": [
1271+
"canSuitlessMaridia",
1272+
"canInsaneJump",
1273+
"canXRayClimb",
1274+
"Morph"
1275+
],
1276+
"flashSuitChecked": true,
1277+
"note": [
1278+
"Overload PLMs by touching the sand, then move through the speed blocks. Avoiding the sand pits is easier without Gravity or HiJump.",
1279+
"Exit G-mode while inside the speed blocks then X-Ray climb up."
1280+
],
1281+
"devNote": "This requires canInsaneJump even though it is not difficult, because it is not very intuitive."
1282+
},
12421283
{
12431284
"id": 45,
12441285
"link": [2, 2],
@@ -2173,6 +2214,28 @@
21732214
{"shinespark": {"frames": 5, "excessFrames": 2}}
21742215
]
21752216
},
2217+
{
2218+
"link": [4, 6],
2219+
"name": "G-Mode Overload PLMs, Speed Block X-Ray Climb",
2220+
"entranceCondition": {
2221+
"comeInWithGMode": {
2222+
"mode": "any",
2223+
"morphed": false
2224+
}
2225+
},
2226+
"requires": [
2227+
"canSuitlessMaridia",
2228+
"canInsaneJump",
2229+
"canXRayClimb",
2230+
"Morph"
2231+
],
2232+
"flashSuitChecked": true,
2233+
"note": [
2234+
"Overload PLMs by touching the sand, then move through the speed blocks. Avoiding the sand pits is easier without Gravity or HiJump.",
2235+
"Exit G-mode while inside the speed blocks then X-Ray climb up."
2236+
],
2237+
"devNote": "This requires canInsaneJump even though it is not difficult, because it is not very intuitive."
2238+
},
21762239
{
21772240
"id": 53,
21782241
"link": [4, 7],

‎region/maridia/inner-pink/Halfie Climb Room.json‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,13 +1357,23 @@
13571357
"requires": [
13581358
{"or": [
13591359
"Gravity",
1360-
"h_artificialMorphBombs",
1360+
{"and": [
1361+
"h_artificialMorphBombs",
1362+
"canInsaneJump"
1363+
]},
13611364
"h_artificialMorphPowerBomb",
1365+
{"and": [
1366+
"h_artificialMorphSpringFling",
1367+
"canTrickyGMode"
1368+
]},
13621369
{"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 1}}
13631370
]}
13641371
],
13651372
"flashSuitChecked": true,
1366-
"note": "Enter morphed and kill the Mochtroid with Bombs or a Power Bomb, or roll off the edge with Gravity to drop fast enough not to lure the Mochtroid."
1373+
"note": [
1374+
"Enter morphed and kill the Mochtroid with Bombs or a Power Bomb, or roll off the edge with Gravity to drop fast enough not to lure the Mochtroid.",
1375+
"It is also possible to Spring Fling by jumping from the ground immediately before the pause fully triggers to move right fast enough to avoid a hit."
1376+
]
13671377
},
13681378
{
13691379
"id": 37,
@@ -4144,8 +4154,6 @@
41444154
{"or": [
41454155
"canTrickyDodgeEnemies",
41464156
"Gravity",
4147-
"h_artificialMorphBombs",
4148-
"h_artificialMorphPowerBomb",
41494157
{"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 1}}
41504158
]}
41514159
],
@@ -4197,6 +4205,7 @@
41974205
"link": [5, 4],
41984206
"name": "G-Mode Morph, Long Blind IBJ",
41994207
"requires": [
4208+
"canEnterGMode",
42004209
"Gravity",
42014210
"h_artificialMorphLongIBJ",
42024211
"canOffScreenMovement"
@@ -4208,17 +4217,19 @@
42084217
"link": [5, 4],
42094218
"name": "G-Mode Morph, Gravity Jump, Spring Ball Jump",
42104219
"requires": [
4220+
"canEnterGMode",
42114221
"canGravityJump",
42124222
"HiJump",
42134223
{"tech": "canSpringBallJumpMidAir"},
42144224
"h_artificialMorphSpringBall",
4215-
"canTrickyJump"
4225+
"canInsaneJump"
42164226
],
42174227
"flashSuitChecked": true,
42184228
"note": [
4219-
"Climb the room with a Gravity jump + Spring Ball jump. Turn off Spring Ball and Gravity at the same time, then repause and turn Spring back on.",
4229+
"Climb the room with a Gravity jump + Spring Ball jump. Turn off Spring Ball and Gravity at the same time, then repause after a short delay and turn Spring back on.",
42204230
"If coming from the right, Samus will be off camera."
4221-
]
4231+
],
4232+
"devNote": "This requires canInsaneJump even though it is not very difficult, because it is not very intuitive and may be off camera."
42224233
},
42234234
{
42244235
"id": 199,

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -713,17 +713,10 @@
713713
}
714714
},
715715
"requires": [
716-
"h_artificialMorphDoubleSpringBallJump",
717-
{"or": [
718-
"h_artificialMorphPowerBomb",
719-
{"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 2}},
720-
{"and": [
721-
"canInsaneJump",
722-
{"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}}
723-
]}
724-
]}
716+
"h_artificialMorphDoubleSpringBallJump"
725717
],
726-
"flashSuitChecked": true
718+
"flashSuitChecked": true,
719+
"note": "Be careful to avoid the stationary, invisible Cacatac spikes."
727720
},
728721
{
729722
"id": 51,

0 commit comments

Comments
 (0)