Skip to content

Commit d6d6c3f

Browse files
osse101osse101
authored
Merge pull request #1810 from kjbranch/gate-obstacles
Add Obstacles for Gates: Boyon Gate, Green Hills
2 parents 5117197 + e84d740 commit d6d6c3f

4 files changed

Lines changed: 94 additions & 20 deletions

File tree

‎region/brinstar/green/Green Hill Zone.json‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"id": "A",
5656
"name": "G-Mode Morph - Remote Acquire the item",
5757
"obstacleType": "abstract"
58+
},
59+
{
60+
"id": "B",
61+
"name": "Blue Gate",
62+
"obstacleType": "inanimate"
5863
}
5964
],
6065
"enemies": [
@@ -165,6 +170,13 @@
165170
},
166171
"flashSuitChecked": true
167172
},
173+
{
174+
"link": [1, 1],
175+
"name": "Open Blue Gate",
176+
"requires": [],
177+
"clearsObstacles": ["B"],
178+
"flashSuitChecked": true
179+
},
168180
{
169181
"id": 2,
170182
"link": [1, 1],
@@ -871,10 +883,14 @@
871883
{
872884
"id": 46,
873885
"link": [3, 1],
874-
"name": "Wave",
886+
"name": "Base",
875887
"requires": [
876-
"Wave"
888+
{"or": [
889+
"Wave",
890+
{"obstaclesCleared": ["B"]}
891+
]}
877892
],
893+
"clearsObstacles": ["B"],
878894
"flashSuitChecked": true
879895
},
880896
{
@@ -884,6 +900,7 @@
884900
"requires": [
885901
"h_canBlueGateGlitch"
886902
],
903+
"clearsObstacles": ["B"],
887904
"flashSuitChecked": true
888905
},
889906
{
@@ -896,6 +913,7 @@
896913
"SpeedBooster",
897914
"canTrickyJump"
898915
],
916+
"clearsObstacles": ["B"],
899917
"note": [
900918
"Build up some run speed and then extend the Grapple Beam through the Blue Gate, while jumping, to open it from the wrong side."
901919
]

‎region/brinstar/roomDiagrams/green_GreenHillZone_54.png‎

209 Bytes
Loading

‎region/maridia/outer/Boyon Gate Hall.json‎

Lines changed: 74 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@
4141
"nodeSubType": "junction"
4242
}
4343
],
44+
"obstacles": [
45+
{
46+
"id": "A",
47+
"name": "Green Gate",
48+
"obstacleType": "inanimate"
49+
}
50+
],
4451
"enemies": [
4552
{
4653
"id": "e1",
@@ -112,6 +119,7 @@
112119
"from": 4,
113120
"to": [
114121
{"id": 1},
122+
{"id": 3},
115123
{"id": 4}
116124
]
117125
}
@@ -246,7 +254,7 @@
246254
{
247255
"id": 9,
248256
"link": [1, 3],
249-
"name": "Indirect G-Mode Morph Despawn Gate",
257+
"name": "Indirect G-Mode Morph Despawn Gate, Open Gate",
250258
"entranceCondition": {
251259
"comeInWithGMode": {
252260
"mode": "indirect",
@@ -257,13 +265,21 @@
257265
"h_canArtificialMorphIBJ",
258266
"canOffScreenMovement"
259267
],
268+
"clearsObstacles": ["A"],
260269
"flashSuitChecked": true,
261-
"note": "The gate will not spawn in indirect g-mode and is freely passable."
270+
"note": [
271+
"The gate will not spawn in indirect G-mode and is freely passable.",
272+
"It is possible to exit G-Mode while under the gate to open it without a Super.",
273+
"A normalized method to do this, is to jump into the right-most pit before the gate, Samus will barely be visible behind the bottom right door.",
274+
"Jump and land on the corner and face left, moonwalk to the right with no beams equipped and stop moving immediately as the 11th shot fired is heard.",
275+
"To fix the camera afterwards, go to the left end of the room and fall back to the bottom of the room.",
276+
"Alternatively, get into the left-most pit, jump slightly to the right, move over one tile, then jump. If the camera is not fixed, move to the right a bit more and jump again."
277+
]
262278
},
263279
{
264280
"id": 10,
265281
"link": [1, 3],
266-
"name": "Indirect G-Mode Despawn Gate",
282+
"name": "Indirect G-Mode Despawn Gate, Open Gate",
267283
"entranceCondition": {
268284
"comeInWithGMode": {
269285
"mode": "indirect",
@@ -281,8 +297,16 @@
281297
]},
282298
"canOffScreenMovement"
283299
],
300+
"clearsObstacles": ["A"],
284301
"flashSuitChecked": true,
285-
"note": "The gate will not spawn in indirect g-mode and is freely passable."
302+
"note": [
303+
"The gate will not spawn in indirect G-mode and is freely passable.",
304+
"It is possible to exit G-Mode while under the gate to open it without a Super.",
305+
"A normalized method to do this, is to jump into the right-most pit before the gate, Samus will barely be visible behind the bottom right door.",
306+
"Jump and land on the corner and face left, moonwalk to the right with no beams equipped and stop moving immediately as the 11th shot fired is heard.",
307+
"To fix the camera afterwards, go to the left end of the room and fall back to the bottom of the room.",
308+
"Alternatively, get into the left-most pit, jump slightly to the right, move over one tile, then jump. If the camera is not fixed, move to the right a bit more and jump again."
309+
]
286310
},
287311
{
288312
"id": 11,
@@ -579,7 +603,7 @@
579603
{
580604
"id": 29,
581605
"link": [2, 3],
582-
"name": "Indirect G-Mode Morph Despawn Gate",
606+
"name": "Indirect G-Mode Morph Despawn Gate, Open Gate",
583607
"entranceCondition": {
584608
"comeInWithGMode": {
585609
"mode": "indirect",
@@ -590,13 +614,21 @@
590614
"h_canArtificialMorphIBJ",
591615
"canOffScreenMovement"
592616
],
617+
"clearsObstacles": ["A"],
593618
"flashSuitChecked": true,
594-
"note": "The gate will not spawn in indirect g-mode and is freely passable."
619+
"note": [
620+
"The gate will not spawn in indirect G-mode and is freely passable.",
621+
"It is possible to exit G-Mode while under the gate to open it without a Super.",
622+
"A normalized method to do this, is to jump into the right-most pit before the gate, Samus will barely be visible behind the bottom right door.",
623+
"Jump and land on the corner and face left, moonwalk to the right with no beams equipped and stop moving immediately as the 11th shot fired is heard.",
624+
"To fix the camera afterwards, go to the left end of the room and fall back to the bottom of the room.",
625+
"Alternatively, get into the left-most pit, jump slightly to the right, move over one tile, then jump. If the camera is not fixed, move to the right a bit more and jump again."
626+
]
595627
},
596628
{
597629
"id": 30,
598630
"link": [2, 3],
599-
"name": "Indirect G-Mode Despawn Gate",
631+
"name": "Indirect G-Mode Despawn Gate, Open Gate",
600632
"entranceCondition": {
601633
"comeInWithGMode": {
602634
"mode": "indirect",
@@ -614,8 +646,16 @@
614646
]},
615647
"canOffScreenMovement"
616648
],
649+
"clearsObstacles": ["A"],
617650
"flashSuitChecked": true,
618-
"note": "The gate will not spawn in indirect g-mode and is freely passable."
651+
"note": [
652+
"The gate will not spawn in indirect G-mode and is freely passable.",
653+
"It is possible to exit G-Mode while under the gate to open it without a Super.",
654+
"A normalized method to do this, is to jump into the right-most pit before the gate, Samus will barely be visible behind the bottom right door.",
655+
"Jump and land on the corner and face left, moonwalk to the right with no beams equipped and stop moving immediately as the 11th shot fired is heard.",
656+
"To fix the camera afterwards, go to the left end of the room and fall back to the bottom of the room.",
657+
"Alternatively, get into the left-most pit, jump slightly to the right, move over one tile, then jump. If the camera is not fixed, move to the right a bit more and jump again."
658+
]
619659
},
620660
{
621661
"id": 31,
@@ -812,7 +852,7 @@
812852
"link": [3, 3],
813853
"name": "Leave Spinning (Space Jump, Gate Open)",
814854
"requires": [
815-
{"ammo": {"type": "Super", "count": 1}},
855+
{"obstaclesCleared": ["A"]},
816856
"SpaceJump",
817857
"canTrickyJump"
818858
],
@@ -830,7 +870,7 @@
830870
"link": [3, 3],
831871
"name": "Leave With Mockball (Space Jump, Gate Open)",
832872
"requires": [
833-
{"ammo": {"type": "Super", "count": 1}},
873+
{"obstaclesCleared": ["A"]},
834874
"SpaceJump",
835875
"canTrickyJump"
836876
],
@@ -852,7 +892,7 @@
852892
"link": [3, 3],
853893
"name": "Leave With Controlled Spring Ball Bounce (Gate Open)",
854894
"requires": [
855-
{"ammo": {"type": "Super", "count": 1}},
895+
{"obstaclesCleared": ["A"]},
856896
"canTrickySpringBallBounce"
857897
],
858898
"exitCondition": {
@@ -876,7 +916,7 @@
876916
"link": [3, 3],
877917
"name": "Leave With Spring Ball Bounce (Space Jump, Gate Open)",
878918
"requires": [
879-
{"ammo": {"type": "Super", "count": 1}},
919+
{"obstaclesCleared": ["A"]},
880920
"canPreciseSpaceJump"
881921
],
882922
"exitCondition": {
@@ -898,7 +938,7 @@
898938
"link": [3, 3],
899939
"name": "Leave Space Jumping (Gate Open)",
900940
"requires": [
901-
{"ammo": {"type": "Super", "count": 1}},
941+
{"obstaclesCleared": ["A"]},
902942
"canPreciseSpaceJump"
903943
],
904944
"exitCondition": {
@@ -915,7 +955,7 @@
915955
"link": [3, 3],
916956
"name": "Leave With Temporary Blue",
917957
"requires": [
918-
{"ammo": {"type": "Super", "count": 1}},
958+
{"obstaclesCleared": ["A"]},
919959
{"getBlueSpeed": {"usedTiles": 15, "openEnd": 2}},
920960
"canLongChainTemporaryBlue"
921961
],
@@ -947,22 +987,30 @@
947987
"link": [3, 4],
948988
"name": "Base",
949989
"requires": [
950-
{"ammo": {"type": "Super", "count": 1}}
951-
]
990+
{"or": [
991+
{"ammo": {"type": "Super", "count": 1}},
992+
{"obstaclesCleared": ["A"]}
993+
]}
994+
],
995+
"clearsObstacles": ["A"]
952996
},
953997
{
954998
"id": 52,
955999
"link": [3, 4],
956-
"name": "Indirect G-Mode Despawn Gate",
1000+
"name": "Indirect G-Mode Despawn Gate, Open Gate",
9571001
"entranceCondition": {
9581002
"comeInWithGMode": {
9591003
"mode": "indirect",
9601004
"morphed": false
9611005
}
9621006
},
9631007
"requires": [],
1008+
"clearsObstacles": ["A"],
9641009
"flashSuitChecked": true,
965-
"note": "The gate will not spawn in indirect g-mode and is freely passable."
1010+
"note": [
1011+
"The gate will not spawn in indirect G-mode and is freely passable.",
1012+
"Exit G-Mode while under the gate to open it without a Super."
1013+
]
9661014
},
9671015
{
9681016
"id": 53,
@@ -996,6 +1044,14 @@
9961044
"name": "Base",
9971045
"requires": []
9981046
},
1047+
{
1048+
"link": [4, 3],
1049+
"name": "Base",
1050+
"requires": [
1051+
{"obstaclesCleared": ["A"]}
1052+
],
1053+
"flashSuitChecked": true
1054+
},
9991055
{
10001056
"id": 56,
10011057
"link": [4, 4],

‎region/maridia/roomDiagrams/outer_BoyonGateHall_200.png‎

4 KB
Loading

0 commit comments

Comments
 (0)