Skip to content

Commit f058fa5

Browse files
authored
Merge pull request #2265 from blkerby/ws-check-flash-suit
Wrecked Ship check flash suits
2 parents 9486325 + bb98a4d commit f058fa5

16 files changed

Lines changed: 670 additions & 277 deletions

region/wreckedship/main/Attic.json

Lines changed: 93 additions & 53 deletions
Large diffs are not rendered by default.

region/wreckedship/main/Basement.json

Lines changed: 63 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@
110110
"length": 3,
111111
"openEnd": 1
112112
}
113-
}
113+
},
114+
"flashSuitChecked": true
114115
},
115116
{
116117
"id": 2,
@@ -126,6 +127,7 @@
126127
"openEnd": 0
127128
}
128129
},
130+
"flashSuitChecked": true,
129131
"devNote": "The length is more similar to 5 with 0 open end, than 4 with 1."
130132
},
131133
{
@@ -141,6 +143,7 @@
141143
"openEnd": 0
142144
}
143145
},
146+
"flashSuitChecked": true,
144147
"note": [
145148
"One way to position the Atomic is to lure it to the right by standing on the ground,",
146149
"then jump over it and freeze it while standing in the corner on the ground once it is just under 2 tiles away from the ledge.",
@@ -173,6 +176,7 @@
173176
"obstruction": [3, 0]
174177
}
175178
},
179+
"flashSuitChecked": true,
176180
"devNote": ["Max extra run speed $7.0."]
177181
},
178182
{
@@ -196,6 +200,7 @@
196200
"obstruction": [5, 0]
197201
}
198202
},
203+
"flashSuitChecked": true,
199204
"devNote": [
200205
"Max extra run speed $7.0.",
201206
"The obstruction (from the Workrobot) actually extends between 4 and 5 tiles."
@@ -227,7 +232,8 @@
227232
"openEnd": 1
228233
}
229234
}
230-
}
235+
},
236+
"flashSuitChecked": true
231237
},
232238
{
233239
"id": 6,
@@ -245,7 +251,8 @@
245251
"openEnd": 1
246252
}
247253
}
248-
}
254+
},
255+
"flashSuitChecked": true
249256
},
250257
{
251258
"id": 7,
@@ -264,7 +271,8 @@
264271
},
265272
"movementType": "uncontrolled"
266273
}
267-
}
274+
},
275+
"flashSuitChecked": true
268276
},
269277
{
270278
"id": 8,
@@ -279,6 +287,7 @@
279287
}
280288
}
281289
},
290+
"flashSuitChecked": true,
282291
"devNote": "FIXME: Slightly longer runway can be used with power on; it's not clear yet if there's any application where this matters."
283292
},
284293
{
@@ -291,7 +300,8 @@
291300
],
292301
"exitCondition": {
293302
"leaveWithTemporaryBlue": {}
294-
}
303+
},
304+
"flashSuitChecked": true
295305
},
296306
{
297307
"id": 10,
@@ -330,7 +340,8 @@
330340
"id": 13,
331341
"link": [1, 2],
332342
"name": "Base",
333-
"requires": []
343+
"requires": [],
344+
"flashSuitChecked": true
334345
},
335346
{
336347
"id": 55,
@@ -472,7 +483,8 @@
472483
"id": 16,
473484
"link": [2, 1],
474485
"name": "Base",
475-
"requires": []
486+
"requires": [],
487+
"flashSuitChecked": true
476488
},
477489
{
478490
"id": 17,
@@ -516,6 +528,7 @@
516528
"direction": "right"
517529
}
518530
},
531+
"flashSuitChecked": true,
519532
"devNote": "A couple more tiles can be used if power is on, but this doesn't seem worth modeling."
520533
},
521534
{
@@ -539,7 +552,8 @@
539552
"leaveWithTemporaryBlue": {
540553
"direction": "left"
541554
}
542-
}
555+
},
556+
"flashSuitChecked": true
543557
},
544558
{
545559
"id": 21,
@@ -576,7 +590,8 @@
576590
]}
577591
],
578592
"resetsObstacles": ["A"],
579-
"farmCycleDrops": [{"enemy": "Atomic", "count": 3}]
593+
"farmCycleDrops": [{"enemy": "Atomic", "count": 3}],
594+
"flashSuitChecked": true
580595
},
581596
{
582597
"id": 22,
@@ -587,7 +602,8 @@
587602
"leaveWithDoorFrameBelow": {
588603
"height": 2
589604
}
590-
}
605+
},
606+
"flashSuitChecked": true
591607
},
592608
{
593609
"id": 23,
@@ -601,6 +617,7 @@
601617
"rightPosition": 5.5
602618
}
603619
},
620+
"flashSuitChecked": true,
604621
"devNote": "We could add another jumpway (or two) for the long platform below but it does not yet seem to have an application."
605622
},
606623
{
@@ -720,7 +737,8 @@
720737
]}
721738
]}
722739
],
723-
"clearsObstacles": ["A"]
740+
"clearsObstacles": ["A"],
741+
"flashSuitChecked": true
724742
},
725743
{
726744
"id": 29,
@@ -732,6 +750,7 @@
732750
"f_DefeatedPhantoon"
733751
],
734752
"clearsObstacles": ["A"],
753+
"flashSuitChecked": true,
735754
"note": [
736755
"This speedball is easier with Phantoon dead, since you can push the robots all the way left.",
737756
"It's even possible to setup the short hop mockball by bonking the center platform."
@@ -746,6 +765,7 @@
746765
"canSpeedball"
747766
],
748767
"clearsObstacles": ["A"],
768+
"flashSuitChecked": true,
749769
"note": "This speedball is harder with Phantoon alive and has a shorter runway because of the robot standing in the way."
750770
},
751771
{
@@ -770,6 +790,7 @@
770790
}
771791
},
772792
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
793+
"flashSuitChecked": true,
773794
"devNote": "Higher run speed can be used, especially if power is on, but it is more difficult and not clear yet if it's worth modeling."
774795
},
775796
{
@@ -784,7 +805,8 @@
784805
"exitCondition": {
785806
"leaveWithTemporaryBlue": {}
786807
},
787-
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
808+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
809+
"flashSuitChecked": true
788810
},
789811
{
790812
"id": 33,
@@ -848,7 +870,8 @@
848870
"blockPositions": [[7, 2]]
849871
}
850872
},
851-
"requires": []
873+
"requires": [],
874+
"flashSuitChecked": true
852875
},
853876
{
854877
"id": 36,
@@ -860,7 +883,8 @@
860883
}
861884
},
862885
"requires": [],
863-
"bypassesDoorShell": true
886+
"bypassesDoorShell": true,
887+
"flashSuitChecked": true
864888
},
865889
{
866890
"id": 37,
@@ -877,7 +901,8 @@
877901
"blockPositions": [[3, 12]]
878902
}
879903
},
880-
"bypassesDoorShell": true
904+
"bypassesDoorShell": true,
905+
"flashSuitChecked": true
881906
},
882907
{
883908
"id": 38,
@@ -894,7 +919,8 @@
894919
"blockPositions": [[3, 13]]
895920
}
896921
},
897-
"bypassesDoorShell": true
922+
"bypassesDoorShell": true,
923+
"flashSuitChecked": true
898924
},
899925
{
900926
"id": 39,
@@ -909,7 +935,8 @@
909935
]}
910936
]}
911937
],
912-
"clearsObstacles": ["A"]
938+
"clearsObstacles": ["A"],
939+
"flashSuitChecked": true
913940
},
914941
{
915942
"id": 40,
@@ -926,7 +953,8 @@
926953
"canCarefulJump",
927954
"canSlowShortCharge"
928955
],
929-
"clearsObstacles": ["A"]
956+
"clearsObstacles": ["A"],
957+
"flashSuitChecked": true
930958
},
931959
{
932960
"id": 41,
@@ -942,7 +970,8 @@
942970
"canChainTemporaryBlue",
943971
"canSpringBallBounce"
944972
],
945-
"clearsObstacles": ["A"]
973+
"clearsObstacles": ["A"],
974+
"flashSuitChecked": true
946975
},
947976
{
948977
"id": 42,
@@ -955,7 +984,8 @@
955984
"canChainTemporaryBlue",
956985
"canSpringBallBounce"
957986
],
958-
"clearsObstacles": ["A"]
987+
"clearsObstacles": ["A"],
988+
"flashSuitChecked": true
959989
},
960990
{
961991
"id": 43,
@@ -972,7 +1002,10 @@
9721002
"canTrickySpringBallBounce",
9731003
"canInsaneJump"
9741004
],
975-
"clearsObstacles": ["A"]
1005+
"clearsObstacles": ["A"],
1006+
"flashSuitChecked": true,
1007+
"note": ["Bounce directly into the morph tunnel."],
1008+
"detailNote": ["This version allows preserving a flash suit."]
9761009
},
9771010
{
9781011
"id": 44,
@@ -1016,7 +1049,8 @@
10161049
"length": 2,
10171050
"openEnd": 1
10181051
}
1019-
}
1052+
},
1053+
"flashSuitChecked": true
10201054
},
10211055
{
10221056
"id": 47,
@@ -1043,6 +1077,7 @@
10431077
"openEnd": 0
10441078
}
10451079
},
1080+
"flashSuitChecked": true,
10461081
"note": [
10471082
"Lure an Atomic from the left half of the room. Morph in the corner against the top stair and wait for the Atomic to approach.",
10481083
"Quickly unmorph just before and freeze the Atomic just after it hits Samus."
@@ -1070,7 +1105,8 @@
10701105
"blue": "any",
10711106
"movementType": "controlled"
10721107
}
1073-
}
1108+
},
1109+
"flashSuitChecked": true
10741110
},
10751111
{
10761112
"id": 58,
@@ -1100,6 +1136,7 @@
11001136
"movementType": "controlled"
11011137
}
11021138
},
1139+
"flashSuitChecked": true,
11031140
"note": [
11041141
"If power is off, kago inside the left Workrobot, gaining speed at the start of the run by running in place."
11051142
],
@@ -1129,6 +1166,7 @@
11291166
"obstruction": [4, 2]
11301167
}
11311168
},
1169+
"flashSuitChecked": true,
11321170
"devNote": [
11331171
"Max extra run speed $1.3.",
11341172
"This strat is included for completeness, though it apparently doesn't have any applications."
@@ -1147,7 +1185,8 @@
11471185
],
11481186
"exitCondition": {
11491187
"leaveWithSpark": {}
1150-
}
1188+
},
1189+
"flashSuitChecked": true
11511190
},
11521191
{
11531192
"id": 49,

0 commit comments

Comments
 (0)