Skip to content

Commit 16721ae

Browse files
kjbranchkjbranch
authored
Merge branch 'master' into g-crateria
2 parents 252ddb2 + 184ae33 commit 16721ae

23 files changed

Lines changed: 1965 additions & 241 deletions

‎region/brinstar/blue/Blue Brinstar Energy Tank Room.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,9 @@
299299
"1) Most easily, with a momentum-conserving morph against the ceiling through the transition,",
300300
"2) With a momentum-conserving turnaround through the transition, or",
301301
"3) Jumping and aiming down through the transition.",
302-
"Either back into the corner, or press against it and turn around; it doesn't matter which."
302+
"To maximize the lenience for the jump, back into the Power Bomb block corner,",
303+
"and while running perform a single-pixel arm pump (e.g. by firing a shot);",
304+
"this only matters in certain situations, but in all cases it won't hurt."
303305
],
304306
"devNote": [
305307
"Max extra run speed $5.4.",

‎region/crateria/central/Crateria Super Room.json‎

Lines changed: 52 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,17 @@
310310
"h_canArtificialMorphLongCeilingBombJump",
311311
{"and": [
312312
"h_canArtificialMorphSpringBall",
313-
{"spikeHits": 3},
314-
{"or": [
315-
"h_canArtificialMorphBombHorizontally",
316-
{"spikeHits": 1}
317-
]}
313+
{"spikeHits": 4}
314+
]},
315+
{"and": [
316+
"h_canArtificialMorphSpringBall",
317+
"h_canArtificialMorphBombHorizontally",
318+
{"spikeHits": 3}
319+
]},
320+
{"and": [
321+
"h_canArtificialMorphSpringFling",
322+
"canTrickyJump",
323+
{"spikeHits": 2}
318324
]},
319325
{"and": [
320326
"h_canArtificialMorphIBJ",
@@ -327,6 +333,11 @@
327333
]}
328334
],
329335
"flashSuitChecked": true,
336+
"note": [
337+
"It is possible to cross the spike pit with spring flings and two spike hits.",
338+
"Pause then jump just before the fade out ends and turn Spring Ball off in order to get more horizontal distance at the start and avoid one spike hit.",
339+
"Turn Spring Ball off and on again while jumping on the spikes to get across to avoid another."
340+
],
330341
"devNote": [
331342
"This is a softlock unless the item is Morph.",
332343
"The IBJ strat has 2 extra spike hits added as a leniency."
@@ -501,11 +512,17 @@
501512
{"or": [
502513
{"and": [
503514
"h_canArtificialMorphSpringBall",
504-
{"spikeHits": 3},
505-
{"or": [
506-
"h_canArtificialMorphBombHorizontally",
507-
{"spikeHits": 1}
508-
]}
515+
{"spikeHits": 4}
516+
]},
517+
{"and": [
518+
"h_canArtificialMorphSpringBall",
519+
"h_canArtificialMorphBombHorizontally",
520+
{"spikeHits": 3}
521+
]},
522+
{"and": [
523+
"h_canArtificialMorphSpringFling",
524+
"canTrickyJump",
525+
{"spikeHits": 2}
509526
]},
510527
{"and": [
511528
"Morph",
@@ -532,6 +549,11 @@
532549
]}
533550
],
534551
"flashSuitChecked": true,
552+
"note": [
553+
"It is possible to cross the spike pit with spring flings and two spike hits.",
554+
"Pause then jump just before the fade out ends and turn Spring Ball off in order to get more horizontal distance at the start and avoid one spike hit.",
555+
"Turn Spring Ball off and on again while jumping on the spikes to get across to avoid another."
556+
],
535557
"devNote": "The IBJ from spikes has 2 extra spike hits added as a leniency."
536558
},
537559
{
@@ -584,11 +606,17 @@
584606
{"or": [
585607
{"and": [
586608
"h_canArtificialMorphSpringBall",
587-
{"spikeHits": 3},
588-
{"or": [
589-
"h_canArtificialMorphBombHorizontally",
590-
{"spikeHits": 1}
591-
]}
609+
{"spikeHits": 4}
610+
]},
611+
{"and": [
612+
"h_canArtificialMorphSpringBall",
613+
"h_canArtificialMorphBombHorizontally",
614+
{"spikeHits": 3}
615+
]},
616+
{"and": [
617+
"h_canArtificialMorphSpringFling",
618+
"canTrickyJump",
619+
{"spikeHits": 2}
592620
]},
593621
{"and": [
594622
"Morph",
@@ -606,7 +634,15 @@
606634
]}
607635
],
608636
"flashSuitChecked": true,
609-
"note": "Place the PBs exactly two tiles left of the Morph tunnel. Be sure not to touch the item if this strat will be needed again in the future."
637+
"note": [
638+
"Place the PBs exactly two tiles left of the Morph tunnel. Be sure not to touch the item if this strat will be needed again in the future.",
639+
"It is possible to cross the spike pit with spring flings and two spike hits.",
640+
"Pause then jump just before the fade out ends and turn Spring Ball off in order to get more horizontal distance at the start and avoid one spike hit.",
641+
"Turn Spring Ball off and on again while jumping on the spikes to get across to avoid another."
642+
],
643+
"devNote": [
644+
"FIXME Add strat for going down without PBs, by using the uncollected item to overload PLMs. This can only be done once, as it forces item pickup."
645+
]
610646
},
611647
{
612648
"link": [1, 5],

‎region/lowernorfair/east/Amphitheatre.json‎

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
"from": 1,
161161
"to": [
162162
{"id": 1},
163+
{"id": 2},
163164
{"id": 3},
164165
{"id": 4},
165166
{"id": 5}
@@ -339,6 +340,38 @@
339340
"flashSuitChecked": true,
340341
"devNote": "Artificial morph will allow Samus not to fall; real Morph is not sufficient."
341342
},
343+
{
344+
"link": [1, 2],
345+
"name": "G-Mode",
346+
"entranceCondition": {
347+
"comeInWithGMode": {
348+
"mode": "any",
349+
"morphed": false
350+
}
351+
},
352+
"requires": [
353+
{"or": [
354+
"canWalljump",
355+
"HiJump",
356+
"SpaceJump",
357+
"canSpringBallJumpMidAir",
358+
"canInsaneJump",
359+
{"and": [
360+
"Charge",
361+
"canTrickyUseFrozenEnemies",
362+
"Plasma",
363+
"canTrickyJump"
364+
]}
365+
]},
366+
"h_HeatedGModeOpenDifferentDoor"
367+
],
368+
"flashSuitChecked": true,
369+
"note": [
370+
"Cross the room while avoiding the pirate's stationary invisible lasers.",
371+
"On entry, fall to the right to land past the first pirate, then run and jump over the next pirate and continue to the top door.",
372+
"It is possible but precise to cross the room without any items or a wall jump by jumping from the slightly raised platform on the right."
373+
]
374+
},
342375
{
343376
"id": 37,
344377
"link": [1, 3],
@@ -783,12 +816,30 @@
783816
],
784817
"devNote": ["This strat is only used to avoid walljumping."]
785818
},
819+
{
820+
"link": [3, 4],
821+
"name": "Base - Space Jump",
822+
"requires": [
823+
{"obstaclesCleared": ["A"]},
824+
"SpaceJump",
825+
{"heatFrames": 420}
826+
]
827+
},
786828
{
787829
"id": 22,
788830
"link": [3, 4],
789831
"name": "Base",
790832
"requires": [
791833
{"obstaclesCleared": ["A"]},
834+
{"or": [
835+
"canCarefulJump",
836+
"ScrewAttack",
837+
{"enemyDamage": {
838+
"enemy": "Yellow Space Pirate (standing)",
839+
"type": "laser",
840+
"hits": 1
841+
}}
842+
]},
792843
{"or": [
793844
{"and": [
794845
"canWalljump",
@@ -799,12 +850,7 @@
799850
{"heatFrames": 360}
800851
]},
801852
{"and": [
802-
"SpaceJump",
803-
{"heatFrames": 420}
804-
]},
805-
{"and": [
806-
"canSpringBallJumpMidAir",
807-
"canCarefulJump",
853+
"canTrickySpringBallJump",
808854
{"heatFrames": 520}
809855
]}
810856
]}
@@ -816,7 +862,7 @@
816862
"name": "Tricky Jump",
817863
"requires": [
818864
{"obstaclesCleared": ["A"]},
819-
"canTrickyJump",
865+
"canInsaneJump",
820866
{"heatFrames": 480}
821867
],
822868
"note": "Between the two pirates there is a short runway that can be used to jump to the higher platform."
@@ -828,11 +874,15 @@
828874
"requires": [
829875
{"obstaclesCleared": ["A"]},
830876
"Charge",
831-
"canUseFrozenEnemies",
877+
"canTrickyUseFrozenEnemies",
832878
"Plasma",
879+
"canTrickyJump",
833880
{"heatFrames": 440}
834881
],
835-
"note": "Freeze a pirate to use as a platform. A very strong beam is required to stay out of the acid."
882+
"note": [
883+
"Freeze a pirate to use as a platform. A very strong beam is required to stay out of the acid.",
884+
"Shooting the Pirate with two diagonal shots can help prevent it from being killed as it is frozen."
885+
]
836886
},
837887
{
838888
"id": 25,

‎region/lowernorfair/east/Lower Norfair Escape Power Bomb Room.json‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,29 @@
9595
],
9696
"flashSuitChecked": true
9797
},
98+
{
99+
"link": [1, 1],
100+
"name": "Direct G-Mode Morph, Power Bomb the Item",
101+
"entranceCondition": {
102+
"comeInWithGMode": {
103+
"mode": "direct",
104+
"morphed": true
105+
}
106+
},
107+
"requires": [
108+
"h_heatedGMode",
109+
{"ammo": {"type": "PowerBomb","count": 18}},
110+
{"heatFrames": 240}
111+
],
112+
"collectsItems": [3],
113+
"flashSuitChecked": true,
114+
"note": [
115+
"Use 17 Power Bombs while pressed against the crumble blocks to overload PLMs and go through the crumble blocks.",
116+
"With Morph, exit G-mode near the item then return to the left, without, exit in the middle of the room to break the crumble blocks."
117+
],
118+
"detailNote": "Anywhere else in the left section of the room requires one more Power Bomb.",
119+
"devNote": "Returning to the left avoids canRiskPermanentLossOfAccess. This might be useful with a crystal flash."
120+
},
98121
{
99122
"id": 3,
100123
"link": [1, 2],
@@ -112,6 +135,45 @@
112135
"Holding down and mashing forward sometimes works, or X-Ray can be used at the end of the Crystal Flash to more easily time the inputs."
113136
]
114137
},
138+
{
139+
"link": [1, 2],
140+
"name": "G-Mode, Bomb the Crumble Blocks",
141+
"entranceCondition": {
142+
"comeInWithGMode": {
143+
"mode": "any",
144+
"morphed": true
145+
}
146+
},
147+
"requires": [
148+
"h_heatedGMode",
149+
"h_canArtificialMorphBombs",
150+
{"heatFrames": 50}
151+
],
152+
"flashSuitChecked": true,
153+
"note": "Bomb the side of the crumble blocks to overload PLMs and go through to the middle of the room.",
154+
"devNote": "It is possible to go to 3, but then it takes extra heat frames to get out, being almost the same as ending at 2 and going to 3."
155+
},
156+
{
157+
"link": [1, 2],
158+
"name": "Direct G-Mode Morph, Power Bomb the Item",
159+
"entranceCondition": {
160+
"comeInWithGMode": {
161+
"mode": "direct",
162+
"morphed": true
163+
}
164+
},
165+
"requires": [
166+
"h_heatedGMode",
167+
{"itemNotCollectedAtNode": 3},
168+
"canRiskPermanentLossOfAccess",
169+
{"ammo": {"type": "PowerBomb","count": 17}},
170+
{"heatFrames": 50}
171+
],
172+
"flashSuitChecked": true,
173+
"note": "Use 17 Power Bombs while pressed against the crumble blocks to overload PLMs and go through the crumble blocks.",
174+
"detailNote": "Anywhere else in the left section of the room requires one more Power Bomb.",
175+
"devNote": "It is possible to go to 3, but then it takes extra heat frames to get out, being almost the same as ending at 2 and going to 3."
176+
},
115177
{
116178
"id": 4,
117179
"link": [1, 3],
@@ -189,6 +251,48 @@
189251
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
190252
]
191253
},
254+
{
255+
"link": [2, 1],
256+
"name": "G-Mode, Bomb the Crumble Blocks",
257+
"entranceCondition": {
258+
"comeInWithGMode": {
259+
"mode": "any",
260+
"morphed": true
261+
},
262+
"comesThroughToilet": "any"
263+
},
264+
"requires": [
265+
"h_heatedGMode",
266+
"h_canArtificialMorphBombs",
267+
"h_HeatedGModeOpenDifferentDoor"
268+
],
269+
"flashSuitChecked": true,
270+
"note": "Bomb the side of the crumble blocks to overload PLMs and go through to the left door.",
271+
"devNote": [
272+
"FIXME: This and a few other variant could go to 3, but then it takes extra heat frames to get out, which is about the same overall,",
273+
"but the item could be Varia, Gravity, or an E-Tank making it possible when entering with less Energy."
274+
]
275+
},
276+
{
277+
"link": [2, 1],
278+
"name": "Direct G-Mode Morph, Power Bomb the Item",
279+
"entranceCondition": {
280+
"comeInWithGMode": {
281+
"mode": "direct",
282+
"morphed": true
283+
},
284+
"comesThroughToilet": "any"
285+
},
286+
"requires": [
287+
"h_heatedGMode",
288+
{"itemNotCollectedAtNode": 3},
289+
"canRiskPermanentLossOfAccess",
290+
{"ammo": {"type": "PowerBomb","count": 9}},
291+
"h_HeatedGModeOpenDifferentDoor"
292+
],
293+
"flashSuitChecked": true,
294+
"note": "Use 9 Power Bombs against the right crumble blocks to overload PLMs and roll through the crumble blocks on the left."
295+
},
192296
{
193297
"id": 6,
194298
"link": [2, 2],

0 commit comments

Comments
 (0)