Skip to content

Commit 9455b6e

Browse files
osse101osse101
authored
Merge pull request #2676 from ampleyfly/topic-make-pure-enums
Make `bypassesDoorShell` and `speedBooster` pure string enums
2 parents fbabd2f + 7e9e44d commit 9455b6e

166 files changed

Lines changed: 1447 additions & 1346 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎region/brinstar/blue/Blue Brinstar Boulder Room.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@
756756
}
757757
},
758758
"requires": [],
759-
"bypassesDoorShell": true,
759+
"bypassesDoorShell": "yes",
760760
"flashSuitChecked": true,
761761
"blueSuitChecked": true
762762
},
@@ -775,7 +775,7 @@
775775
"blockPositions": [[3, 12]]
776776
}
777777
},
778-
"bypassesDoorShell": true,
778+
"bypassesDoorShell": "yes",
779779
"flashSuitChecked": true,
780780
"blueSuitChecked": true
781781
},
@@ -794,7 +794,7 @@
794794
"blockPositions": [[3, 13]]
795795
}
796796
},
797-
"bypassesDoorShell": true,
797+
"bypassesDoorShell": "yes",
798798
"flashSuitChecked": true,
799799
"blueSuitChecked": true
800800
},

‎region/brinstar/blue/Construction Zone.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
}
283283
},
284284
"requires": [],
285-
"bypassesDoorShell": true,
285+
"bypassesDoorShell": "yes",
286286
"flashSuitChecked": true,
287287
"blueSuitChecked": true
288288
},
@@ -301,7 +301,7 @@
301301
"blockPositions": [[12, 12]]
302302
}
303303
},
304-
"bypassesDoorShell": true,
304+
"bypassesDoorShell": "yes",
305305
"flashSuitChecked": true,
306306
"blueSuitChecked": true
307307
},
@@ -320,7 +320,7 @@
320320
"blockPositions": [[12, 13]]
321321
}
322322
},
323-
"bypassesDoorShell": true,
323+
"bypassesDoorShell": "yes",
324324
"flashSuitChecked": true,
325325
"blueSuitChecked": true
326326
},
@@ -462,7 +462,7 @@
462462
}
463463
},
464464
"requires": [],
465-
"bypassesDoorShell": true,
465+
"bypassesDoorShell": "yes",
466466
"flashSuitChecked": true,
467467
"blueSuitChecked": true
468468
},
@@ -481,7 +481,7 @@
481481
"blockPositions": [[3, 12]]
482482
}
483483
},
484-
"bypassesDoorShell": true,
484+
"bypassesDoorShell": "yes",
485485
"flashSuitChecked": true,
486486
"blueSuitChecked": true
487487
},
@@ -500,7 +500,7 @@
500500
"blockPositions": [[3, 13]]
501501
}
502502
},
503-
"bypassesDoorShell": true,
503+
"bypassesDoorShell": "yes",
504504
"flashSuitChecked": true,
505505
"blueSuitChecked": true
506506
},
@@ -516,7 +516,7 @@
516516
"requires": [
517517
"canXRayClimb"
518518
],
519-
"bypassesDoorShell": true,
519+
"bypassesDoorShell": "yes",
520520
"flashSuitChecked": true,
521521
"blueSuitChecked": true,
522522
"note": [
@@ -702,7 +702,7 @@
702702
}
703703
},
704704
"requires": [],
705-
"bypassesDoorShell": true,
705+
"bypassesDoorShell": "yes",
706706
"flashSuitChecked": true,
707707
"blueSuitChecked": true
708708
},
@@ -721,7 +721,7 @@
721721
"blockPositions": [[2, 18]]
722722
}
723723
},
724-
"bypassesDoorShell": true,
724+
"bypassesDoorShell": "yes",
725725
"flashSuitChecked": true,
726726
"blueSuitChecked": true
727727
},
@@ -740,7 +740,7 @@
740740
"blockPositions": [[2, 19]]
741741
}
742742
},
743-
"bypassesDoorShell": true,
743+
"bypassesDoorShell": "yes",
744744
"flashSuitChecked": true,
745745
"blueSuitChecked": true
746746
},
@@ -759,7 +759,7 @@
759759
"blockPositions": [[2, 28]]
760760
}
761761
},
762-
"bypassesDoorShell": true,
762+
"bypassesDoorShell": "yes",
763763
"flashSuitChecked": true,
764764
"blueSuitChecked": true
765765
},
@@ -778,7 +778,7 @@
778778
"blockPositions": [[2, 29]]
779779
}
780780
},
781-
"bypassesDoorShell": true,
781+
"bypassesDoorShell": "yes",
782782
"flashSuitChecked": true,
783783
"blueSuitChecked": true
784784
},
@@ -855,7 +855,7 @@
855855
"requires": [
856856
"canGModeXRayClimb"
857857
],
858-
"bypassesDoorShell": true,
858+
"bypassesDoorShell": "yes",
859859
"flashSuitChecked": true,
860860
"blueSuitChecked": true,
861861
"note": [
@@ -914,7 +914,7 @@
914914
}
915915
},
916916
"requires": [],
917-
"bypassesDoorShell": true,
917+
"bypassesDoorShell": "yes",
918918
"flashSuitChecked": true,
919919
"blueSuitChecked": true
920920
},
@@ -933,7 +933,7 @@
933933
"blockPositions": [[12, 12]]
934934
}
935935
},
936-
"bypassesDoorShell": true,
936+
"bypassesDoorShell": "yes",
937937
"flashSuitChecked": true,
938938
"blueSuitChecked": true
939939
},
@@ -952,7 +952,7 @@
952952
"blockPositions": [[12, 13]]
953953
}
954954
},
955-
"bypassesDoorShell": true,
955+
"bypassesDoorShell": "yes",
956956
"flashSuitChecked": true,
957957
"blueSuitChecked": true
958958
},

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@
15521552
}
15531553
},
15541554
"requires": [],
1555-
"bypassesDoorShell": true,
1555+
"bypassesDoorShell": "yes",
15561556
"flashSuitChecked": true,
15571557
"blueSuitChecked": true
15581558
},
@@ -1571,7 +1571,7 @@
15711571
"blockPositions": [[2, 34]]
15721572
}
15731573
},
1574-
"bypassesDoorShell": true,
1574+
"bypassesDoorShell": "yes",
15751575
"flashSuitChecked": true,
15761576
"blueSuitChecked": true
15771577
},

