Skip to content

Commit ef41798

Browse files
osse101osse101
authored
Merge pull request #2129 from kjbranch/g-ws
G-Mode, Yellow Green Maridia: Second Pass
2 parents e1986d3 + 13fb616 commit ef41798

13 files changed

Lines changed: 291 additions & 119 deletions

‎region/maridia/inner-green/East Sand Hall.json‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,14 +414,15 @@
414414
},
415415
"requires": [
416416
"canSuitlessMaridia",
417+
"h_crouchJumpDownGrab",
417418
"canInsaneJump"
418419
],
419420
"flashSuitChecked": true,
420421
"note": [
421422
"The sand does not impede Samus in G-Mode.",
422423
"Carefully jump over the first two Evirs. Crouch against the pillar and wait a brief moment before jumping and down grabbing onto it.",
423424
"Lure the third Evir's projectile by jumping then crouch jump and down grab the second pillar.",
424-
"Getting onto the final pillar is the hardest pard, which requires a subpixel precise jump.",
425+
"Getting onto the final pillar is the hardest part, which requires a subpixel precise jump.",
425426
"Carefully lure the Evir projectile while getting into position, one pixel from the right edge.",
426427
"Stand and spinjump to the right. Note that running before jumping doesn't help."
427428
]
@@ -1124,14 +1125,21 @@
11241125
},
11251126
"requires": [
11261127
"h_navigateUnderwater",
1128+
{"or": [
1129+
"canInsaneJump",
1130+
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
1131+
]},
11271132
{"or": [
11281133
"Gravity",
11291134
"HiJump",
11301135
"canSpringBallJumpMidAir"
11311136
]}
11321137
],
11331138
"flashSuitChecked": true,
1134-
"note": "The sand does not impede Samus in G-Mode.",
1139+
"note": [
1140+
"The sand does not impede Samus in G-Mode.",
1141+
"Enter the room on the right half of the transition, where both Evirs will be off camera to avoid their projectiles."
1142+
],
11351143
"devNote": "Only the last jump needs any items."
11361144
},
11371145
{
@@ -1147,16 +1155,24 @@
11471155
},
11481156
"requires": [
11491157
"h_navigateUnderwater",
1158+
{"or": [
1159+
"canInsaneJump",
1160+
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
1161+
]},
11501162
{"or": [
11511163
"Gravity",
11521164
"HiJump",
11531165
"canSpringBallJumpMidAir",
1154-
"canTrickyJump"
1166+
{"and": [
1167+
"h_crouchJumpDownGrab",
1168+
"canInsaneJump"
1169+
]}
11551170
]}
11561171
],
11571172
"flashSuitChecked": true,
11581173
"note": [
11591174
"The sand does not impede Samus in G-Mode.",
1175+
"Enter the room on the right half of the transition, where both Evirs will be off camera to avoid their projectiles.",
11601176
"It is possible to jump to the tall pillar with nothing, requiring a subpixel precise jump.",
11611177
"Running before jumping doesn't help. Stand one pixel from the right edge and spinjump to the right."
11621178
]

