Skip to content

Commit e9d4b3e

Browse files
osse101osse101
authored
Merge pull request #2510 from nn357/spikesuit_cleanup
Spikesuit cleanup - rename to patient / tricky where appropriate.
2 parents 8c73c47 + fc5e791 commit e9d4b3e

File tree

12 files changed

+41
-46
lines changed

12 files changed

+41
-46
lines changed

‎region/brinstar/green/Etecoon Energy Tank Room.json‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -779,10 +779,7 @@
779779
"canRiskySpikeSuit",
780780
{"shinespark": {"frames": 12, "excessFrames": 12}}
781781
],
782-
"flashSuitChecked": true,
783-
"devNote": [
784-
"The `canBeVeryPatient` is for difficulty placement, as it may be required to get in a single attempt."
785-
]
782+
"flashSuitChecked": true
786783
},
787784
{
788785
"id": 24,
@@ -1085,7 +1082,7 @@
10851082
]},
10861083
{"shineChargeFrames": 80},
10871084
{"thornHits": 1},
1088-
"canSpikeSuit",
1085+
"canPatientSpikeSuit",
10891086
{"shinespark": {"frames": 1, "excessFrames": 1}}
10901087
],
10911088
"resetsObstacles": ["A", "B", "R-Mode"],
@@ -1119,7 +1116,7 @@
11191116
]}
11201117
]},
11211118
{"thornHits": 1},
1122-
"canSpikeSuit",
1119+
"canPatientSpikeSuit",
11231120
{"shinespark": {"frames": 1, "excessFrames": 1}}
11241121
],
11251122
"resetsObstacles": ["A", "B", "R-Mode"],
@@ -1765,7 +1762,7 @@
17651762
]},
17661763
{"shineChargeFrames": 60},
17671764
{"thornHits": 1},
1768-
"canSpikeSuit",
1765+
"canPatientSpikeSuit",
17691766
{"shinespark": {"frames": 1, "excessFrames": 1}}
17701767
],
17711768
"resetsObstacles": ["A", "B", "R-Mode"],
@@ -1799,7 +1796,7 @@
17991796
]}
18001797
]},
18011798
{"thornHits": 1},
1802-
"canSpikeSuit",
1799+
"canPatientSpikeSuit",
18031800
{"shinespark": {"frames": 1, "excessFrames": 1}}
18041801
],
18051802
"resetsObstacles": ["A", "B", "R-Mode"],

‎region/brinstar/kraid/Kraid Eye Door Room.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"requires": [
201201
{"shineChargeFrames": 75},
202202
{"thornHits": 1},
203-
"canSpikeSuit",
203+
"canPatientSpikeSuit",
204204
{"shinespark": {"frames": 4, "excessFrames": 4}}
205205
],
206206
"flashSuitChecked": true,
@@ -218,7 +218,7 @@
218218
},
219219
"requires": [
220220
{"thornHits": 1},
221-
"canSpikeSuit",
221+
"canPatientSpikeSuit",
222222
{"shinespark": {"frames": 4, "excessFrames": 4}}
223223
],
224224
"flashSuitChecked": true,
@@ -235,7 +235,7 @@
235235
"canUseFlashSuitInitialSpark",
236236
{"shineChargeFrames": 125},
237237
{"thornHits": 1},
238-
"canSpikeSuit",
238+
"canPatientSpikeSuit",
239239
{"shinespark": {"frames": 19}}
240240
],
241241
"exitCondition": {
@@ -265,7 +265,7 @@
265265
"requires": [
266266
"canUseFlashSuitInitialSpark",
267267
{"thornHits": 1},
268-
"canSpikeSuit",
268+
"canPatientSpikeSuit",
269269
{"shinespark": {"frames": 19}}
270270
],
271271
"exitCondition": {
@@ -291,7 +291,7 @@
291291
"canUseFlashSuitInitialSpark",
292292
"canTrickyCarryFlashSuit",
293293
{"thornHits": 1},
294-
"canSpikeSuit",
294+
"canPatientSpikeSuit",
295295
{"shinespark": {"frames": 19}}
296296
],
297297
"exitCondition": {
@@ -822,7 +822,7 @@
822822
"canDownBack",
823823
"canShinechargeMovementTricky",
824824
{"thornHits": 1},
825-
"canSpikeSuit",
825+
"canPatientSpikeSuit",
826826
{"shinespark": {"frames": 19}}
827827
],
828828
"exitCondition": {
@@ -908,7 +908,7 @@
908908
"canDownBack",
909909
"canShinechargeMovementTricky",
910910
{"thornHits": 1},
911-
"canSpikeSuit",
911+
"canPatientSpikeSuit",
912912
{"shinespark": {"frames": 4, "excessFrames": 4}}
913913
],
914914
"flashSuitChecked": true,
@@ -1266,7 +1266,7 @@
12661266
"requires": [
12671267
{"shineChargeFrames": 65},
12681268
{"thornHits": 1},
1269-
"canSpikeSuit",
1269+
"canPatientSpikeSuit",
12701270
{"shinespark": {"frames": 5, "excessFrames": 5}}
12711271
],
12721272
"flashSuitChecked": true,
@@ -1284,7 +1284,7 @@
12841284
},
12851285
"requires": [
12861286
{"thornHits": 1},
1287-
"canSpikeSuit",
1287+
"canPatientSpikeSuit",
12881288
{"shinespark": {"frames": 5, "excessFrames": 5}}
12891289
],
12901290
"flashSuitChecked": true,
@@ -1301,7 +1301,7 @@
13011301
"canUseFlashSuitInitialSpark",
13021302
{"shineChargeFrames": 105},
13031303
{"thornHits": 1},
1304-
"canSpikeSuit",
1304+
"canPatientSpikeSuit",
13051305
{"shinespark": {"frames": 13}}
13061306
],
13071307
"exitCondition": {
@@ -1331,7 +1331,7 @@
13311331
"requires": [
13321332
"canUseFlashSuitInitialSpark",
13331333
{"thornHits": 1},
1334-
"canSpikeSuit",
1334+
"canPatientSpikeSuit",
13351335
{"shinespark": {"frames": 13}}
13361336
],
13371337
"exitCondition": {

‎region/brinstar/red/Below Spazer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
]},
117117
{"thornHits": 1},
118118
"h_spikeSuitThornHitLeniency",
119-
"canSpikeSuit",
119+
"canPatientSpikeSuit",
120120
{"shinespark": {"frames": 5, "excessFrames": 5}}
121121
],
122122
"flashSuitChecked": true
@@ -591,7 +591,7 @@
591591
]},
592592
{"thornHits": 1},
593593
"h_spikeSuitThornHitLeniency",
594-
"canSpikeSuit",
594+
"canPatientSpikeSuit",
595595
{"shinespark": {"frames": 5, "excessFrames": 5}}
596596
],
597597
"flashSuitChecked": true

