Skip to content

Commit 18fcc6e

Browse files
osse101osse101
authored
Merge pull request #1770 from kjbranch/suitless-maridia
Slightly Refine canSuitlessMaridia
2 parents 3f603a5 + 1f6596b commit 18fcc6e

27 files changed

Lines changed: 91 additions & 143 deletions

‎region/crateria/east/East Ocean.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,6 @@
811811
"link": [3, 1],
812812
"name": "Base Suitless",
813813
"requires": [
814-
"canSuitlessMaridia",
815814
"HiJump"
816815
]
817816
},
@@ -820,7 +819,6 @@
820819
"link": [3, 1],
821820
"name": "Suitless with Space Jump",
822821
"requires": [
823-
"canSuitlessMaridia",
824822
"canSpaceJumpWaterBounce",
825823
{"or": [
826824
"canWalljump",
@@ -875,7 +873,6 @@
875873
"link": [3, 1],
876874
"name": "Bomb Jump Water Escape",
877875
"requires": [
878-
"canSuitlessMaridia",
879876
"canBombJumpWaterEscape"
880877
]
881878
},
@@ -984,7 +981,6 @@
984981
"link": [3, 4],
985982
"name": "Base Suitless",
986983
"requires": [
987-
"canSuitlessMaridia",
988984
"HiJump"
989985
]
990986
},
@@ -1067,7 +1063,6 @@
10671063
"link": [4, 2],
10681064
"name": "Suitless Frozen Choot, Spring Ball, Space Jump",
10691065
"requires": [
1070-
"canSuitlessMaridia",
10711066
"canTrickyUseFrozenEnemies",
10721067
"canTrickySpringBallJump",
10731068
{"or": [
@@ -1337,7 +1332,6 @@
13371332
"link": [4, 3],
13381333
"name": "Base Suitless",
13391334
"requires": [
1340-
"canSuitlessMaridia",
13411335
"HiJump"
13421336
]
13431337
},

‎region/crateria/east/The Moat.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,6 @@
986986
"name": "Gravity Jump",
987987
"requires": [
988988
"canGravityJump",
989-
"canSuitlessMaridia",
990989
{"obstaclesNotCleared": ["A", "B", "C"]}
991990
]
992991
},

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,10 +1340,6 @@
13401340
"HiJump",
13411341
"canSpringBallJumpMidAir"
13421342
]}
1343-
],
1344-
"devNote": [
1345-
"This isn't requiring canSuitlessMaridia because it reduces the likelihood of entering from the top being a logical softlock.",
1346-
"Also it's not very elaborate suitless execution"
13471343
]
13481344
},
13491345
{
@@ -1387,7 +1383,6 @@
13871383
"link": [5, 5],
13881384
"name": "Base",
13891385
"requires": [
1390-
"h_canNavigateUnderwater",
13911386
{"or": [
13921387
"h_canUsePowerBombs",
13931388
{"and": [
@@ -1416,7 +1411,6 @@
14161411
"link": [5, 6],
14171412
"name": "Base",
14181413
"requires": [
1419-
"h_canNavigateUnderwater",
14201414
{"obstaclesCleared": ["A"]},
14211415
{"or": [
14221416
"Gravity",

‎region/maridia/inner-green/Pants Room.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,6 @@
703703
"link": [5, 2],
704704
"name": "Suitless",
705705
"requires": [
706-
"canSuitlessMaridia",
707706
{"or": [
708707
{"and": [
709708
"canSpaceJumpWaterBounce",

‎region/maridia/inner-green/Spring Ball Room.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
"link": [1, 2],
8181
"name": "Spring Ball",
8282
"requires": [
83-
"h_canNavigateUnderwater",
8483
"h_canUseSpringBall"
8584
]
8685
},
@@ -89,7 +88,6 @@
8988
"link": [1, 2],
9089
"name": "R Jump",
9190
"requires": [
92-
"h_canNavigateUnderwater",
9391
"canXRayStandUp",
9492
"canPartialFloorClip",
9593
"canRJump"
@@ -178,7 +176,6 @@
178176
"link": [2, 1],
179177
"name": "Suitless Space Jump",
180178
"requires": [
181-
"canSuitlessMaridia",
182179
"HiJump",
183180
"canSpaceJumpWaterBounce",
184181
"can4HighMidAirMorph"
@@ -190,7 +187,6 @@
190187
"link": [2, 1],
191188
"name": "Suitless, Bootless, Bomb into Springball Jump",
192189
"requires": [
193-
"canSuitlessMaridia",
194190
"canSunkenTileWideWallClimb",
195191
"canUnderwaterBombIntoSpringBallJump",
196192
"canWallJumpInstantMorph"
@@ -206,7 +202,6 @@
206202
"name": "Escape - Suitless, Bootless, Space Jump",
207203
"requires": [
208204
{"notable": "Escape - Suitless, Bootless, Space Jump"},
209-
"canSuitlessMaridia",
210205
"canSpringBallJumpMidAir",
211206
"canSunkenTileWideWallClimb",
212207
"canTrickyJump",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@
319319
"name": "Insane Bomb Jump",
320320
"requires": [
321321
{"notable": "Insane Bomb Jump"},
322-
"canSuitlessMaridia",
323322
"canTrickyJump",
324323
"canSandfallBounce",
325324
"h_canUseMorphBombs",

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,6 @@
643643
}
644644
},
645645
"requires": [
646-
"canSuitlessMaridia",
647646
"h_canUsePowerBombs",
648647
"canStutterWaterShineCharge",
649648
"canShinechargeMovement",
@@ -820,7 +819,6 @@
820819
}
821820
},
822821
"requires": [
823-
"canSuitlessMaridia",
824822
"canShinechargeMovementComplex",
825823
"canStutterWaterShineCharge",
826824
"h_canShineChargeMaxRunway",
@@ -922,7 +920,6 @@
922920
}
923921
},
924922
"requires": [
925-
"canSuitlessMaridia",
926923
"canShinechargeMovementComplex",
927924
"canWaterShineCharge",
928925
"canHorizontalShinespark",
@@ -942,9 +939,7 @@
942939
"id": 34,
943940
"link": [2, 4],
944941
"name": "Base",
945-
"requires": [
946-
"h_canNavigateUnderwater"
947-
]
942+
"requires": []
948943
},
949944
{
950945
"id": 35,
@@ -2627,7 +2622,6 @@
26272622
"link": [9, 1],
26282623
"name": "Suitless",
26292624
"requires": [
2630-
"canSuitlessMaridia",
26312625
"h_canBombThings"
26322626
]
26332627
},

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,7 @@
315315
"id": 12,
316316
"link": [1, 2],
317317
"name": "Base",
318-
"requires": [
319-
"h_canNavigateUnderwater"
320-
]
318+
"requires": []
321319
},
322320
{
323321
"id": 13,

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@
613613
"requires": [
614614
"canSuitlessMaridia",
615615
"canHorizontalShinespark",
616+
"canShinechargeMovement",
616617
{"shinespark": {
617618
"frames": 159,
618619
"excessFrames": 43
@@ -1069,7 +1070,6 @@
10691070
"name": "Sand Grapple Boost",
10701071
"requires": [
10711072
{"notable": "Sand Grapple Boost"},
1072-
"canSuitlessMaridia",
10731073
"h_canCrouchJumpDownGrab",
10741074
"canSandGrappleBoost",
10751075
"canInsaneJump",
@@ -1090,7 +1090,6 @@
10901090
"link": [1, 5],
10911091
"name": "Sand Bomb Boost",
10921092
"requires": [
1093-
"canSuitlessMaridia",
10941093
"canDownGrab",
10951094
"canSandBombBoost",
10961095
"canInsaneJump"
@@ -1228,6 +1227,7 @@
12281227
"requires": [
12291228
"canSuitlessMaridia",
12301229
"canHorizontalShinespark",
1230+
"canShinechargeMovement",
12311231
{"shinespark": {
12321232
"frames": 147,
12331233
"excessFrames": 15
@@ -1946,7 +1946,6 @@
19461946
"link": [4, 6],
19471947
"name": "Sand Grapple Boost",
19481948
"requires": [
1949-
"canSuitlessMaridia",
19501949
"h_canCrouchJumpDownGrab",
19511950
"canSandGrappleBoost",
19521951
"canInsaneJump"
@@ -1963,7 +1962,6 @@
19631962
"link": [4, 6],
19641963
"name": "Sand Bomb Boost",
19651964
"requires": [
1966-
"canSuitlessMaridia",
19671965
"h_canCrouchJumpDownGrab",
19681966
"canSandBombBoost",
19691967
"canInsaneJump"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,7 @@
378378
"hits": 2
379379
}}
380380
]}
381-
],
382-
"devNote": "No water involved here, so no need for Gravity or canSuitlessMaridia."
381+
]
383382
},
384383
{
385384
"id": 14,

0 commit comments

Comments
 (0)