Skip to content

Commit 9a5acf2

Browse files
osse101osse101
authored
Merge pull request #2269 from blkerby/maridia-west-flash-suit
West Maridia check flash suits
2 parents 225e683 + eef15a7 commit 9a5acf2

12 files changed

Lines changed: 1389 additions & 505 deletions

‎region/maridia/outer/Boyon Gate Hall.json‎

Lines changed: 77 additions & 37 deletions
Large diffs are not rendered by default.

‎region/maridia/outer/Crab Gate Room.json‎

Lines changed: 57 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
"steepUpTiles": 2,
8989
"steepDownTiles": 1
9090
}
91-
}
91+
},
92+
"flashSuitChecked": true
9293
},
9394
{
9495
"id": 2,
@@ -105,15 +106,15 @@
105106
"length": 45,
106107
"openEnd": 1
107108
}
108-
}
109+
},
110+
"flashSuitChecked": true
109111
},
110112
{
111113
"id": 3,
112114
"link": [1, 1],
113115
"name": "Precise Stutter Shinecharge, Leave With Spark",
114116
"entranceCondition": {
115-
"comeInRunning": {
116-
"speedBooster": true,
117+
"comeInStutterShinecharging": {
117118
"minTiles": 2
118119
}
119120
},
@@ -128,7 +129,8 @@
128129
"unlocksDoors": [
129130
{"types": ["super"], "requires": []},
130131
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
131-
]
132+
],
133+
"flashSuitChecked": true
132134
},
133135
{
134136
"id": 37,
@@ -156,6 +158,7 @@
156158
{"types": ["super"], "requires": []},
157159
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
158160
],
161+
"flashSuitChecked": true,
159162
"note": [
160163
"With a runway of 5 tiles (open end) in the other room,",
161164
"the ideal timing for the stutter is to release forward for 5 frames, and repress forward on the last possible frame before the transition.",
@@ -190,6 +193,7 @@
190193
{"types": ["super"], "requires": []},
191194
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
192195
],
196+
"flashSuitChecked": true,
193197
"note": [
194198
"With only a runway of 4 tiles (open end) in the other room,",
195199
"the ideal timing for the stutter is to release forward for 4 frames, and repress forward on the last possible frame before the transition.",
@@ -226,6 +230,7 @@
226230
{"types": ["super"], "requires": []},
227231
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
228232
],
233+
"flashSuitChecked": true,
229234
"note": [
230235
"With only a runway of 3 tiles (open end) in the other room,",
231236
"the ideal timing for the stutter is to release forward for 3 or 4 frames, and repress forward on the last possible frame before the transition.",
@@ -265,6 +270,7 @@
265270
{"types": ["super"], "requires": []},
266271
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
267272
],
273+
"flashSuitChecked": true,
268274
"note": [
269275
"With only a runway of 2 tiles (open end) in the other room,",
270276
"the ideal timing for the stutter is to release forward for 3 frames, and repress forward on the last possible frame before the transition.",
@@ -297,6 +303,7 @@
297303
{"types": ["super"], "requires": []},
298304
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
299305
],
306+
"flashSuitChecked": true,
300307
"note": [
301308
"With only 1 tile of runway in the other room, Samus should ideally start on the last pixel of runway with X subpixels of $3FFF or less.",
302309
"Run toward the door, releasing forward for exactly 1 frame and pressing it again on the last possible frame before the transition.",
@@ -342,7 +349,8 @@
342349
"exitCondition": {
343350
"leaveWithTemporaryBlue": {}
344351
},
345-
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
352+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
353+
"flashSuitChecked": true
346354
},
347355
{
348356
"id": 43,
@@ -363,6 +371,7 @@
363371
"leaveWithTemporaryBlue": {}
364372
},
365373
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
374+
"flashSuitChecked": true,
366375
"note": [
367376
"With only 1 tile of runway in the other room, Samus should ideally start on the last pixel of runway with X subpixels of $3FFF or less.",
368377
"Run toward the door, releasing forward for exactly 1 frame and pressing it again on the last possible frame before the transition.",
@@ -419,7 +428,8 @@
419428
]}
420429
],
421430
"resetsObstacles": ["A"],
422-
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}]
431+
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}],
432+
"flashSuitChecked": true
423433
},
424434
{
425435
"id": 6,
@@ -460,7 +470,8 @@
460470
{"obstaclesCleared": ["A"]}
461471
]}
462472
],
463-
"clearsObstacles": ["A"]
473+
"clearsObstacles": ["A"],
474+
"flashSuitChecked": true
464475
},
465476
{
466477
"id": 10,
@@ -556,6 +567,7 @@
556567
},
557568
"requires": [],
558569
"clearsObstacles": ["A"],
570+
"flashSuitChecked": true,
559571
"note": ["Samus will teleport inside of the gate, causing it to open."]
560572
},
561573
{
@@ -617,7 +629,8 @@
617629
"blockPositions": [[5, 3], [7, 2]]
618630
}
619631
},
620-
"requires": []
632+
"requires": [],
633+
"flashSuitChecked": true
621634
},
622635
{
623636
"link": [2, 1],
@@ -646,7 +659,8 @@
646659
}
647660
},
648661
"requires": [],
649-
"bypassesDoorShell": true
662+
"bypassesDoorShell": true,
663+
"flashSuitChecked": true
650664
},
651665
{
652666
"id": 18,
@@ -663,7 +677,8 @@
663677
"blockPositions": [[3, 12]]
664678
}
665679
},
666-
"bypassesDoorShell": true
680+
"bypassesDoorShell": true,
681+
"flashSuitChecked": true
667682
},
668683
{
669684
"id": 19,
@@ -680,7 +695,8 @@
680695
"blockPositions": [[3, 13]]
681696
}
682697
},
683-
"bypassesDoorShell": true
698+
"bypassesDoorShell": true,
699+
"flashSuitChecked": true
684700
},
685701
{
686702
"id": 20,
@@ -692,7 +708,8 @@
692708
"length": 5,
693709
"openEnd": 1
694710
}
695-
}
711+
},
712+
"flashSuitChecked": true
696713
},
697714
{
698715
"id": 21,
@@ -706,7 +723,8 @@
706723
"length": 6,
707724
"openEnd": 1
708725
}
709-
}
726+
},
727+
"flashSuitChecked": true
710728
},
711729
{
712730
"id": 22,
@@ -753,7 +771,8 @@
753771
]}
754772
],
755773
"resetsObstacles": ["A"],
756-
"farmCycleDrops": [{"enemy": "Sciser", "count": 5}]
774+
"farmCycleDrops": [{"enemy": "Sciser", "count": 5}],
775+
"flashSuitChecked": true
757776
},
758777
{
759778
"id": 23,
@@ -800,7 +819,8 @@
800819
},
801820
"minExtraRunSpeed": "$0.D"
802821
}
803-
}
822+
},
823+
"flashSuitChecked": true
804824
},
805825
{
806826
"id": 26,
@@ -813,12 +833,13 @@
813833
"exitCondition": {
814834
"leaveSpinning": {
815835
"remoteRunway": {
816-
"length": 43,
836+
"length": 45,
817837
"openEnd": 1
818838
},
819839
"minExtraRunSpeed": "$0.D"
820840
}
821-
}
841+
},
842+
"flashSuitChecked": true
822843
},
823844
{
824845
"id": 27,
@@ -838,7 +859,8 @@
838859
"openEnd": 1
839860
}
840861
}
841-
}
862+
},
863+
"flashSuitChecked": true
842864
},
843865
{
844866
"id": 28,
@@ -851,15 +873,16 @@
851873
"exitCondition": {
852874
"leaveWithMockball": {
853875
"remoteRunway": {
854-
"length": 43,
876+
"length": 45,
855877
"openEnd": 1
856878
},
857879
"landingRunway": {
858880
"length": 5,
859881
"openEnd": 1
860882
}
861883
}
862-
}
884+
},
885+
"flashSuitChecked": true
863886
},
864887
{
865888
"id": 29,
@@ -880,7 +903,8 @@
880903
},
881904
"movementType": "uncontrolled"
882905
}
883-
}
906+
},
907+
"flashSuitChecked": true
884908
},
885909
{
886910
"id": 30,
@@ -893,7 +917,7 @@
893917
"exitCondition": {
894918
"leaveWithSpringBallBounce": {
895919
"remoteRunway": {
896-
"length": 43,
920+
"length": 45,
897921
"openEnd": 1
898922
},
899923
"landingRunway": {
@@ -902,7 +926,8 @@
902926
},
903927
"movementType": "uncontrolled"
904928
}
905-
}
929+
},
930+
"flashSuitChecked": true
906931
},
907932
{
908933
"id": 31,
@@ -918,7 +943,8 @@
918943
"openEnd": 1
919944
}
920945
}
921-
}
946+
},
947+
"flashSuitChecked": true
922948
},
923949
{
924950
"id": 32,
@@ -931,24 +957,26 @@
931957
"exitCondition": {
932958
"leaveSpaceJumping": {
933959
"remoteRunway": {
934-
"length": 43,
960+
"length": 45,
935961
"openEnd": 1
936962
}
937963
}
938-
}
964+
},
965+
"flashSuitChecked": true
939966
},
940967
{
941968
"id": 33,
942969
"link": [2, 2],
943970
"name": "Leave With Temporary Blue",
944971
"requires": [
945972
"Gravity",
946-
{"canShineCharge": {"usedTiles": 43, "steepDownTiles": 1, "openEnd": 0}},
973+
{"canShineCharge": {"usedTiles": 45, "steepDownTiles": 1, "openEnd": 0}},
947974
"canChainTemporaryBlue"
948975
],
949976
"exitCondition": {
950977
"leaveWithTemporaryBlue": {}
951-
}
978+
},
979+
"flashSuitChecked": true
952980
},
953981
{
954982
"id": 34,

0 commit comments

Comments
 (0)