Skip to content

Commit 039ef6b

Browse files
osse101osse101
authored
Merge pull request #1939 from kjbranch/sam-videos-2
Video Site Finds Pt. 2
2 parents 78b8255 + 1d68cb1 commit 039ef6b

29 files changed

+360
-101
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,13 +1133,18 @@
11331133
{"obstaclesCleared": ["D"]},
11341134
"canRiskPermanentLossOfAccess",
11351135
"h_canArtificialMorphMovement",
1136+
"h_canArtificialMorphBombs",
11361137
{"or": [
11371138
"canConsecutiveWalljump",
1138-
"SpaceJump"
1139+
"SpaceJump",
1140+
"h_canArtificialMorphLongIBJ"
11391141
]}
11401142
],
11411143
"note": "After overloading the PLMs by touching the item, go through the crumble and bomb blocks to the top door.",
1142-
"devNote": "The setup for this strat is where the obstacle is cleared."
1144+
"devNote": [
1145+
"The setup for this strat is where the obstacle is cleared.",
1146+
"FIXME: Bombs arent required if the item is there and can be used to overload PLMs. This was just a quick fix to prevent unsoundness."
1147+
]
11431148
},
11441149
{
11451150
"id": 57,

‎region/brinstar/red/Caterpillar Room.json‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -739,8 +739,16 @@
739739
"link": [2, 2],
740740
"name": "G-Mode Setup - Get Hit By Zero",
741741
"requires": [
742-
"canBeVeryPatient",
743-
"Morph",
742+
{"or": [
743+
{"and": [
744+
"Morph",
745+
"canBeVeryPatient"
746+
]},
747+
{"and": [
748+
"canBePatient",
749+
{"ammo": {"type": "Super", "count": 2}}
750+
]}
751+
]},
744752
{"or": [
745753
"HiJump",
746754
"canWalljump",
@@ -755,9 +763,11 @@
755763
},
756764
"flashSuitChecked": true,
757765
"note": [
758-
"It takes around 4 minutes to get the Zero to this door.",
766+
"It takes around 4 minutes to get the Zero to this door with Morph, or 90 seconds with 2 Supers.",
759767
"The Zero only moves on camera and the camera scrolls when exiting the morph tunnel.",
760-
"Let the Zero lead through the morph tunnel or wait for the it to get very close to Samus before touching the scroll block at the exit."
768+
"Let the Zero lead through the morph tunnel or wait for the it to get very close to Samus before touching the scroll block at the exit.",
769+
"To speed this up and avoid the Morph requirement, use a Super when the Zero is at the tip of the platform extending out below the morph tunnel.",
770+
"The Zero will fall onto a lower platform, and another Super can be used to make it fall on the left platform."
761771
]
762772
},
763773
{

‎region/crateria/central/Climb.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,8 +1728,10 @@
17281728
],
17291729
"flashSuitChecked": true,
17301730
"note": [
1731-
"Use an X-Ray climb to position Samus to where she can break the Bomb block with Screw Attack.",
1732-
"This is an 8 screen climb."
1731+
"Climb 8 screens and position Samus to where she is visually standing above the door.",
1732+
"For the last X-Ray turnaround, face right then press and hold the X-ray scope input, buffer a jump then perform the X-Ray turnaround.",
1733+
"If done correctly Samus will be standing up and facing left, while the jump button is still pressed without a jump occuring.",
1734+
"Press right to break the bomb blocks with a spinjump then left to exit the wall. Jump in place to fix the camera as needed."
17331735
]
17341736
},
17351737
{

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
{
187187
"id": 3,
188188
"link": [1, 1],
189-
"name": "Suitless Water Shinecharge, Shinespark Return",
189+
"name": "Stutter Water Shinecharge, Shinespark Return",
190190
"entranceCondition": {
191191
"comeInRunning": {
192192
"speedBooster": true,
@@ -349,7 +349,7 @@
349349
{
350350
"id": 11,
351351
"link": [1, 2],
352-
"name": "Suitless Water Shinecharge, Leave Shinecharged",
352+
"name": "Stutter Water Shinecharge, Leave Shinecharged",
353353
"entranceCondition": {
354354
"comeInRunning": {
355355
"speedBooster": true,
@@ -543,7 +543,7 @@
543543
{
544544
"id": 18,
545545
"link": [1, 4],
546-
"name": "Suitless Water Shinecharge, Diagonal Shinespark to the Top",
546+
"name": "Stutter Water Shinecharge, Diagonal Shinespark to the Top",
547547
"entranceCondition": {
548548
"comeInRunning": {
549549
"speedBooster": true,
@@ -633,7 +633,7 @@
633633
{
634634
"id": 23,
635635
"link": [1, 6],
636-
"name": "Suitless Water Shinecharge - Spark to Break the Blocks",
636+
"name": "Stutter Water Shinecharge - Spark to Break the Blocks",
637637
"entranceCondition": {
638638
"comeInRunning": {
639639
"speedBooster": true,
@@ -685,7 +685,7 @@
685685
{
686686
"id": 25,
687687
"link": [2, 1],
688-
"name": "Suitless Water Shinecharge, Leave Shinecharged",
688+
"name": "Stutter Water Shinecharge, Leave Shinecharged",
689689
"entranceCondition": {
690690
"comeInRunning": {
691691
"speedBooster": true,
@@ -820,7 +820,7 @@
820820
{
821821
"id": 32,
822822
"link": [2, 2],
823-
"name": "Suitless Water Shinecharge, Shinespark Return",
823+
"name": "Stutter Water Shinecharge, Shinespark Return",
824824
"entranceCondition": {
825825
"comeInRunning": {
826826
"speedBooster": true,
@@ -1046,7 +1046,7 @@
10461046
{
10471047
"id": 41,
10481048
"link": [2, 4],
1049-
"name": "Suitless Water Shinecharge, Diagonal Shinespark to the Top",
1049+
"name": "Stutter Water Shinecharge, Diagonal Shinespark to the Top",
10501050
"entranceCondition": {
10511051
"comeInRunning": {
10521052
"speedBooster": true,
@@ -1125,7 +1125,7 @@
11251125
{
11261126
"id": 46,
11271127
"link": [2, 6],
1128-
"name": "Suitless Water Shinecharge - Spark to Break the Blocks",
1128+
"name": "Stutter Water Shinecharge - Spark to Break the Blocks",
11291129
"entranceCondition": {
11301130
"comeInRunning": {
11311131
"speedBooster": true,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
{
9393
"id": 3,
9494
"link": [1, 1],
95-
"name": "Suitless Water Shinecharge, Shinespark Return",
95+
"name": "Stutter Water Shinecharge, Shinespark Return",
9696
"entranceCondition": {
9797
"comeInRunning": {
9898
"speedBooster": true,
@@ -203,7 +203,7 @@
203203
{
204204
"id": 9,
205205
"link": [1, 2],
206-
"name": "Suitless Water Shinecharge, Leave Shinecharged",
206+
"name": "Stutter Water Shinecharge, Leave Shinecharged",
207207
"entranceCondition": {
208208
"comeInRunning": {
209209
"speedBooster": true,
@@ -294,7 +294,7 @@
294294
{
295295
"id": 11,
296296
"link": [1, 2],
297-
"name": "Leave With Temporary Blue (Suitless Water Shinecharge)",
297+
"name": "Leave With Temporary Blue (Stutter Water Shinecharge)",
298298
"entranceCondition": {
299299
"comeInRunning": {
300300
"speedBooster": true,
@@ -457,7 +457,7 @@
457457
{
458458
"id": 19,
459459
"link": [2, 1],
460-
"name": "Suitless Water Shinecharge, Leave Shinecharged",
460+
"name": "Stutter Water Shinecharge, Leave Shinecharged",
461461
"entranceCondition": {
462462
"comeInRunning": {
463463
"speedBooster": true,
@@ -502,7 +502,7 @@
502502
{
503503
"id": 21,
504504
"link": [2, 1],
505-
"name": "Leave With Temporary Blue (Suitless Water Shinecharge)",
505+
"name": "Leave With Temporary Blue (Stutter Water Shinecharge)",
506506
"entranceCondition": {
507507
"comeInRunning": {
508508
"speedBooster": true,
@@ -638,7 +638,7 @@
638638
{
639639
"id": 29,
640640
"link": [2, 2],
641-
"name": "Suitless Water Shinecharge, Shinespark Return",
641+
"name": "Stutter Water Shinecharge, Shinespark Return",
642642
"entranceCondition": {
643643
"comeInRunning": {
644644
"speedBooster": true,

‎region/maridia/inner-pink/Aqueduct.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@
902902
{
903903
"id": 27,
904904
"link": [2, 2],
905-
"name": "Suitless Stutter Shinecharge, Shinespark Return",
905+
"name": "Stutter Shinecharge, Shinespark Return",
906906
"entranceCondition": {
907907
"comeInRunning": {
908908
"speedBooster": true,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@
12951295
{
12961296
"id": 55,
12971297
"link": [4, 1],
1298-
"name": "Suitless Stutter Water Shinecharge, Leave With Temporary Blue",
1298+
"name": "Stutter Water Shinecharge, Leave With Temporary Blue",
12991299
"entranceCondition": {
13001300
"comeInRunning": {
13011301
"speedBooster": true,
@@ -1843,7 +1843,7 @@
18431843
{
18441844
"id": 79,
18451845
"link": [4, 6],
1846-
"name": "Suitless Stutter Water Shinecharge",
1846+
"name": "Stutter Water Shinecharge",
18471847
"entranceCondition": {
18481848
"comeInRunning": {
18491849
"speedBooster": true,

‎region/maridia/inner-pink/Crab Shaft.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
{
170170
"id": 2,
171171
"link": [1, 1],
172-
"name": "Suitless Water Shinecharge, Leave with Spark",
172+
"name": "Stutter Water Shinecharge, Leave with Spark",
173173
"entranceCondition": {
174174
"comeInRunning": {
175175
"speedBooster": true,
@@ -420,7 +420,7 @@
420420
{
421421
"id": 15,
422422
"link": [1, 4],
423-
"name": "Suitless Water Shinecharge",
423+
"name": "Stutter Water Shinecharge",
424424
"entranceCondition": {
425425
"comeInRunning": {
426426
"speedBooster": true,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@
13041304
{
13051305
"id": 46,
13061306
"link": [2, 1],
1307-
"name": "Suitless Stutter Water Shinecharge",
1307+
"name": "Stutter Water Shinecharge",
13081308
"entranceCondition": {
13091309
"comeInRunning": {
13101310
"speedBooster": true,
@@ -1334,7 +1334,7 @@
13341334
{
13351335
"id": 47,
13361336
"link": [2, 1],
1337-
"name": "Suitless Stutter Water Shinecharge, Leave With Temporary Blue",
1337+
"name": "Stutter Water Shinecharge, Leave With Temporary Blue",
13381338
"entranceCondition": {
13391339
"comeInRunning": {
13401340
"speedBooster": true,
@@ -2244,7 +2244,7 @@
22442244
{
22452245
"id": 82,
22462246
"link": [2, 4],
2247-
"name": "Suitless Stutter Water Shinecharge",
2247+
"name": "Stutter Water Shinecharge",
22482248
"entranceCondition": {
22492249
"comeInRunning": {
22502250
"speedBooster": true,
@@ -2274,7 +2274,7 @@
22742274
{
22752275
"id": 83,
22762276
"link": [2, 4],
2277-
"name": "Suitless Stutter Water Shinecharge, Leave With Temporary Blue",
2277+
"name": "Stutter Water Shinecharge, Leave With Temporary Blue",
22782278
"entranceCondition": {
22792279
"comeInRunning": {
22802280
"speedBooster": true,

‎region/maridia/inner-pink/The Precious Room.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
{
274274
"id": 15,
275275
"link": [2, 1],
276-
"name": "Suitless Water Shinecharge",
276+
"name": "Stutter Water Shinecharge",
277277
"entranceCondition": {
278278
"comeInRunning": {
279279
"speedBooster": true,
@@ -289,7 +289,7 @@
289289
{
290290
"id": 16,
291291
"link": [2, 1],
292-
"name": "Suitless Water Shinecharge, Leave With Temporary Blue",
292+
"name": "Stutter Water Shinecharge, Leave With Temporary Blue",
293293
"entranceCondition": {
294294
"comeInRunning": {
295295
"speedBooster": true,
@@ -667,7 +667,7 @@
667667
{
668668
"id": 30,
669669
"link": [2, 2],
670-
"name": "Suitless Water Shinecharge, Leave with Spark",
670+
"name": "Stutter Water Shinecharge, Leave with Spark",
671671
"entranceCondition": {
672672
"comeInRunning": {
673673
"speedBooster": true,

0 commit comments

Comments
 (0)