Skip to content

Commit ea2c99b

Browse files
authored
Merge pull request #2338 from nn357/ws_mainshaft_spikesuits
add spikesuits to WS mainshaft.
2 parents 86c76ea + d2b6e99 commit ea2c99b

1 file changed

Lines changed: 42 additions & 1 deletion

File tree

region/wreckedship/main/Wrecked Ship Main Shaft.json

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@
335335
{
336336
"from": 8,
337337
"to": [
338-
{"id": 3}
338+
{"id": 3},
339+
{"id": 8}
339340
]
340341
}
341342
],
@@ -2261,6 +2262,33 @@
22612262
"Wait for Coverns to damage Samus down until Reserves trigger, forcing a stand up and enabling her to shoot the shot blocks and escape."
22622263
]
22632264
},
2265+
{
2266+
"link": [7, 7],
2267+
"name": "Come in Shinecharged, Gain Flash Suit (Spikesuit)",
2268+
"entranceCondition": {
2269+
"comeInShinecharged": {},
2270+
"comesThroughToilet": "any"
2271+
},
2272+
"requires": [
2273+
"f_DefeatedPhantoon",
2274+
{"shineChargeFrames": 55},
2275+
{"thornHits": 1},
2276+
"h_spikeSuitThornHitLeniency",
2277+
"canSpikeSuit",
2278+
{"shinespark": {"frames": 1, "excessFrames": 1}}
2279+
],
2280+
"flashSuitChecked": true
2281+
},
2282+
{
2283+
"link": [7, 7],
2284+
"name": "Gain Flash Suit (X-Mode Spikesuit)",
2285+
"requires": [
2286+
"f_DefeatedPhantoon",
2287+
"h_ThornXModeSpikeSuit",
2288+
{"shinespark": {"frames": 1, "excessFrames": 1}}
2289+
],
2290+
"flashSuitChecked": true
2291+
},
22642292
{
22652293
"id": 92,
22662294
"link": [7, 7],
@@ -2486,6 +2514,19 @@
24862514
],
24872515
"clearsObstacles": ["C"],
24882516
"flashSuitChecked": true
2517+
},
2518+
{
2519+
"link": [8, 8],
2520+
"name": "Gain Flash Suit (Spikesuit)",
2521+
"requires": [
2522+
"f_DefeatedPhantoon",
2523+
{"canShineCharge": {"usedTiles": 20, "steepDownTiles": 5, "openEnd": 0}},
2524+
{"spikeHits": 1},
2525+
"h_spikeSuitSpikeHitLeniency",
2526+
"canSpikeSuit",
2527+
{"shinespark": {"frames": 1, "excessFrames": 1}}
2528+
],
2529+
"flashSuitChecked": true
24892530
}
24902531
],
24912532
"notables": [

0 commit comments

Comments
 (0)