Skip to content

Commit 35f7201

Browse files
osse101osse101
authored
Merge branch 'master' into tourian2hard
2 parents 1577147 + 6ea558c commit 35f7201

113 files changed

Lines changed: 869 additions & 746 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎helpers.json‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,14 +1128,27 @@
11281128
{"or": [
11291129
{"noFlashSuit": {}},
11301130
{"and": [
1131-
"h_useSpringBall",
1132-
"canComplexCarryFlashSuit"
1131+
"canComplexCarryFlashSuit",
1132+
{"or": [
1133+
"h_useSpringBall",
1134+
"h_useMorphBombs",
1135+
"canWallJumpInstantMorph"
1136+
]}
11331137
]},
11341138
{"and": [
11351139
"canInsaneMidAirMorph",
1140+
{"or": [
1141+
{"disableEquipment": "HiJump"},
1142+
"canBeVeryLucky"
1143+
]},
11361144
"canTrickyCarryFlashSuit"
11371145
]}
11381146
]}
1147+
],
1148+
"devNote": [
1149+
"FIXME: Flashsuit options should effect the expected number of tries on the gate glitch.",
1150+
"FIXME: Flashsuit options do not scale with heat.",
1151+
"FIXME: PowerBombs work as an alternative to Bombs."
11391152
]
11401153
},
11411154
{
@@ -1159,7 +1172,8 @@
11591172
"canInsaneMidAirMorph"
11601173
]}
11611174
]}
1162-
]
1175+
],
1176+
"devNote": "Methods requiring Gravity would use Gravity+h_gateGlitch."
11631177
},
11641178
{
11651179
"name": "h_blueGateGlitch",
@@ -2171,6 +2185,7 @@
21712185
{
21722186
"name": "h_thornDoubleXModeBlueSuitWithoutLenience",
21732187
"requires": [
2188+
"canDoubleXModeBlueSuit",
21742189
{"or": [
21752190
{"thornHits": 3},
21762191
{"and": [

‎region/brinstar/blue/Blue Brinstar Boulder Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@
956956
"requires": [
957957
"SpaceJump",
958958
{"or": [
959-
"canWalljump",
959+
"canWallJump",
960960
{"and": [
961961
"canSpaceJumpWaterEscape",
962962
"HiJump"
@@ -1037,7 +1037,7 @@
10371037
{"doorUnlockedAtNode": 2},
10381038
{"or": [
10391039
"canDownGrab",
1040-
"canWalljump",
1040+
"canWallJump",
10411041
"Gravity",
10421042
"HiJump",
10431043
"canTrickySpringBallJump"

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@
17921792
"name": "Base",
17931793
"requires": [
17941794
{"or": [
1795-
"canWalljump",
1795+
"canWallJump",
17961796
"Morph",
17971797
"SpaceJump",
17981798
"HiJump"

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
"requires": [
282282
"canComplexGMode",
283283
{"or": [
284-
"canWalljump",
284+
"canWallJump",
285285
"SpaceJump",
286286
{"and": [
287287
"HiJump",
@@ -448,7 +448,7 @@
448448
"types": ["missiles", "powerbomb"],
449449
"requires": [
450450
{"or": [
451-
"canWalljump",
451+
"canWallJump",
452452
"HiJump",
453453
"SpaceJump",
454454
"canIBJ",
@@ -484,7 +484,7 @@
484484
"types": ["powerbomb"],
485485
"requires": [
486486
{"or": [
487-
"canWalljump",
487+
"canWallJump",
488488
"HiJump",
489489
"SpaceJump",
490490
"canIBJ",
@@ -626,7 +626,7 @@
626626
"canOffScreenMovement",
627627
"canComplexGMode",
628628
{"or": [
629-
"canWalljump",
629+
"canWallJump",
630630
"SpaceJump",
631631
{"and": [
632632
"HiJump",
@@ -709,7 +709,7 @@
709709
"requires": [
710710
{"refill": ["Energy"]},
711711
{"or": [
712-
"canWalljump",
712+
"canWallJump",
713713
"HiJump",
714714
"SpaceJump",
715715
"canIBJ",
@@ -931,7 +931,7 @@
931931
"name": "Leave Shinecharged (Run Above)",
932932
"requires": [
933933
{"or": [
934-
"canWalljump",
934+
"canWallJump",
935935
"HiJump",
936936
"SpaceJump",
937937
"canIBJ",
@@ -1037,7 +1037,7 @@
10371037
"requires": [
10381038
{"resetRoom": {"nodes": [2]}},
10391039
{"or": [
1040-
"canWalljump",
1040+
"canWallJump",
10411041
{"and": [
10421042
"canCrouchJump",
10431043
{"or": [
@@ -1224,7 +1224,7 @@
12241224
},
12251225
"requires": [
12261226
{"or": [
1227-
"canWalljump",
1227+
"canWallJump",
12281228
"HiJump",
12291229
"SpaceJump",
12301230
"canIBJ",
@@ -1259,7 +1259,7 @@
12591259
"name": "Base",
12601260
"requires": [
12611261
{"or": [
1262-
"canWalljump",
1262+
"canWallJump",
12631263
"HiJump",
12641264
"SpaceJump",
12651265
"canIBJ",

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

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -933,14 +933,14 @@
933933
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
934934
{"or": [
935935
"h_preciseIceClip",
936-
"canWalljump",
936+
"canWallJump",
937937
"HiJump",
938938
"SpaceJump",
939939
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
940940
]},
941941
{"or": [
942942
"canCrumbleJump",
943-
"canWalljump",
943+
"canWallJump",
944944
"HiJump",
945945
"SpaceJump"
946946
]}
@@ -968,7 +968,7 @@
968968
"Morph",
969969
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
970970
{"or": [
971-
"canWalljump",
971+
"canWallJump",
972972
"HiJump",
973973
"SpaceJump",
974974
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
@@ -1293,6 +1293,39 @@
12931293
"Arm pumps can be used to get close to the ledge before shinecharging, to leave with more frames remaining."
12941294
]
12951295
},
1296+
{
1297+
"link": [3, 3],
1298+
"name": "Leave With Temporary Blue (X-Mode Shinecharge)",
1299+
"requires": [
1300+
"canXMode",
1301+
"h_shinechargeMaxRunway",
1302+
"canChainTemporaryBlue",
1303+
{"thornHits": 1},
1304+
{"or": [
1305+
{"thornHits": "n_thornXModeLenience"},
1306+
{"obstaclesCleared": ["A"]},
1307+
"canTrickyDodgeEnemies",
1308+
{"enemyKill": {
1309+
"enemies": [["Beetom", "Beetom"]],
1310+
"excludedWeapons": ["Bombs"]
1311+
}}
1312+
]}
1313+
],
1314+
"exitCondition": {
1315+
"leaveWithTemporaryBlue": {}
1316+
},
1317+
"flashSuitChecked": true,
1318+
"blueSuitChecked": true,
1319+
"note": [
1320+
"With some dash speed, bounce into the opening of the spikeway, and enter X-mode.",
1321+
"The spike knockback will push Samus back out of the spikeway.",
1322+
"By bouncing far enough left, it is possible to get a 2-frame window for the X-mode."
1323+
],
1324+
"detailNote": [
1325+
"By holding an angle button, it is possible turn around in X-mode without losing dash speed.",
1326+
"Crouch to charge a shinespark, release dash to cancel X-Ray and exit out of X-Mode and hold angle until temporary blue."
1327+
]
1328+
},
12961329
{
12971330
"id": 79,
12981331
"link": [3, 3],
@@ -1333,7 +1366,7 @@
13331366
]},
13341367
{"ammo": {"type": "PowerBomb", "count": 2}},
13351368
{"or": [
1336-
"canWalljump",
1369+
"canWallJump",
13371370
"SpaceJump",
13381371
{"and": [
13391372
"HiJump",
@@ -1467,7 +1500,7 @@
14671500
]},
14681501
{"ammo": {"type": "PowerBomb", "count": 2}},
14691502
{"or": [
1470-
"canWalljump",
1503+
"canWallJump",
14711504
"SpaceJump",
14721505
{"and": [
14731506
"HiJump",
@@ -1915,7 +1948,7 @@
19151948
]},
19161949
{"ammo": {"type": "PowerBomb", "count": 2}},
19171950
{"or": [
1918-
"canWalljump",
1951+
"canWallJump",
19191952
"SpaceJump",
19201953
{"and": [
19211954
"HiJump",
@@ -1957,7 +1990,7 @@
19571990
]},
19581991
{"ammo": {"type": "PowerBomb", "count": 2}},
19591992
{"or": [
1960-
"canWalljump",
1993+
"canWallJump",
19611994
"SpaceJump",
19621995
{"and": [
19631996
"HiJump",
@@ -2273,7 +2306,7 @@
22732306
"Morph",
22742307
{"or": [
22752308
"HiJump",
2276-
"canWalljump"
2309+
"canWallJump"
22772310
]}
22782311
]}
22792312
]}
@@ -2309,7 +2342,7 @@
23092342
"Morph",
23102343
{"or": [
23112344
"HiJump",
2312-
"canWalljump"
2345+
"canWallJump"
23132346
]}
23142347
]}
23152348
]}
@@ -2358,7 +2391,7 @@
23582391
]},
23592392
{"ammo": {"type": "PowerBomb", "count": 2}},
23602393
{"or": [
2361-
"canWalljump",
2394+
"canWallJump",
23622395
"SpaceJump",
23632396
{"and": [
23642397
"HiJump",
@@ -2399,7 +2432,7 @@
23992432
]},
24002433
{"ammo": {"type": "PowerBomb", "count": 2}},
24012434
{"or": [
2402-
"canWalljump",
2435+
"canWallJump",
24032436
"SpaceJump",
24042437
{"and": [
24052438
"HiJump",

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@
14891489
}
14901490
},
14911491
"requires": [
1492-
"canWalljump",
1492+
"canWallJump",
14931493
"canShinechargeMovementComplex",
14941494
{"shineChargeFrames": 135}
14951495
],
@@ -1537,7 +1537,7 @@
15371537
"requires": [
15381538
{"shineChargeFrames": 105},
15391539
"HiJump",
1540-
"canWalljump",
1540+
"canWallJump",
15411541
"canShinechargeMovementComplex"
15421542
],
15431543
"exitCondition": {
@@ -1581,7 +1581,7 @@
15811581
},
15821582
"requires": [
15831583
{"shineChargeFrames": 130},
1584-
"canWalljump",
1584+
"canWallJump",
15851585
"canShinechargeMovementComplex"
15861586
],
15871587
"exitCondition": {
@@ -1625,7 +1625,7 @@
16251625
"requires": [
16261626
{"shineChargeFrames": 80},
16271627
"HiJump",
1628-
"canWalljump",
1628+
"canWallJump",
16291629
"canShinechargeMovementComplex",
16301630
{"shinespark": {"frames": 7, "excessFrames": 0}}
16311631
],
@@ -1671,7 +1671,7 @@
16711671
},
16721672
"requires": [
16731673
{"shineChargeFrames": 110},
1674-
"canWalljump",
1674+
"canWallJump",
16751675
"canShinechargeMovementComplex",
16761676
{"shinespark": {"frames": 6, "excessFrames": 0}}
16771677
],
@@ -1832,7 +1832,7 @@
18321832
},
18331833
"requires": [
18341834
{"shineChargeFrames": 145},
1835-
"canWalljump",
1835+
"canWallJump",
18361836
"canShinechargeMovementComplex"
18371837
],
18381838
"exitCondition": {
@@ -2505,7 +2505,7 @@
25052505
},
25062506
"requires": [
25072507
{"shineChargeFrames": 130},
2508-
"canWalljump",
2508+
"canWallJump",
25092509
"canShinechargeMovementComplex"
25102510
],
25112511
"exitCondition": {
@@ -2570,7 +2570,7 @@
25702570
},
25712571
"requires": [
25722572
{"shineChargeFrames": 110},
2573-
"canWalljump",
2573+
"canWallJump",
25742574
"canShinechargeMovementComplex",
25752575
{"shinespark": {"frames": 6, "excessFrames": 0}}
25762576
],
@@ -3209,7 +3209,7 @@
32093209
}
32103210
},
32113211
"requires": [
3212-
"canWalljump",
3212+
"canWallJump",
32133213
"canShinechargeMovementComplex",
32143214
{"shineChargeFrames": 125}
32153215
],
@@ -3234,7 +3234,7 @@
32343234
}
32353235
},
32363236
"requires": [
3237-
"canWalljump",
3237+
"canWallJump",
32383238
"canShinechargeMovementComplex",
32393239
{"shineChargeFrames": 145}
32403240
],
@@ -5286,7 +5286,7 @@
52865286
"name": "Base",
52875287
"requires": [
52885288
{"or": [
5289-
"canWalljump",
5289+
"canWallJump",
52905290
"SpaceJump",
52915291
"canLongIBJ",
52925292
{"and": [

0 commit comments

Comments
 (0)