‎region/maridia/inner-green/Oasis.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,6 +2156,33 @@
21562156
"bypassesDoorShell": "free",
21572157
"flashSuitChecked": true
21582158
},
2159+
{
2160+
"link": [3, 3],
2161+
"name": "Carry G-Mode Back Up, Bomb Into Spring Ball Jump",
2162+
"entranceCondition": {
2163+
"comeInWithGMode": {
2164+
"mode": "direct",
2165+
"morphed": true
2166+
},
2167+
"comesThroughToilet": "any"
2168+
},
2169+
"requires": [
2170+
"h_artificialMorphUnderwaterBombIntoSpringBallJump"
2171+
],
2172+
"exitCondition": {
2173+
"leaveWithGMode": {
2174+
"morphed": false
2175+
}
2176+
},
2177+
"bypassesDoorShell": "free",
2178+
"flashSuitChecked": true,
2179+
"note": [
2180+
"Pause and jump just before the fade out finishes. Turn off Spring Ball and place a Bomb just above where Samus' head would be if standing.",
2181+
"Pause again between 23-25 frames later and equip Spring Ball; Samus has a three frame window where she has upward momentum from the Bomb and can jump again.",
2182+
"The positioning of the Bomb is quite lenient, with an 11 frame window for where it can be placed.",
2183+
"Unmorph at the top of the jump to touch the transition blocks."
2184+
]
2185+
},
21592186
{
21602187
"id": 50,
21612188
"link": [3, 4],

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,7 @@
651651
{"or": [
652652
{"ammo": {"type": "Super", "count": 1}},
653653
{"and": [
654+
"canTrickyGMode",
654655
"canSpecialBeamAttack",
655656
{"ammo": {"type": "PowerBomb", "count": 1}}
656657
]}

‎region/maridia/inner-green/West Sand Hall.json‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -293,14 +293,14 @@
293293
"requires": [
294294
"h_navigateUnderwater",
295295
{"or": [
296-
"canCarefulJump",
296+
"canTrickyDodgeEnemies",
297297
"h_crouchJumpDownGrab",
298298
"HiJump",
299299
"Gravity",
300300
"canSpringBallJumpMidAir"
301301
]},
302302
{"or": [
303-
"canCarefulJump",
303+
"canTrickyDodgeEnemies",
304304
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
305305
]}
306306
],
@@ -559,8 +559,7 @@
559559
}
560560
},
561561
"requires": [
562-
"h_navigateUnderwater",
563-
"canCarefulJump"
562+
"h_navigateUnderwater"
564563
],
565564
"flashSuitChecked": true
566565
},
@@ -765,18 +764,18 @@
765764
"requires": [
766765
"h_navigateUnderwater",
767766
{"or": [
768-
"canCarefulJump",
769767
"h_crouchJumpDownGrab",
770768
"HiJump",
771769
"Gravity",
772770
"canSpringBallJumpMidAir"
773771
]},
774772
{"or": [
775-
"canCarefulJump",
773+
"canInsaneJump",
776774
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
777775
]}
778776
],
779-
"flashSuitChecked": true
777+
"flashSuitChecked": true,
778+
"note": "Dodging the Evirs can be tricky. Enter on the far right side, facing left, and hold left on entry to dodge them reliably."
780779
},
781780
{
782781
"id": 39,
@@ -790,9 +789,20 @@
790789
"comesThroughToilet": "any"
791790
},
792791
"requires": [
793-
"h_navigateUnderwater"
792+
"h_navigateUnderwater",
793+
{"or": [
794+
"h_crouchJumpDownGrab",
795+
"HiJump",
796+
"Gravity",
797+
"canSpringBallJumpMidAir"
798+
]},
799+
{"or": [
800+
"canInsaneJump",
801+
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
802+
]}
794803
],
795-
"flashSuitChecked": true
804+
"flashSuitChecked": true,
805+
"note": "Dodging the Evirs can be tricky. Enter on the far right side, facing left, and hold left on entry to dodge them reliably."
796806
},
797807
{
798808
"id": 40,

‎region/maridia/inner-pink/Botwoon Quicksand Room.json‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@
146146
"morphed": false
147147
}
148148
},
149-
"flashSuitChecked": true
149+
"flashSuitChecked": true,
150+
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
150151
},
151152
{
152153
"id": 4,
@@ -165,7 +166,8 @@
165166
"morphed": true
166167
}
167168
},
168-
"flashSuitChecked": true
169+
"flashSuitChecked": true,
170+
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
169171
},
170172
{
171173
"id": 5,
@@ -179,17 +181,32 @@
179181
"comesThroughToilet": "any"
180182
},
181183
"requires": [
184+
"canInsaneJump",
182185
{"or": [
183186
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}},
184-
"h_artificialMorphPowerBomb"
187+
{"and": [
188+
"h_artificialMorphPowerBomb",
189+
{"or": [
190+
"h_additionalBomb",
191+
"h_artificialMorphMovement"
192+
]}
193+
]}
185194
]}
186195
],
187196
"exitCondition": {
188197
"leaveWithGMode": {
189198
"morphed": true
190199
}
191200
},
192-
"flashSuitChecked": true
201+
"flashSuitChecked": true,
202+
"note": [
203+
"Enter the room on the right side and land on the ledge just below the hidden tunnel then Power Bomb boost to get into the tunnel and kil the Bulls.",
204+
"Alternatively, enter the room near the right with a bit of right momentum and land directly in the tunnel while taking a Bull hit."
205+
],
206+
"devNote": [
207+
"This room does not have water, so Samus can be boosted by bomb boosts without Gravity after PLMs are overloaded.",
208+
"It is possible to do this with 1 Power Bomb, but it is very precise and significantly depends on room entry."
209+
]
193210
},
194211
{
195212
"id": 6,
@@ -241,17 +258,32 @@
241258
"comesThroughToilet": "any"
242259
},
243260
"requires": [
261+
"canInsaneJump",
244262
{"or": [
245263
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}},
246-
"h_artificialMorphPowerBomb"
264+
{"and": [
265+
"h_artificialMorphPowerBomb",
266+
{"or": [
267+
"h_additionalBomb",
268+
"h_artificialMorphMovement"
269+
]}
270+
]}
247271
]}
248272
],
249273
"exitCondition": {
250274
"leaveWithGMode": {
251275
"morphed": true
252276
}
253277
},
254-
"flashSuitChecked": true
278+
"flashSuitChecked": true,
279+
"note": [
280+
"Enter the room on the left side and land on the ledge just below the hidden tunnel then Power Bomb boost to get into the tunnel and kil the Bulls.",
281+
"Alternatively, enter the room near the left with a bit of left momentum and land directly in the tunnel while taking a Bull hit."
282+
],
283+
"devNote": [
284+
"This room does not have water, so Samus can be boosted by bomb boosts without Gravity after PLMs are overloaded.",
285+
"It is possible to do this with 1 Power Bomb, but it is very precise and significantly depends on room entry."
286+
]
255287
},
256288
{
257289
"id": 10,
@@ -286,7 +318,8 @@
286318
"morphed": false
287319
}
288320
},
289-
"flashSuitChecked": true
321+
"flashSuitChecked": true,
322+
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
290323
},
291324
{
292325
"id": 13,
@@ -305,7 +338,8 @@
305338
"morphed": true
306339
}
307340
},
308-
"flashSuitChecked": true
341+
"flashSuitChecked": true,
342+
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
309343
},
310344
{
311345
"id": 14,

‎region/maridia/inner-pink/East Aqueduct Quicksand Room.json‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,19 @@
9999
},
100100
"comesThroughToilet": "any"
101101
},
102-
"requires": [],
102+
"requires": [
103+
{"or": [
104+
"canTrickyDodgeEnemies",
105+
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
106+
]}
107+
],
103108
"exitCondition": {
104109
"leaveWithGMode": {
105110
"morphed": false
106111
}
107112
},
108-
"flashSuitChecked": true
113+
"flashSuitChecked": true,
114+
"note": "Samus will fall quickly. Fall through the room slightly left of center to avoid the Bulls."
109115
},
110116
{
111117
"id": 5,
@@ -118,13 +124,19 @@
118124
},
119125
"comesThroughToilet": "any"
120126
},
121-
"requires": [],
127+
"requires": [
128+
{"or": [
129+
"canTrickyDodgeEnemies",
130+
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
131+
]}
132+
],
122133
"exitCondition": {
123134
"leaveWithGMode": {
124135
"morphed": true
125136
}
126137
},
127-
"flashSuitChecked": true
138+
"flashSuitChecked": true,
139+
"note": "Samus will fall quickly. Fall through the room slightly left of center to avoid the Bulls."
128140
},
129141
{
130142
"id": 6,

‎region/maridia/inner-pink/West Aqueduct Quicksand Room.json‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,19 @@
9999
},
100100
"comesThroughToilet": "any"
101101
},
102-
"requires": [],
102+
"requires": [
103+
{"or": [
104+
"canTrickyDodgeEnemies",
105+
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
106+
]}
107+
],
103108
"exitCondition": {
104109
"leaveWithGMode": {
105110
"morphed": false
106111
}
107112
},
108-
"flashSuitChecked": true
113+
"flashSuitChecked": true,
114+
"note": "Samus will fall quickly. Fall through the room slightly right of center to avoid the Bulls."
109115
},
110116
{
111117
"id": 5,
@@ -118,13 +124,19 @@
118124
},
119125
"comesThroughToilet": "any"
120126
},
121-
"requires": [],
127+
"requires": [
128+
{"or": [
129+
"canTrickyDodgeEnemies",
130+
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
131+
]}
132+
],
122133
"exitCondition": {
123134
"leaveWithGMode": {
124135
"morphed": true
125136
}
126137
},
127-
"flashSuitChecked": true
138+
"flashSuitChecked": true,
139+
"note": "Samus will fall quickly. Fall through the room slightly right of center to avoid the Bulls."
128140
},
129141
{
130142
"id": 6,

0 commit comments

Comments
 (0)