Skip to content

Spikesuit cleanup - rename to patient / tricky where appropriate. #2510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
osse101 merged 4 commits into from
Dec 16, 2025
+41 −46
Merged

Spikesuit cleanup - rename to patient / tricky where appropriate. #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb7287a
Update Spikesuits with difficulty levels.
nn357 Dec 10, 2025
1d9dbc2
Update Wrecked Ship East Super Room.json
nn357 Dec 10, 2025
dfce80b
Update Etecoon Energy Tank Room.json
nn357 Dec 10, 2025
fc5e791
Merge branch 'master' into spikesuit_cleanup
nn357 Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions region/brinstar/green/Etecoon Energy Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,10 +779,7 @@
"canRiskySpikeSuit",
{"shinespark": {"frames": 12, "excessFrames": 12}}
],
"flashSuitChecked": true,
"devNote": [
"The `canBeVeryPatient` is for difficulty placement, as it may be required to get in a single attempt."
]
"flashSuitChecked": true
},
{
"id": 24,
Expand Down Expand Up @@ -1085,7 +1082,7 @@
]},
{"shineChargeFrames": 80},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"resetsObstacles": ["A", "B", "R-Mode"],
Expand Down Expand Up @@ -1119,7 +1116,7 @@
]}
]},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"resetsObstacles": ["A", "B", "R-Mode"],
Expand Down Expand Up @@ -1765,7 +1762,7 @@
]},
{"shineChargeFrames": 60},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"resetsObstacles": ["A", "B", "R-Mode"],
Expand Down Expand Up @@ -1799,7 +1796,7 @@
]}
]},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"resetsObstacles": ["A", "B", "R-Mode"],
Expand Down
22 changes: 11 additions & 11 deletions region/brinstar/kraid/Kraid Eye Door Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
"requires": [
{"shineChargeFrames": 75},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
],
"flashSuitChecked": true,
Expand All @@ -218,7 +218,7 @@
},
"requires": [
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
],
"flashSuitChecked": true,
Expand All @@ -235,7 +235,7 @@
"canUseFlashSuitInitialSpark",
{"shineChargeFrames": 125},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 19}}
],
"exitCondition": {
Expand Down Expand Up @@ -265,7 +265,7 @@
"requires": [
"canUseFlashSuitInitialSpark",
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 19}}
],
"exitCondition": {
Expand All @@ -291,7 +291,7 @@
"canUseFlashSuitInitialSpark",
"canTrickyCarryFlashSuit",
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 19}}
],
"exitCondition": {
Expand Down Expand Up @@ -822,7 +822,7 @@
"canDownBack",
"canShinechargeMovementTricky",
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 19}}
],
"exitCondition": {
Expand Down Expand Up @@ -908,7 +908,7 @@
"canDownBack",
"canShinechargeMovementTricky",
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
],
"flashSuitChecked": true,
Expand Down Expand Up @@ -1266,7 +1266,7 @@
"requires": [
{"shineChargeFrames": 65},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 5, "excessFrames": 5}}
],
"flashSuitChecked": true,
Expand All @@ -1284,7 +1284,7 @@
},
"requires": [
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 5, "excessFrames": 5}}
],
"flashSuitChecked": true,
Expand All @@ -1301,7 +1301,7 @@
"canUseFlashSuitInitialSpark",
{"shineChargeFrames": 105},
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 13}}
],
"exitCondition": {
Expand Down Expand Up @@ -1331,7 +1331,7 @@
"requires": [
"canUseFlashSuitInitialSpark",
{"thornHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 13}}
],
"exitCondition": {
Expand Down
4 changes: 2 additions & 2 deletions region/brinstar/red/Below Spazer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
]},
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 5, "excessFrames": 5}}
],
"flashSuitChecked": true
Expand Down Expand Up @@ -591,7 +591,7 @@
]},
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 5, "excessFrames": 5}}
],
"flashSuitChecked": true
Expand Down
6 changes: 2 additions & 4 deletions region/brinstar/red/Skree Boost Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
{"shineChargeFrames": 155},
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 7, "excessFrames": 7}}
],
"flashSuitChecked": true
Expand Down Expand Up @@ -577,7 +577,7 @@
{"shineChargeFrames": 60},
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 7, "excessFrames": 7}}
],
"flashSuitChecked": true
Expand All @@ -589,9 +589,7 @@
"requires": [
"Gravity",
"h_thornXModeSpikeSuit",
"h_spikeSuitThornHitLeniency",
"h_thornXModeFramePerfectExtraLeniency",
"canSpikeSuit",
{"shinespark": {"frames": 7, "excessFrames": 7}}
],
"flashSuitChecked": true
Expand Down
4 changes: 2 additions & 2 deletions region/crateria/central/Crateria Power Bomb Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"canMidAirMorph",
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canTrickySpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand Down Expand Up @@ -225,7 +225,7 @@
"canMidAirMorph",
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canTrickySpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand Down
10 changes: 5 additions & 5 deletions region/lowernorfair/east/Wasteland.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
{"shineChargeFrames": 140},
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
],
"flashSuitChecked": true
Expand All @@ -359,7 +359,7 @@
]},
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
],
"flashSuitChecked": true
Expand Down Expand Up @@ -550,7 +550,7 @@
{"shineChargeFrames": 75},
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 3, "excessFrames": 3}}
],
"flashSuitChecked": true
Expand Down Expand Up @@ -750,7 +750,7 @@
{"shineChargeFrames": 175},
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canTrickySpikeSuit",
{"shinespark": {"frames": 5, "excessFrames": 5}}
],
"flashSuitChecked": true
Expand Down Expand Up @@ -1021,7 +1021,7 @@
"canOffScreenMovement",
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canTrickySpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
],
"flashSuitChecked": true
Expand Down
4 changes: 2 additions & 2 deletions region/norfair/east/Spiky Platforms Tunnel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
{"heatFrames": 750},
{"shineChargeFrames": 75},
"h_spikeSuitSpikeHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1}},
{"lavaFrames": 40}
],
Expand Down Expand Up @@ -699,7 +699,7 @@
{"heatFrames": 750},
{"shineChargeFrames": 75},
"h_spikeSuitSpikeHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1}},
{"lavaFrames": 40}
],
Expand Down
4 changes: 2 additions & 2 deletions region/wreckedship/main/Bowling Alley.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@
{"shineChargeFrames": 65},
{"spikeHits": 1},
"h_spikeSuitSpikeHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 3, "excessFrames": 3}}
],
"flashSuitChecked": true
Expand All @@ -847,7 +847,7 @@
{"shineChargeFrames": 90},
{"spikeHits": 1},
"h_spikeSuitSpikeHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 7}}
],
"exitCondition": {
Expand Down
4 changes: 2 additions & 2 deletions region/wreckedship/main/Robot Assembly Line.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
{"shineChargeFrames": 75},
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 6, "excessFrames": 6}}
],
"flashSuitChecked": true
Expand All @@ -158,7 +158,7 @@
"requires": [
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 6, "excessFrames": 6}}
],
"flashSuitChecked": true
Expand Down
8 changes: 4 additions & 4 deletions region/wreckedship/main/Spiky Death Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"f_DefeatedPhantoon",
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand All @@ -92,7 +92,7 @@
"canTrickyJump",
"canComplexCarryFlashSuit",
{"spikeHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand Down Expand Up @@ -908,7 +908,7 @@
"f_DefeatedPhantoon",
"h_spikeSuitSpikeHitLeniency",
{"spikeHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand All @@ -927,7 +927,7 @@
"canTrickyJump",
"canComplexCarryFlashSuit",
{"spikeHits": 1},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand Down
6 changes: 3 additions & 3 deletions region/wreckedship/main/Wrecked Ship East Super Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
"canShinechargeMovementTricky",
{"thornHits": 3}
]},
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand All @@ -433,7 +433,7 @@
{"shineChargeFrames": 55},
{"spikeHits": 1},
"h_spikeSuitSpikeHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
]},
{"and": [
Expand All @@ -445,7 +445,7 @@
]},
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
]}
]}
Expand Down
2 changes: 1 addition & 1 deletion region/wreckedship/main/Wrecked Ship Main Shaft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2274,7 +2274,7 @@
{"shineChargeFrames": 55},
{"thornHits": 1},
"h_spikeSuitThornHitLeniency",
"canSpikeSuit",
"canPatientSpikeSuit",
{"shinespark": {"frames": 1, "excessFrames": 1}}
],
"flashSuitChecked": true
Expand Down