‎region/brinstar/red/Skree Boost Room.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
{"shineChargeFrames": 155},
236236
{"thornHits": 1},
237237
"h_spikeSuitThornHitLeniency",
238-
"canSpikeSuit",
238+
"canPatientSpikeSuit",
239239
{"shinespark": {"frames": 7, "excessFrames": 7}}
240240
],
241241
"flashSuitChecked": true
@@ -577,7 +577,7 @@
577577
{"shineChargeFrames": 60},
578578
{"thornHits": 1},
579579
"h_spikeSuitThornHitLeniency",
580-
"canSpikeSuit",
580+
"canPatientSpikeSuit",
581581
{"shinespark": {"frames": 7, "excessFrames": 7}}
582582
],
583583
"flashSuitChecked": true
@@ -589,9 +589,7 @@
589589
"requires": [
590590
"Gravity",
591591
"h_thornXModeSpikeSuit",
592-
"h_spikeSuitThornHitLeniency",
593592
"h_thornXModeFramePerfectExtraLeniency",
594-
"canSpikeSuit",
595593
{"shinespark": {"frames": 7, "excessFrames": 7}}
596594
],
597595
"flashSuitChecked": true

‎region/crateria/central/Crateria Power Bomb Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"canMidAirMorph",
175175
"h_spikeSuitSpikeHitLeniency",
176176
{"spikeHits": 1},
177-
"canSpikeSuit",
177+
"canTrickySpikeSuit",
178178
{"shinespark": {"frames": 1, "excessFrames": 1}}
179179
],
180180
"flashSuitChecked": true
@@ -225,7 +225,7 @@
225225
"canMidAirMorph",
226226
"h_spikeSuitSpikeHitLeniency",
227227
{"spikeHits": 1},
228-
"canSpikeSuit",
228+
"canTrickySpikeSuit",
229229
{"shinespark": {"frames": 1, "excessFrames": 1}}
230230
],
231231
"flashSuitChecked": true

