Skip to content

Commit 6ae7eaa

Browse files
committed
h_avoidScrewStuck
1 parent a5e8935 commit 6ae7eaa

7 files changed

Lines changed: 50 additions & 9 deletions

File tree

helpers.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,18 @@
10341034
]}
10351035
]
10361036
},
1037+
{
1038+
"name": "h_avoidScrewStuck",
1039+
"requires": [
1040+
{"or": [
1041+
"Morph",
1042+
"canCarefulJump"
1043+
]}
1044+
],
1045+
"devNote": [
1046+
"ScrewAttack can create 2 tile high spaces with Samus in spinjump leading to a crouch, resulting in a potential softlock."
1047+
]
1048+
},
10371049
{
10381050
"name": "h_shinechargeMaxRunway",
10391051
"requires": [

region/brinstar/pink/Dachora Room.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
{"and": [
209209
"canDash",
210210
"ScrewAttack",
211+
"h_avoidScrewStuck",
211212
{"cycleFrames": 620}
212213
]},
213214
{"and": [
@@ -405,6 +406,7 @@
405406
{"or": [
406407
"h_getBlueSpeedMaxRunway",
407408
"h_destroyBombWalls",
409+
"h_avoidScrewStuck",
408410
{"obstaclesCleared": ["A"]}
409411
]}
410412
],
@@ -1106,7 +1108,10 @@
11061108
"h_getBlueSpeedMaxRunway",
11071109
"canCarefulJump"
11081110
]},
1109-
"h_destroyBombWalls",
1111+
{"and": [
1112+
"h_destroyBombWalls",
1113+
"h_avoidScrewStuck"
1114+
]},
11101115
{"obstaclesCleared": ["A"]}
11111116
]}
11121117
],

region/crateria/central/Landing Site.json

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,10 @@
558558
"name": "Base",
559559
"requires": [
560560
{"or": [
561-
"h_destroyBombWalls",
561+
{"and": [
562+
"h_destroyBombWalls",
563+
"h_avoidScrewStuck"
564+
]},
562565
{"obstaclesCleared": ["A"]}
563566
]}
564567
],
@@ -822,7 +825,8 @@
822825
"requires": [
823826
"canSpeedyJump",
824827
"canCarefulJump",
825-
"ScrewAttack"
828+
"ScrewAttack",
829+
"h_avoidScrewStuck"
826830
],
827831
"clearsObstacles": ["A"],
828832
"flashSuitChecked": true,
@@ -1699,7 +1703,10 @@
16991703
]}
17001704
]},
17011705
{"or": [
1702-
"h_destroyBombWalls",
1706+
{"and": [
1707+
"h_destroyBombWalls",
1708+
"h_avoidScrewStuck"
1709+
]},
17031710
{"obstaclesCleared": ["A"]}
17041711
]}
17051712
],
@@ -1746,7 +1753,8 @@
17461753
"h_storedSpark",
17471754
"canMidairShinespark",
17481755
{"shinespark": {"frames": 31, "excessFrames": 2}},
1749-
"h_destroyBombWalls"
1756+
"h_destroyBombWalls",
1757+
"h_avoidScrewStuck"
17501758
],
17511759
"clearsObstacles": ["A"],
17521760
"flashSuitChecked": true,
@@ -1951,7 +1959,10 @@
19511959
"canJumpIntoIBJ"
19521960
]},
19531961
{"or": [
1954-
"h_destroyBombWalls",
1962+
{"and": [
1963+
"h_destroyBombWalls",
1964+
"h_avoidScrewStuck"
1965+
]},
19551966
{"obstaclesCleared": ["A"]}
19561967
]}
19571968
],
@@ -1970,6 +1981,7 @@
19701981
"h_bombThings",
19711982
{"and": [
19721983
"ScrewAttack",
1984+
"h_avoidScrewStuck",
19731985
{"or": [
19741986
"canTwoTileSqueeze",
19751987
"canSpeedyJump",
@@ -2008,7 +2020,8 @@
20082020
"requires": [
20092021
"h_storedSpark",
20102022
{"shinespark": {"frames": 7, "excessFrames": 2}},
2011-
"h_destroyBombWalls"
2023+
"h_destroyBombWalls",
2024+
"h_avoidScrewStuck"
20122025
],
20132026
"clearsObstacles": ["A"],
20142027
"flashSuitChecked": true,

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,10 @@
569569
{"acidFrames": 35}
570570
]},
571571
{"or": [
572-
"ScrewAttack",
572+
{"and": [
573+
"ScrewAttack",
574+
"h_avoidScrewStuck"
575+
]},
573576
{"obstaclesCleared": ["A", "B"]}
574577
]}
575578
],
@@ -1334,7 +1337,10 @@
13341337
{"acidFrames": 35}
13351338
]},
13361339
{"or": [
1337-
"ScrewAttack",
1340+
{"and": [
1341+
"ScrewAttack",
1342+
"h_avoidScrewStuck"
1343+
]},
13381344
{"and": [
13391345
{"obstaclesCleared": ["A"]},
13401346
{"obstaclesCleared": ["B"]}

region/crateria/west/Gauntlet Entrance.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@
364364
"name": "Base",
365365
"requires": [
366366
"ScrewAttack",
367+
"h_avoidScrewStuck",
367368
{"or": [
368369
"canCarefulJump",
369370
{"acidFrames": 15}
@@ -798,6 +799,7 @@
798799
"name": "Base",
799800
"requires": [
800801
"ScrewAttack",
802+
"h_avoidScrewStuck",
801803
{"or": [
802804
"canCarefulJump",
803805
{"acidFrames": 15}

region/lowernorfair/east/Pillar Room.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
"requires": [
143143
"canDash",
144144
"ScrewAttack",
145+
"h_avoidScrewStuck",
145146
{"or": [
146147
"canCarefulJump",
147148
{"heatFrames": 60}
@@ -686,6 +687,7 @@
686687
"canDash",
687688
"canCarefulJump",
688689
"ScrewAttack",
690+
"h_avoidScrewStuck",
689691
{"or": [
690692
{"and": [
691693
"canSuitlessLavaDive",

schema/m3-string-requirements.schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@
404404
"h_additionalBomb",
405405
"h_useSpringBall",
406406
"h_hasBeamUpgrade",
407+
"h_avoidScrewStuck",
407408
"h_shinechargeMaxRunway",
408409
"h_getBlueSpeedMaxRunway",
409410
"h_shinechargeSlideTemporaryBlue",

0 commit comments

Comments
 (0)