‎region/brinstar/green/Brinstar Pre-Map Room.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
}
418418
},
419419
"requires": [],
420-
"bypassesDoorShell": true,
420+
"bypassesDoorShell": "yes",
421421
"flashSuitChecked": true
422422
},
423423
{
@@ -435,7 +435,7 @@
435435
"blockPositions": [[3, 12]]
436436
}
437437
},
438-
"bypassesDoorShell": true,
438+
"bypassesDoorShell": "yes",
439439
"flashSuitChecked": true
440440
},
441441
{
@@ -453,7 +453,7 @@
453453
"blockPositions": [[3, 13]]
454454
}
455455
},
456-
"bypassesDoorShell": true,
456+
"bypassesDoorShell": "yes",
457457
"flashSuitChecked": true
458458
},
459459
{

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -741,23 +741,23 @@
741741
"minHeight": 1,
742742
"maxHeight": 1,
743743
"minTiles": 16,
744-
"speedBooster": true,
744+
"speedBooster": "yes",
745745
"obstructions": [[1, 0]],
746746
"note": ["This applies to Lava Dive."]
747747
},
748748
{
749749
"minHeight": 2,
750750
"maxHeight": 2,
751751
"minTiles": 27.4375,
752-
"speedBooster": true,
752+
"speedBooster": "yes",
753753
"obstructions": [[1, 0]],
754754
"note": ["This applies to Dust Torizo Room and Noob Bridge."]
755755
},
756756
{
757757
"minHeight": 3,
758758
"maxHeight": 3,
759759
"minTiles": 15.4375,
760-
"speedBooster": true,
760+
"speedBooster": "yes",
761761
"obstructions": [[1, 0]],
762762
"requires": [
763763
"HiJump",
@@ -769,7 +769,7 @@
769769
"minHeight": 3,
770770
"maxHeight": 3,
771771
"minTiles": 28.2472,
772-
"speedBooster": true,
772+
"speedBooster": "yes",
773773
"obstructions": [[1, 0]],
774774
"note": ["This applies to Double Chamber."]
775775
}
@@ -799,7 +799,7 @@
799799
}
800800
},
801801
"requires": [],
802-
"bypassesDoorShell": true,
802+
"bypassesDoorShell": "yes",
803803
"flashSuitChecked": true
804804
},
805805
{
@@ -817,7 +817,7 @@
817817
"blockPositions": [[2, 18]]
818818
}
819819
},
820-
"bypassesDoorShell": true,
820+
"bypassesDoorShell": "yes",
821821
"flashSuitChecked": true
822822
},
823823
{
@@ -835,7 +835,7 @@
835835
"blockPositions": [[2, 28]]
836836
}
837837
},
838-
"bypassesDoorShell": true,
838+
"bypassesDoorShell": "yes",
839839
"flashSuitChecked": true
840840
},
841841
{
@@ -853,7 +853,7 @@
853853
"blockPositions": [[2, 29]]
854854
}
855855
},
856-
"bypassesDoorShell": true,
856+
"bypassesDoorShell": "yes",
857857
"flashSuitChecked": true
858858
},
859859
{
@@ -1011,7 +1011,7 @@
10111011
"name": "G-Mode Setup - Get Hit By Waver (Come in Jumping)",
10121012
"entranceCondition": {
10131013
"comeInJumping": {
1014-
"speedBooster": false,
1014+
"speedBooster": "no",
10151015
"minTiles": 4
10161016
}
10171017
},
@@ -1063,7 +1063,7 @@
10631063
"name": "G-Mode Setup - Get Hit By Waver (Come in Space Jumping)",
10641064
"entranceCondition": {
10651065
"comeInSpaceJumping": {
1066-
"speedBooster": false,
1066+
"speedBooster": "no",
10671067
"minTiles": 4
10681068
}
10691069
},
@@ -1093,7 +1093,7 @@
10931093
"minHeight": 1,
10941094
"maxHeight": 2,
10951095
"minTiles": 4,
1096-
"speedBooster": false,
1096+
"speedBooster": "no",
10971097
"obstructions": [[1, 0]],
10981098
"note": [
10991099
"Skree Boost Room and Butterfly Room are minimal-runway examples that this applies to."
@@ -1103,7 +1103,7 @@
11031103
"minHeight": 3,
11041104
"maxHeight": 3,
11051105
"minTiles": 5,
1106-
"speedBooster": false,
1106+
"speedBooster": "no",
11071107
"obstructions": [[1, 0]],
11081108
"note": ["Bomb Torizo Room is a minimal-runway example that this applies to."]
11091109
}

0 commit comments

Comments
 (0)