Skip to content

Commit 1b1c3e7

Browse files
osse101osse101
authored
Merge pull request #1997 from kjbranch/g-crateria-2
G-Mode, Second Pass: Crateria East and West
2 parents 710bd29 + a489ee8 commit 1b1c3e7

4 files changed

Lines changed: 146 additions & 79 deletions

File tree

‎region/crateria/east/West Ocean.json‎

Lines changed: 30 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
[2, 1, 1, 1, 1, 1, 1, 1],
281281
[1, 1, 1, 1, 1, 1, 1, 1]
282282
],
283-
"note": "Represents being at the Moat door with G-Mode and morph or artificial morph"
283+
"note": "Represents being at the left door with G-Mode and morph or artificial morph"
284284
},
285285
{
286286
"id": 16,
@@ -295,7 +295,7 @@
295295
[2, 1, 1, 1, 1, 1, 1, 1],
296296
[1, 1, 1, 1, 1, 1, 1, 1]
297297
],
298-
"note": "Represents being at the Moat door with G-Mode, PLMs overloaded, and morph or artificial morph"
298+
"note": "Represents being at the left door with G-Mode, PLMs overloaded, and morph or artificial morph"
299299
},
300300
{
301301
"id": 17,
@@ -310,7 +310,7 @@
310310
[2, 1, 1, 1, 1, 1, 1, 1],
311311
[1, 1, 1, 1, 1, 1, 1, 1]
312312
],
313-
"note": "Represents being at the Moat door with G-Mode and morph or artificial morph, in direct G-Mode"
313+
"note": "Represents being at the left door with G-Mode and morph or artificial morph, in direct G-Mode"
314314
}
315315
],
316316
"obstacles": [
@@ -504,7 +504,7 @@
504504
{
505505
"from": 17,
506506
"to": [
507-
{"id": 10},
507+
{"id": 1},
508508
{"id": 16}
509509
]
510510
}
@@ -1532,14 +1532,7 @@
15321532
"Gravity",
15331533
"h_canArtificialMorphIBJ"
15341534
]},
1535-
{"and": [
1536-
"h_canArtificialMorphSpringBall",
1537-
{"or": [
1538-
"Gravity",
1539-
"HiJump",
1540-
"canCarefulJump"
1541-
]}
1542-
]},
1535+
"h_canArtificialMorphSpringBall",
15431536
"h_canArtificialMorphHBJ",
15441537
"h_canArtificialMorphDiagonalBombJump"
15451538
]}
@@ -1563,14 +1556,7 @@
15631556
"Gravity",
15641557
"h_canArtificialMorphIBJ"
15651558
]},
1566-
{"and": [
1567-
"h_canArtificialMorphSpringBall",
1568-
{"or": [
1569-
"Gravity",
1570-
"HiJump",
1571-
"canCarefulJump"
1572-
]}
1573-
]},
1559+
"h_canArtificialMorphSpringBall",
15741560
"h_canArtificialMorphHBJ",
15751561
"h_canArtificialMorphDiagonalBombJump"
15761562
]}
@@ -1955,14 +1941,7 @@
19551941
"Gravity",
19561942
"h_canArtificialMorphIBJ"
19571943
]},
1958-
{"and": [
1959-
"h_canArtificialMorphSpringBall",
1960-
{"or": [
1961-
"Gravity",
1962-
"HiJump",
1963-
"canCarefulJump"
1964-
]}
1965-
]},
1944+
"h_canArtificialMorphSpringBall",
19661945
"h_canArtificialMorphHBJ",
19671946
"h_canArtificialMorphDiagonalBombJump"
19681947
]}
@@ -1986,14 +1965,7 @@
19861965
"Gravity",
19871966
"h_canArtificialMorphIBJ"
19881967
]},
1989-
{"and": [
1990-
"h_canArtificialMorphSpringBall",
1991-
{"or": [
1992-
"Gravity",
1993-
"HiJump",
1994-
"canCarefulJump"
1995-
]}
1996-
]},
1968+
"h_canArtificialMorphSpringBall",
19971969
"h_canArtificialMorphHBJ",
19981970
"h_canArtificialMorphDiagonalBombJump"
19991971
]}
@@ -2223,33 +2195,23 @@
22232195
"requires": [
22242196
"canXRayStandUp",
22252197
"canPartialFloorClip",
2198+
"canInsaneJump",
22262199
"canDownGrab",
22272200
{"or": [
22282201
"h_canArtificialMorphSpringBall",
2229-
{"and": [
2230-
"h_canArtificialMorphBombs",
2231-
{"or": [
2232-
"canTrickyJump",
2233-
{"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
2234-
]}
2235-
]},
22362202
{"and": [
22372203
"h_canArtificialMorphBombHorizontally",
2238-
{"or": [
2239-
{"and": [
2240-
"canTrickyJump",
2241-
"h_canArtificialMorphPowerBomb"
2242-
]},
2243-
{"and": [
2244-
"canNeutralDamageBoost",
2245-
{"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 3}}
2246-
]}
2247-
]}
2204+
"h_additionalBomb"
22482205
]}
22492206
]}
22502207
],
22512208
"flashSuitChecked": true,
2252-
"note": "Unmorph and cancel g-mode, shoot the shot block, then x-ray standup, partial floor clip, and down grab to the ledge. Wiggle to escape."
2209+
"note": [
2210+
"It is possible to bomb boost from the door runway over the Zeb and onto the first step.",
2211+
"Without doing this, the Zeb will likely touch Samus, as it will start moving if Samus goes down a single step.",
2212+
"At the left end of the tunnel, roll against the lower left corner, exit G-mode, and X-Ray standup, shoot the block, partial floor clip, then jump and down grab to the ledge.",
2213+
"Wiggle to escape. A failed jump will result in a forced crouch, which is likely a soft lock."
2214+
]
22532215
},
22542216
{
22552217
"id": 87,
@@ -2935,10 +2897,7 @@
29352897
"canEnterGMode",
29362898
"h_canUseMorphBombs",
29372899
"SpaceJump",
2938-
{"or": [
2939-
"canCeilingBombJump",
2940-
"canBeVeryPatient"
2941-
]}
2900+
"canBeVeryPatient"
29422901
],
29432902
"flashSuitChecked": true,
29442903
"note": "The crumble block is the leftmost flat ceiling tile."
@@ -2979,12 +2938,11 @@
29792938
},
29802939
{
29812940
"id": 134,
2982-
"link": [17, 10],
2983-
"name": "G-mode Overload PLMs by PBing Missile Item",
2941+
"link": [17, 1],
2942+
"name": "G-mode Overload PLMs by Power Bombing Morph Maze Item",
29842943
"requires": [
2985-
{"notable": "G-mode Overload PLMs by PBing Missile Item"},
2944+
{"notable": "G-mode Overload PLMs by Power Bombing Morph Maze Item"},
29862945
"canEnterGMode",
2987-
{"itemNotCollectedAtNode": 10},
29882946
"h_canUsePowerBombs",
29892947
{"or": [
29902948
"SpaceJump",
@@ -2996,20 +2954,20 @@
29962954
]}
29972955
]}
29982956
],
2999-
"clearsObstacles": ["B"],
2957+
"collectsItems": [10],
30002958
"flashSuitChecked": true,
30012959
"note": [
3002-
"To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the door to the Moat.",
3003-
"This is at the max jump height without HiJump. Placing the PB higher or lower will not overload the PLMs without many PBs."
2960+
"To overload the PLMs, place a Power Bomb precisely to the right of the bottom of the second overhang above the bottom left door.",
2961+
"This is at the max jump height without HiJump. Placing the Power Bomb higher or lower will not overload the PLMs without many Power Bombs."
30042962
],
3005-
"devNote": "This link is used to get the item and return, so there is no canRiskPermanentLossOfAccess."
2963+
"devNote": "This requires the item to not be collected, but there is no reason to do this without it being there, so there is no canRiskPermanentLossOfAccess."
30062964
},
30072965
{
30082966
"id": 135,
30092967
"link": [17, 16],
3010-
"name": "G-mode Overload PLMs by PBing Missile Item Softlock Risk",
2968+
"name": "G-mode Overload PLMs by Power Bombing Morph Maze Item, Permanent Softlock Risk",
30112969
"requires": [
3012-
{"notable": "G-mode Overload PLMs by PBing Missile Item"},
2970+
{"notable": "G-mode Overload PLMs by Power Bombing Morph Maze Item"},
30132971
"canEnterGMode",
30142972
{"itemNotCollectedAtNode": 10},
30152973
"canRiskPermanentLossOfAccess",
@@ -3028,8 +2986,8 @@
30282986
],
30292987
"flashSuitChecked": true,
30302988
"note": [
3031-
"To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the door to the Moat.",
3032-
"This is at the max jump height without HiJump. Placing the PB higher or lower will not overload the PLMs without many PBs."
2989+
"To overload the PLMs, place a Power Bomb precisely to the right of the bottom of the second overhang above the bottom left door.",
2990+
"This is at the max jump height without HiJump. Placing the Power Bomb higher or lower will not overload the PLMs without many Power Bombs."
30332991
]
30342992
}
30352993
],
@@ -3136,9 +3094,9 @@
31363094
},
31373095
{
31383096
"id": 12,
3139-
"name": "G-mode Overload PLMs by PBing Missile Item",
3097+
"name": "G-mode Overload PLMs by Power Bombing Morph Maze Item",
31403098
"note": [
3141-
"To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the door to the Moat.",
3099+
"To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the bottom left door.",
31423100
"This is at the max jump height without HiJump. Placing the PB higher or lower will not overload the PLMs without many PBs."
31433101
]
31443102
},