‎region/lowernorfair/east/Wasteland.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
{"shineChargeFrames": 140},
338338
"h_spikeSuitSpikeHitLeniency",
339339
{"spikeHits": 1},
340-
"canSpikeSuit",
340+
"canPatientSpikeSuit",
341341
{"shinespark": {"frames": 4, "excessFrames": 4}}
342342
],
343343
"flashSuitChecked": true
@@ -359,7 +359,7 @@
359359
]},
360360
"h_spikeSuitSpikeHitLeniency",
361361
{"spikeHits": 1},
362-
"canSpikeSuit",
362+
"canPatientSpikeSuit",
363363
{"shinespark": {"frames": 4, "excessFrames": 4}}
364364
],
365365
"flashSuitChecked": true
@@ -550,7 +550,7 @@
550550
{"shineChargeFrames": 75},
551551
"h_spikeSuitSpikeHitLeniency",
552552
{"spikeHits": 1},
553-
"canSpikeSuit",
553+
"canPatientSpikeSuit",
554554
{"shinespark": {"frames": 3, "excessFrames": 3}}
555555
],
556556
"flashSuitChecked": true
@@ -750,7 +750,7 @@
750750
{"shineChargeFrames": 175},
751751
"h_spikeSuitSpikeHitLeniency",
752752
{"spikeHits": 1},
753-
"canSpikeSuit",
753+
"canTrickySpikeSuit",
754754
{"shinespark": {"frames": 5, "excessFrames": 5}}
755755
],
756756
"flashSuitChecked": true
@@ -1021,7 +1021,7 @@
10211021
"canOffScreenMovement",
10221022
"h_spikeSuitSpikeHitLeniency",
10231023
{"spikeHits": 1},
1024-
"canSpikeSuit",
1024+
"canTrickySpikeSuit",
10251025
{"shinespark": {"frames": 4, "excessFrames": 4}}
10261026
],
10271027
"flashSuitChecked": true

‎region/norfair/east/Spiky Platforms Tunnel.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
{"heatFrames": 750},
9494
{"shineChargeFrames": 75},
9595
"h_spikeSuitSpikeHitLeniency",
96-
"canSpikeSuit",
96+
"canPatientSpikeSuit",
9797
{"shinespark": {"frames": 1}},
9898
{"lavaFrames": 40}
9999
],
@@ -699,7 +699,7 @@
699699
{"heatFrames": 750},
700700
{"shineChargeFrames": 75},
701701
"h_spikeSuitSpikeHitLeniency",
702-
"canSpikeSuit",
702+
"canPatientSpikeSuit",
703703
{"shinespark": {"frames": 1}},
704704
{"lavaFrames": 40}
705705
],

‎region/wreckedship/main/Bowling Alley.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@
829829
{"shineChargeFrames": 65},
830830
{"spikeHits": 1},
831831
"h_spikeSuitSpikeHitLeniency",
832-
"canSpikeSuit",
832+
"canPatientSpikeSuit",
833833
{"shinespark": {"frames": 3, "excessFrames": 3}}
834834
],
835835
"flashSuitChecked": true
@@ -847,7 +847,7 @@
847847
{"shineChargeFrames": 90},
848848
{"spikeHits": 1},
849849
"h_spikeSuitSpikeHitLeniency",
850-
"canSpikeSuit",
850+
"canPatientSpikeSuit",
851851
{"shinespark": {"frames": 7}}
852852
],
853853
"exitCondition": {

‎region/wreckedship/main/Robot Assembly Line.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
{"shineChargeFrames": 75},
141141
{"thornHits": 1},
142142
"h_spikeSuitThornHitLeniency",
143-
"canSpikeSuit",
143+
"canPatientSpikeSuit",
144144
{"shinespark": {"frames": 6, "excessFrames": 6}}
145145
],
146146
"flashSuitChecked": true
@@ -158,7 +158,7 @@
158158
"requires": [
159159
{"thornHits": 1},
160160
"h_spikeSuitThornHitLeniency",
161-
"canSpikeSuit",
161+
"canPatientSpikeSuit",
162162
{"shinespark": {"frames": 6, "excessFrames": 6}}
163163
],
164164
"flashSuitChecked": true

‎region/wreckedship/main/Spiky Death Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"f_DefeatedPhantoon",
7474
"h_spikeSuitSpikeHitLeniency",
7575
{"spikeHits": 1},
76-
"canSpikeSuit",
76+
"canPatientSpikeSuit",
7777
{"shinespark": {"frames": 1, "excessFrames": 1}}
7878
],
7979
"flashSuitChecked": true
@@ -92,7 +92,7 @@
9292
"canTrickyJump",
9393
"canComplexCarryFlashSuit",
9494
{"spikeHits": 1},
95-
"canSpikeSuit",
95+
"canPatientSpikeSuit",
9696
{"shinespark": {"frames": 1, "excessFrames": 1}}
9797
],
9898
"flashSuitChecked": true
@@ -908,7 +908,7 @@
908908
"f_DefeatedPhantoon",
909909
"h_spikeSuitSpikeHitLeniency",
910910
{"spikeHits": 1},
911-
"canSpikeSuit",
911+
"canPatientSpikeSuit",
912912
{"shinespark": {"frames": 1, "excessFrames": 1}}
913913
],
914914
"flashSuitChecked": true
@@ -927,7 +927,7 @@
927927
"canTrickyJump",
928928
"canComplexCarryFlashSuit",
929929
{"spikeHits": 1},
930-
"canSpikeSuit",
930+
"canPatientSpikeSuit",
931931
{"shinespark": {"frames": 1, "excessFrames": 1}}
932932
],
933933
"flashSuitChecked": true

0 commit comments

Comments
 (0)