Skip to content

Commit 17ee806

Browse files
osse101osse101
authored
Merge pull request #2687 from blkerby/west-norfair-bluesuit-6
Rest of West Upper Norfair blue suit logic
2 parents cd7838c + c9f2761 commit 17ee806

2 files changed

Lines changed: 206 additions & 56 deletions

File tree

‎region/norfair/west/Ice Beam Trippers Room.json‎

Lines changed: 84 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
"openEnd": 1
5858
}
5959
},
60-
"flashSuitChecked": true
60+
"flashSuitChecked": true,
61+
"blueSuitChecked": true
6162
},
6263
{
6364
"id": 2,
@@ -73,7 +74,8 @@
7374
"openEnd": 1
7475
}
7576
},
76-
"flashSuitChecked": true
77+
"flashSuitChecked": true,
78+
"blueSuitChecked": true
7779
},
7880
{
7981
"id": 28,
@@ -92,7 +94,8 @@
9294
"minExtraRunSpeed": "$1.A"
9395
}
9496
},
95-
"flashSuitChecked": true
97+
"flashSuitChecked": true,
98+
"blueSuitChecked": true
9699
},
97100
{
98101
"id": 29,
@@ -120,7 +123,8 @@
120123
"minExtraRunSpeed": "$1.5"
121124
}
122125
},
123-
"flashSuitChecked": true
126+
"flashSuitChecked": true,
127+
"blueSuitChecked": true
124128
},
125129
{
126130
"id": 30,
@@ -144,7 +148,8 @@
144148
"movementType": "uncontrolled"
145149
}
146150
},
147-
"flashSuitChecked": true
151+
"flashSuitChecked": true,
152+
"blueSuitChecked": true
148153
},
149154
{
150155
"id": 31,
@@ -163,7 +168,8 @@
163168
"minExtraRunSpeed": "$1.A"
164169
}
165170
},
166-
"flashSuitChecked": true
171+
"flashSuitChecked": true,
172+
"blueSuitChecked": true
167173
},
168174
{
169175
"id": 3,
@@ -172,22 +178,29 @@
172178
"requires": [
173179
"h_heatedCrystalFlash"
174180
],
175-
"flashSuitChecked": true
181+
"flashSuitChecked": true,
182+
"blueSuitChecked": true
176183
},
177184
{
178185
"id": 4,
179186
"link": [1, 2],
180187
"name": "Base",
181188
"requires": [
182-
{"heatFrames": 185}
189+
{"heatFrames": 185},
190+
{"or": [
191+
"canDash",
192+
{"heatFrames": 125}
193+
]}
183194
],
184-
"flashSuitChecked": true
195+
"flashSuitChecked": true,
196+
"blueSuitChecked": true
185197
},
186198
{
187199
"id": 5,
188200
"link": [1, 2],
189201
"name": "Platforming and Leave with Runway",
190202
"requires": [
203+
"canDash",
191204
{"heatFrames": 170}
192205
],
193206
"exitCondition": {
@@ -207,7 +220,8 @@
207220
"requires": [{"heatFrames": 60}]
208221
}
209222
],
210-
"flashSuitChecked": true
223+
"flashSuitChecked": true,
224+
"blueSuitChecked": true
211225
},
212226
{
213227
"id": 6,
@@ -238,13 +252,15 @@
238252
{"types": ["powerbomb"], "requires": ["never"]}
239253
],
240254
"flashSuitChecked": true,
255+
"blueSuitChecked": true,
241256
"devNote": "Freezing two Trippers would also be possible."
242257
},
243258
{
244259
"id": 7,
245260
"link": [1, 2],
246261
"name": "Platforming and Leave with Frozen Tripper Runway",
247262
"requires": [
263+
"canDash",
248264
"canTrickyUseFrozenEnemies",
249265
{"heatFrames": 240}
250266
],
@@ -262,7 +278,8 @@
262278
{"types": ["super"], "requires": []},
263279
{"types": ["powerbomb"], "requires": ["never"]}
264280
],
265-
"flashSuitChecked": true
281+
"flashSuitChecked": true,
282+
"blueSuitChecked": true
266283
},
267284
{
268285
"id": 8,
@@ -275,11 +292,13 @@
275292
}
276293
},
277294
"requires": [
295+
"canDash",
278296
"SpaceJump",
279297
"canCarefulJump",
280298
{"heatFrames": 135}
281299
],
282-
"flashSuitChecked": true
300+
"flashSuitChecked": true,
301+
"blueSuitChecked": true
283302
},
284303
{
285304
"id": 20,
@@ -301,7 +320,8 @@
301320
{"types": ["super"], "requires": []},
302321
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
303322
],
304-
"flashSuitChecked": true
323+
"flashSuitChecked": true,
324+
"blueSuitChecked": true
305325
},
306326
{
307327
"id": 21,
@@ -323,7 +343,8 @@
323343
{"types": ["super"], "requires": []},
324344
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
325345
],
326-
"flashSuitChecked": true
346+
"flashSuitChecked": true,
347+
"blueSuitChecked": true
327348
},
328349
{
329350
"id": 26,
@@ -363,7 +384,8 @@
363384
"requires": [{"heatFrames": 50}]
364385
}
365386
],
366-
"flashSuitChecked": true
387+
"flashSuitChecked": true,
388+
"blueSuitChecked": true
367389
},
368390
{
369391
"id": 24,
@@ -378,22 +400,29 @@
378400
"requires": [
379401
"h_heatedGModeOpenDifferentDoor"
380402
],
381-
"flashSuitChecked": true
403+
"flashSuitChecked": true,
404+
"blueSuitChecked": true
382405
},
383406
{
384407
"id": 9,
385408
"link": [2, 1],
386409
"name": "Base",
387410
"requires": [
388-
{"heatFrames": 195}
411+
{"heatFrames": 195},
412+
{"or": [
413+
"canDash",
414+
{"heatFrames": 125}
415+
]}
389416
],
390-
"flashSuitChecked": true
417+
"flashSuitChecked": true,
418+
"blueSuitChecked": true
391419
},
392420
{
393421
"id": 10,
394422
"link": [2, 1],
395423
"name": "Platforming and Leave with Runway",
396424
"requires": [
425+
"canDash",
397426
{"heatFrames": 190}
398427
],
399428
"exitCondition": {
@@ -413,13 +442,15 @@
413442
"requires": [{"heatFrames": 60}]
414443
}
415444
],
416-
"flashSuitChecked": true
445+
"flashSuitChecked": true,
446+
"blueSuitChecked": true
417447
},
418448
{
419449
"id": 11,
420450
"link": [2, 1],
421451
"name": "Platforming and Leave with Frozen Tripper Runway",
422452
"requires": [
453+
"canDash",
423454
"canTrickyUseFrozenEnemies",
424455
{"heatFrames": 330}
425456
],
@@ -437,7 +468,8 @@
437468
{"types": ["super"], "requires": []},
438469
{"types": ["powerbomb"], "requires": ["never"]}
439470
],
440-
"flashSuitChecked": true
471+
"flashSuitChecked": true,
472+
"blueSuitChecked": true
441473
},
442474
{
443475
"id": 12,
@@ -450,11 +482,13 @@
450482
}
451483
},
452484
"requires": [
485+
"canDash",
453486
"SpaceJump",
454487
"canCarefulJump",
455488
{"heatFrames": 135}
456489
],
457-
"flashSuitChecked": true
490+
"flashSuitChecked": true,
491+
"blueSuitChecked": true
458492
},
459493
{
460494
"id": 22,
@@ -476,7 +510,8 @@
476510
{"types": ["super"], "requires": []},
477511
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
478512
],
479-
"flashSuitChecked": true
513+
"flashSuitChecked": true,
514+
"blueSuitChecked": true
480515
},
481516
{
482517
"id": 23,
@@ -498,7 +533,8 @@
498533
{"types": ["super"], "requires": []},
499534
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
500535
],
501-
"flashSuitChecked": true
536+
"flashSuitChecked": true,
537+
"blueSuitChecked": true
502538
},
503539
{
504540
"id": 27,
@@ -540,7 +576,8 @@
540576
"requires": [{"heatFrames": 50}]
541577
}
542578
],
543-
"flashSuitChecked": true
579+
"flashSuitChecked": true,
580+
"blueSuitChecked": true
544581
},
545582
{
546583
"id": 13,
@@ -554,7 +591,8 @@
554591
"requires": [
555592
{"heatFrames": 50}
556593
],
557-
"flashSuitChecked": true
594+
"flashSuitChecked": true,
595+
"blueSuitChecked": true
558596
},
559597
{
560598
"id": 14,
@@ -567,7 +605,8 @@
567605
},
568606
"requires": [],
569607
"bypassesDoorShell": "yes",
570-
"flashSuitChecked": true
608+
"flashSuitChecked": true,
609+
"blueSuitChecked": true
571610
},
572611
{
573612
"id": 15,
@@ -585,7 +624,8 @@
585624
}
586625
},
587626
"bypassesDoorShell": "yes",
588-
"flashSuitChecked": true
627+
"flashSuitChecked": true,
628+
"blueSuitChecked": true
589629
},
590630
{
591631
"id": 16,
@@ -603,7 +643,8 @@
603643
}
604644
},
605645
"bypassesDoorShell": "yes",
606-
"flashSuitChecked": true
646+
"flashSuitChecked": true,
647+
"blueSuitChecked": true
607648
},
608649
{
609650
"id": 25,
@@ -618,7 +659,8 @@
618659
"requires": [
619660
"h_heatedGModeOpenDifferentDoor"
620661
],
621-
"flashSuitChecked": true
662+
"flashSuitChecked": true,
663+
"blueSuitChecked": true
622664
},
623665
{
624666
"id": 17,
@@ -631,7 +673,8 @@
631673
"openEnd": 1
632674
}
633675
},
634-
"flashSuitChecked": true
676+
"flashSuitChecked": true,
677+
"blueSuitChecked": true
635678
},
636679
{
637680
"id": 18,
@@ -647,7 +690,8 @@
647690
"openEnd": 1
648691
}
649692
},
650-
"flashSuitChecked": true
693+
"flashSuitChecked": true,
694+
"blueSuitChecked": true
651695
},
652696
{
653697
"id": 32,
@@ -666,7 +710,8 @@
666710
"minExtraRunSpeed": "$1.A"
667711
}
668712
},
669-
"flashSuitChecked": true
713+
"flashSuitChecked": true,
714+
"blueSuitChecked": true
670715
},
671716
{
672717
"id": 33,
@@ -694,6 +739,7 @@
694739
}
695740
},
696741
"flashSuitChecked": true,
742+
"blueSuitChecked": true,
697743
"devNote": "FIXME: This and other strats could be added while starting from the left door to save heat frames."
698744
},
699745
{
@@ -718,7 +764,8 @@
718764
"movementType": "uncontrolled"
719765
}
720766
},
721-
"flashSuitChecked": true
767+
"flashSuitChecked": true,
768+
"blueSuitChecked": true
722769
},
723770
{
724771
"id": 35,
@@ -737,7 +784,8 @@
737784
"minExtraRunSpeed": "$1.A"
738785
}
739786
},
740-
"flashSuitChecked": true
787+
"flashSuitChecked": true,
788+
"blueSuitChecked": true
741789
},
742790
{
743791
"id": 19,
@@ -746,7 +794,8 @@
746794
"requires": [
747795
"h_heatedCrystalFlash"
748796
],
749-
"flashSuitChecked": true
797+
"flashSuitChecked": true,
798+
"blueSuitChecked": true
750799
}
751800
],
752801
"notables": [],

0 commit comments

Comments
 (0)