‎region/crateria/west/Gauntlet Energy Tank Room.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,38 @@
825825
"Use Spring Ball to bounce through the morph tunnel at the beginning, and across the final stretch at the end."
826826
]
827827
},
828+
{
829+
"link": [2, 1],
830+
"name": "G-Mode Morph, Overload PLMs with the Item, Blind Movement",
831+
"entranceCondition": {
832+
"comeInWithGMode": {
833+
"mode": "direct",
834+
"morphed": true
835+
}
836+
},
837+
"requires": [
838+
{"itemNotCollectedAtNode": 3},
839+
"canRiskPermanentLossOfAccess",
840+
"h_canArtificialMorphMovement",
841+
"canInsaneJump",
842+
"canOffScreenMovement",
843+
"SpaceJump",
844+
"ScrewAttack"
845+
],
846+
"exitCondition": {
847+
"leaveNormally": {}
848+
},
849+
"unlocksDoors": [
850+
{"types": ["ammo"], "requires": []}
851+
],
852+
"collectsItems": [3],
853+
"flashSuitChecked": true,
854+
"note": [
855+
"Roll through the item to overload PLMs then quickly fall into the morph tunnel, unmorph at the correct spot and jump out before the acid touches Samus.",
856+
"With a careful, blind, Space Jump with Screw Attack, move through the bomb walls while avoiding the spikes."
857+
],
858+
"devNote": "This strat leaves the room, as it would be unreasonable and may not be possible to do anything at 1 with the broken camera movement."
859+
},
828860
{
829861
"id": 29,
830862
"link": [2, 2],
@@ -946,6 +978,33 @@
946978
"Moonfall against the Chozo statue to clip into the Morph Tunnel, past the Bomb block."
947979
]
948980
},
981+
{
982+
"link": [2, 4],
983+
"name": "G-Mode, Overload PLMs with the Item, Fix Camera",
984+
"entranceCondition": {
985+
"comeInWithGMode": {
986+
"mode": "direct",
987+
"morphed": true
988+
}
989+
},
990+
"requires": [
991+
{"itemNotCollectedAtNode": 3},
992+
"canRiskPermanentLossOfAccess",
993+
"Morph",
994+
"canInsaneJump",
995+
"canOffScreenMovement"
996+
],
997+
"collectsItems": [3],
998+
"flashSuitChecked": true,
999+
"note": [
1000+
"Roll through the item to overload PLMs then fall into the morph tunnel, unmorph at the correct spot and quickly jump out before the acid touches Samus.",
1001+
"Exit G-mode and roll back into the tunnel to fix the camera and return avoiding the acid again."
1002+
],
1003+
"devNote": [
1004+
"Acid damage wasn't considered, as Samus needs to be in direct G-mode",
1005+
"FIXME: This could be done with a CF after overloading PLMs with the item."
1006+
]
1007+
},
9491008
{
9501009
"id": 37,
9511010
"link": [3, 1],

0 commit comments

Comments
 (0)