Skip to content

Commit 2761bda

Browse files
committed
feedback updates
1 parent 7ee3dd4 commit 2761bda

4 files changed

Lines changed: 60 additions & 12 deletions

File tree

helpers.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,18 @@
12851285
]}
12861286
]
12871287
},
1288+
{
1289+
"name": "h_trickyToCarryBlueSuit",
1290+
"requires": [
1291+
{"or": [
1292+
{"noBlueSuit": {}},
1293+
{"and": [
1294+
"canInsaneJump",
1295+
"canBeVeryPatient"
1296+
]}
1297+
]}
1298+
]
1299+
},
12881300
{
12891301
"name": "h_PlasmaHitbox",
12901302
"requires": [

region/brinstar/green/Etecoon Energy Tank Room.json

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,10 +1509,16 @@
15091509
"name": "Spikeway Tunnel Crawl (Left to Right)",
15101510
"requires": [
15111511
{"notable": "Spikeway Tunnel Crawl"},
1512-
{"noBlueSuit": {}},
15131512
"canTunnelCrawl",
15141513
"canTrickyJump",
1515-
{"thornHits": 31}
1514+
{"thornHits": 31},
1515+
{"or": [
1516+
{"noBlueSuit": {}},
1517+
{"and": [
1518+
"h_trickyToCarryBlueSuit",
1519+
{"thornHits": 31}
1520+
]}
1521+
]}
15161522
],
15171523
"flashSuitChecked": true,
15181524
"blueSuitChecked": true,
@@ -1533,10 +1539,13 @@
15331539
"name": "Spikeway Aim Cancel Wiggle",
15341540
"requires": [
15351541
{"notable": "Spikeway Aim Cancel Wiggle"},
1536-
{"noBlueSuit": {}},
15371542
"canTurnaroundAimCancel",
15381543
"canBeVeryPatient",
1539-
{"thornHits": 180}
1544+
{"thornHits": 100},
1545+
{"or": [
1546+
{"noBlueSuit": {}},
1547+
{"thornHits": 100}
1548+
]}
15401549
],
15411550
"flashSuitChecked": true,
15421551
"blueSuitChecked": true,
@@ -1548,10 +1557,10 @@
15481557
"name": "Spikeway X-Ray Wiggle (Left to Right)",
15491558
"requires": [
15501559
{"notable": "Spikeway X-Ray Wiggle"},
1551-
{"noBlueSuit": {}},
15521560
"canXRayWaitForIFrames",
15531561
"canXRayTurnaround",
1554-
{"thornHits": 1}
1562+
{"thornHits": 1},
1563+
"h_trickyToCarryBlueSuit"
15551564
],
15561565
"flashSuitChecked": true,
15571566
"blueSuitChecked": true,
@@ -2543,10 +2552,16 @@
25432552
"name": "Spikeway Tunnel Crawl (Right to Left)",
25442553
"requires": [
25452554
{"notable": "Spikeway Tunnel Crawl"},
2546-
{"noBlueSuit": {}},
25472555
"canTunnelCrawl",
25482556
"canTrickyJump",
25492557
{"thornHits": 31},
2558+
{"or": [
2559+
{"noBlueSuit": {}},
2560+
{"and": [
2561+
"h_trickyToCarryBlueSuit",
2562+
{"thornHits": 31}
2563+
]}
2564+
]},
25502565
{"obstaclesCleared": ["A"]}
25512566
],
25522567
"flashSuitChecked": true,
@@ -2568,10 +2583,10 @@
25682583
"name": "Spikeway X-Ray Wiggle (Right to Left)",
25692584
"requires": [
25702585
{"notable": "Spikeway X-Ray Wiggle"},
2571-
{"noBlueSuit": {}},
25722586
"canXRayWaitForIFrames",
25732587
"canXRayTurnaround",
2574-
{"thornHits": 1}
2588+
{"thornHits": 1},
2589+
"h_trickyToCarryBlueSuit"
25752590
],
25762591
"flashSuitChecked": true,
25772592
"blueSuitChecked": true,

region/brinstar/green/Noob Bridge.json

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,17 +369,37 @@
369369
"link": [1, 2],
370370
"name": "Dashless Quick Drops",
371371
"requires": [
372-
{"notable": "Dashless Quick Drops"},
373-
{"disableEquipment": "HiJump"},
372+
{"notable": "Dashless Quick Drops"},
373+
{"disableEquipment": "HiJump"},
374374
"canQuickDrop"
375375
],
376376
"flashSuitChecked": true,
377377
"blueSuitChecked": true,
378378
"note": [
379379
"Perform a long sequence of quick drops to make it past the crumbles without dashing.",
380-
"It is possible to hold jump the entire time, doing buffered turnaround spin jumps to the right."
380+
"It is possible to hold jump the entire time, doing buffered turnaround spin jumps to the right.",
381+
"With each quick drop, it is recommended to center Samus over the edge between two crumble blocks,",
382+
"to break both of them at once."
381383
]
382384
},
385+
{
386+
"link": [1, 2],
387+
"name": "Spring Ball Bounce",
388+
"requires": [
389+
"h_useSpringBall",
390+
{"or": [
391+
{"tech": "canTrickySpringBallBounce"},
392+
{"spikeHits": 7}
393+
]}
394+
],
395+
"flashSuitChecked": true,
396+
"blueSuitChecked": true,
397+
"note": [
398+
"Either use a long chain of controlled, short spring ball bounces to make it past the crumbles without touching the spikes,",
399+
"or simply hold jump and forward and take 7 spike hits."
400+
],
401+
"devNote": "This is a dashless strat."
402+
},
383403
{
384404
"id": 14,
385405
"link": [2, 1],

schema/m3-string-requirements.schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@
426426
"h_trickyToCarryFlashSuit",
427427
"h_extremelyTrickyToCarryFlashSuit",
428428
"h_complexToCarryBlueSuit",
429+
"h_trickyToCarryBlueSuit",
429430
"h_PlasmaHitbox",
430431
"h_threeTileJumpMorph",
431432
"h_fourTileJumpMorph",

0 commit comments

Comments
 (0)