Skip to content

Commit 1aa9cef

Browse files
nn357nn357
committed
Merge remote-tracking branch 'upstream/master' into annoying_g_mode_setups
2 parents 875b46b + 1697d71 commit 1aa9cef

131 files changed

Lines changed: 1795 additions & 1376 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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
},
449449
"requires": [
450450
"canTrickyJump",
451-
"canPreciseWalljump"
451+
"canPreciseWallJump"
452452
],
453453
"flashSuitChecked": true,
454454
"blueSuitChecked": true,
@@ -513,7 +513,7 @@
513513
"name": "Doorsill Jump",
514514
"requires": [
515515
"canDash",
516-
"canPreciseWalljump",
516+
"canPreciseWallJump",
517517
"canTrickyJump",
518518
{"or": [
519519
{"spikeHits": 1},
@@ -674,7 +674,7 @@
674674
}
675675
},
676676
"requires": [
677-
"canPreciseWalljump",
677+
"canPreciseWallJump",
678678
"canTrickyJump",
679679
{"or": [
680680
{"spikeHits": 1},
@@ -956,7 +956,7 @@
956956
"requires": [
957957
"SpaceJump",
958958
{"or": [
959-
"canWalljump",
959+
"canWallJump",
960960
{"and": [
961961
"canSpaceJumpWaterEscape",
962962
"HiJump"
@@ -995,7 +995,7 @@
995995
"name": "Naked Walljump",
996996
"requires": [
997997
"canSuitlessMaridia",
998-
"canInsaneWalljump"
998+
"canInsaneWallJump"
999999
],
10001000
"flashSuitChecked": true,
10011001
"blueSuitChecked": true,
@@ -1037,7 +1037,7 @@
10371037
{"doorUnlockedAtNode": 2},
10381038
{"or": [
10391039
"canDownGrab",
1040-
"canWalljump",
1040+
"canWallJump",
10411041
"Gravity",
10421042
"HiJump",
10431043
"canTrickySpringBallJump"

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@
789789
"requires": [
790790
{"notable": "Taco Tank"},
791791
"canCWJ",
792-
"canInsaneWalljump",
792+
"canInsaneWallJump",
793793
"canStationarySpinJump"
794794
],
795795
"flashSuitChecked": false,
@@ -943,7 +943,7 @@
943943
"HiJump",
944944
{"canShineCharge": {"usedTiles": 35, "openEnd": 1}},
945945
"canShinechargeMovementTricky",
946-
"canFastWalljumpClimb",
946+
"canFastWallJumpClimb",
947947
{"shinespark": {"frames": 8, "excessFrames": 0}}
948948
],
949949
"exitCondition": {
@@ -965,7 +965,7 @@
965965
{"obstaclesCleared": ["A"]}
966966
]},
967967
{"or": [
968-
"canConsecutiveWalljump",
968+
"canConsecutiveWallJump",
969969
"SpaceJump",
970970
"canLongIBJ"
971971
]}
@@ -1036,7 +1036,7 @@
10361036
{"haveBlueSuit": {}}
10371037
]},
10381038
{"or": [
1039-
"canConsecutiveWalljump",
1039+
"canConsecutiveWallJump",
10401040
{"and": [
10411041
"SpaceJump",
10421042
{"cycleFrames": 250}
@@ -1214,7 +1214,7 @@
12141214
{"notable": "Return Through Crumble Blocks"},
12151215
"Morph",
12161216
{"or": [
1217-
"canConsecutiveWalljump",
1217+
"canConsecutiveWallJump",
12181218
"SpaceJump",
12191219
"canLongIBJ"
12201220
]},
@@ -1234,7 +1234,7 @@
12341234
{"obstaclesCleared": ["C"]}
12351235
]},
12361236
{"or": [
1237-
"canConsecutiveWalljump",
1237+
"canConsecutiveWallJump",
12381238
"SpaceJump",
12391239
"canLongIBJ"
12401240
]},
@@ -1263,7 +1263,7 @@
12631263
{"obstaclesCleared": ["C"]}
12641264
]},
12651265
{"or": [
1266-
"canConsecutiveWalljump",
1266+
"canConsecutiveWallJump",
12671267
"SpaceJump"
12681268
]}
12691269
],
@@ -1288,7 +1288,7 @@
12881288
]},
12891289
"canLongIBJ",
12901290
{"and": [
1291-
"canConsecutiveWalljump",
1291+
"canConsecutiveWallJump",
12921292
"canWallJumpInstantMorph"
12931293
]}
12941294
]}
@@ -1406,7 +1406,7 @@
14061406
]},
14071407
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
14081408
"canShinechargeMovementComplex",
1409-
"canConsecutiveWalljump",
1409+
"canConsecutiveWallJump",
14101410
{"shinespark": {"frames": 17, "excessFrames": 3}}
14111411
],
14121412
"clearsObstacles": ["A", "B", "C"],
@@ -1430,7 +1430,7 @@
14301430
]},
14311431
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
14321432
"canShinechargeMovementComplex",
1433-
"canConsecutiveWalljump",
1433+
"canConsecutiveWallJump",
14341434
"HiJump",
14351435
{"shinespark": {"frames": 9, "excessFrames": 9}}
14361436
],
@@ -1453,7 +1453,7 @@
14531453
]},
14541454
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
14551455
"canShinechargeMovementComplex",
1456-
"canFastWalljumpClimb",
1456+
"canFastWallJumpClimb",
14571457
{"shinespark": {"frames": 9, "excessFrames": 9}}
14581458
],
14591459
"clearsObstacles": ["A", "B", "C"],
@@ -1493,7 +1493,7 @@
14931493
]},
14941494
{"and": [
14951495
{"or": [
1496-
"canConsecutiveWalljump",
1496+
"canConsecutiveWallJump",
14971497
"SpaceJump"
14981498
]},
14991499
{"shinespark": {"frames": 9, "excessFrames": 9}}
@@ -1521,7 +1521,7 @@
15211521
]},
15221522
{"and": [
15231523
{"or": [
1524-
"canConsecutiveWalljump",
1524+
"canConsecutiveWallJump",
15251525
"SpaceJump"
15261526
]},
15271527
{"shinespark": {"frames": 9, "excessFrames": 9}}
@@ -1574,7 +1574,7 @@
15741574
"canGMode",
15751575
"h_artificialMorphIBJ",
15761576
{"or": [
1577-
"canConsecutiveWalljump",
1577+
"canConsecutiveWallJump",
15781578
"SpaceJump",
15791579
{"and": [
15801580
"h_artificialMorphLongIBJ",
@@ -1612,7 +1612,7 @@
16121612
"canGMode",
16131613
"Morph",
16141614
{"or": [
1615-
"canConsecutiveWalljump",
1615+
"canConsecutiveWallJump",
16161616
"SpaceJump"
16171617
]},
16181618
{"or": [
@@ -1637,7 +1637,7 @@
16371637
"h_artificialMorphPowerBomb",
16381638
"h_artificialMorphMovement",
16391639
{"or": [
1640-
"canConsecutiveWalljump",
1640+
"canConsecutiveWallJump",
16411641
"SpaceJump",
16421642
{"and": [
16431643
{"blueSuitShinecharge": {}},
@@ -1733,7 +1733,7 @@
17331733
{"itemNotCollectedAtNode": 4},
17341734
"h_artificialMorphSpringBall",
17351735
{"or": [
1736-
"canConsecutiveWalljump",
1736+
"canConsecutiveWallJump",
17371737
"SpaceJump",
17381738
{"and": [
17391739
{"blueSuitShinecharge": {}},

‎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",

0 commit comments

Comments
 (0)