Skip to content

Commit 9bd7d01

Browse files
osse101osse101
authored
Merge pull request #2238 from kjbranch/g-r-rename
Rename canEnterGMode to canGMode
2 parents afe2a4b + eff4c5b commit 9bd7d01

26 files changed

Lines changed: 153 additions & 153 deletions

‎helpers.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@
11451145
{
11461146
"name": "h_heatedGMode",
11471147
"requires": [
1148-
"canEnterGMode",
1148+
"canGMode",
11491149
{"or": [
11501150
"h_heatProof",
11511151
"canHeatedGMode"
@@ -1155,7 +1155,7 @@
11551155
{
11561156
"name": "h_heatedGModePauseAbuse",
11571157
"requires": [
1158-
"canEnterGMode",
1158+
"canGMode",
11591159
"canPauseAbuse",
11601160
{"or": [
11611161
"h_heatProof",

‎region/brinstar/blue/Blue Brinstar Energy Tank Room.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@
13031303
"link": [5, 2],
13041304
"name": "G-Mode Morph Bomb the Crumble Block",
13051305
"requires": [
1306-
"canEnterGMode",
1306+
"canGMode",
13071307
"h_artificialMorphIBJ",
13081308
{"or": [
13091309
"canConsecutiveWalljump",
@@ -1329,7 +1329,7 @@
13291329
"link": [5, 2],
13301330
"name": "G-Mode Morph Shoot the Ceiling Block Item",
13311331
"requires": [
1332-
"canEnterGMode",
1332+
"canGMode",
13331333
"Morph",
13341334
{"or": [
13351335
"canConsecutiveWalljump",
@@ -1348,7 +1348,7 @@
13481348
"name": "G-Mode Morph Power Bomb the Ceiling Block Item",
13491349
"requires": [
13501350
"canPowerBombItemOverloadPLMs",
1351-
"canEnterGMode",
1351+
"canGMode",
13521352
"h_artificialMorphPowerBomb",
13531353
"h_artificialMorphMovement",
13541354
{"or": [
@@ -1369,7 +1369,7 @@
13691369
"link": [5, 4],
13701370
"name": "G-Mode Morph",
13711371
"requires": [
1372-
"canEnterGMode"
1372+
"canGMode"
13731373
],
13741374
"flashSuitChecked": true
13751375
},
@@ -1378,7 +1378,7 @@
13781378
"link": [5, 4],
13791379
"name": "G-Mode Morph with Power Bomb",
13801380
"requires": [
1381-
"canEnterGMode",
1381+
"canGMode",
13821382
"h_artificialMorphPowerBomb"
13831383
],
13841384
"clearsObstacles": ["B", "C"],
@@ -1390,7 +1390,7 @@
13901390
"link": [6, 4],
13911391
"name": "G-Mode Morph Touch the Item (Prepare to Remote Acquire)",
13921392
"requires": [
1393-
"canEnterGMode",
1393+
"canGMode",
13941394
{"itemNotCollectedAtNode": 4},
13951395
"h_artificialMorphMovement"
13961396
],
@@ -1411,7 +1411,7 @@
14111411
"link": [6, 5],
14121412
"name": "Base",
14131413
"requires": [
1414-
"canEnterGMode"
1414+
"canGMode"
14151415
],
14161416
"flashSuitChecked": true
14171417
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,7 @@
14601460
"link": [5, 5],
14611461
"name": "Power Bomb Blocks While in Artificial Morph from the Left",
14621462
"requires": [
1463-
"canEnterGMode",
1463+
"canGMode",
14641464
{"obstaclesCleared": ["D"]},
14651465
"h_artificialMorphPowerBomb",
14661466
{"or": [

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5365,7 +5365,7 @@
53655365
"link": [16, 1],
53665366
"name": "G-Mode Up the Elevator",
53675367
"requires": [
5368-
"canEnterGMode"
5368+
"canGMode"
53695369
],
53705370
"exitCondition": {
53715371
"leaveWithGMode": {

‎region/brinstar/pink/Big Pink.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3736,7 +3736,7 @@
37363736
"link": [14, 4],
37373737
"name": "Exit G-Mode",
37383738
"requires": [
3739-
"canEnterGMode"
3739+
"canGMode"
37403740
],
37413741
"clearsObstacles": ["C"],
37423742
"flashSuitChecked": true
@@ -3746,7 +3746,7 @@
37463746
"link": [14, 4],
37473747
"name": "Leave with G-Mode",
37483748
"requires": [
3749-
"canEnterGMode"
3749+
"canGMode"
37503750
],
37513751
"exitCondition": {
37523752
"leaveWithGMode": {
@@ -3760,7 +3760,7 @@
37603760
"link": [14, 4],
37613761
"name": "G-Mode Morph, Power Bomb the Blocks",
37623762
"requires": [
3763-
"canEnterGMode",
3763+
"canGMode",
37643764
"h_artificialMorphPowerBomb"
37653765
],
37663766
"clearsObstacles": ["B", "C"],
@@ -3772,7 +3772,7 @@
37723772
"link": [15, 1],
37733773
"name": "G-mode Morph",
37743774
"requires": [
3775-
"canEnterGMode",
3775+
"canGMode",
37763776
{"or": [
37773777
"Morph",
37783778
{"and": [
@@ -3800,7 +3800,7 @@
38003800
"link": [15, 1],
38013801
"name": "G-mode Morph Overload PLMs with Power Bombs and Spring Ball",
38023802
"requires": [
3803-
"canEnterGMode",
3803+
"canGMode",
38043804
"h_artificialMorphSpringBallBombJump",
38053805
"h_artificialMorphPowerBomb",
38063806
"h_artificialMorphPowerBomb",
@@ -3826,7 +3826,7 @@
38263826
"link": [15, 8],
38273827
"name": "G-mode Morph",
38283828
"requires": [
3829-
"canEnterGMode",
3829+
"canGMode",
38303830
"h_artificialMorphMovement"
38313831
]
38323832
},
@@ -3835,7 +3835,7 @@
38353835
"link": [15, 10],
38363836
"name": "G-mode Morph with Bombs",
38373837
"requires": [
3838-
"canEnterGMode",
3838+
"canGMode",
38393839
"h_artificialMorphLongIBJ",
38403840
{"or": [
38413841
"canTrickyDodgeEnemies",
@@ -3855,7 +3855,7 @@
38553855
"link": [15, 10],
38563856
"name": "G-mode Morph with HiJump Spring Fling",
38573857
"requires": [
3858-
"canEnterGMode",
3858+
"canGMode",
38593859
"HiJump",
38603860
"h_artificialMorphSpringFling",
38613861
{"or": [
@@ -3875,7 +3875,7 @@
38753875
"link": [15, 12],
38763876
"name": "G-mode Morph Overload PLMs",
38773877
"requires": [
3878-
"canEnterGMode",
3878+
"canGMode",
38793879
"h_artificialMorphMovement"
38803880
],
38813881
"flashSuitChecked": true,
@@ -3886,7 +3886,7 @@
38863886
"link": [15, 13],
38873887
"name": "G-mode Morph Power Bomb the Blocks",
38883888
"requires": [
3889-
"canEnterGMode",
3889+
"canGMode",
38903890
{"or": [
38913891
"canComplexGMode",
38923892
"h_artificialMorphPowerBomb",
@@ -3906,7 +3906,7 @@
39063906
"link": [15, 14],
39073907
"name": "G-mode Overload PLMs with Morph",
39083908
"requires": [
3909-
"canEnterGMode",
3909+
"canGMode",
39103910
"canMidAirMorph"
39113911
],
39123912
"flashSuitChecked": true,
@@ -3920,7 +3920,7 @@
39203920
"link": [15, 14],
39213921
"name": "G-mode Morph Overload PLMs with Bombs",
39223922
"requires": [
3923-
"canEnterGMode",
3923+
"canGMode",
39243924
"h_artificialMorphIBJ",
39253925
{"or": [
39263926
"canTrickyDodgeEnemies",
@@ -3941,7 +3941,7 @@
39413941
"link": [15, 14],
39423942
"name": "G-mode Morph Overload PLMs with Spring Ball",
39433943
"requires": [
3944-
"canEnterGMode",
3944+
"canGMode",
39453945
"h_artificialMorphSpringBall",
39463946
"canCameraManip",
39473947
{"or": [
@@ -3969,7 +3969,7 @@
39693969
"link": [16, 1],
39703970
"name": "G-mode Morph",
39713971
"requires": [
3972-
"canEnterGMode",
3972+
"canGMode",
39733973
{"or": [
39743974
"Morph",
39753975
"h_artificialMorphIBJ",
@@ -4001,7 +4001,7 @@
40014001
"link": [16, 4],
40024002
"name": "G-mode Morph",
40034003
"requires": [
4004-
"canEnterGMode",
4004+
"canGMode",
40054005
"h_artificialMorphMovement",
40064006
{"or": [
40074007
"Morph",
@@ -4025,7 +4025,7 @@
40254025
"link": [16, 8],
40264026
"name": "G-mode Morph",
40274027
"requires": [
4028-
"canEnterGMode",
4028+
"canGMode",
40294029
"h_artificialMorphMovement",
40304030
{"or": [
40314031
"Morph",
@@ -4048,7 +4048,7 @@
40484048
"link": [16, 12],
40494049
"name": "G-mode Morph",
40504050
"requires": [
4051-
"canEnterGMode",
4051+
"canGMode",
40524052
"h_artificialMorphMovement",
40534053
{"or": [
40544054
"Morph",
@@ -4074,7 +4074,7 @@
40744074
"link": [17, 1],
40754075
"name": "G-mode Morph",
40764076
"requires": [
4077-
"canEnterGMode",
4077+
"canGMode",
40784078
{"or": [
40794079
"Morph",
40804080
"h_artificialMorphIBJ",
@@ -4128,7 +4128,7 @@
41284128
"link": [17, 4],
41294129
"name": "G-mode Morph",
41304130
"requires": [
4131-
"canEnterGMode",
4131+
"canGMode",
41324132
{"or": [
41334133
"Morph",
41344134
"h_artificialMorphIBJ",
@@ -4173,7 +4173,7 @@
41734173
"link": [17, 4],
41744174
"name": "G-mode Morph, Power Bomb the Blocks",
41754175
"requires": [
4176-
"canEnterGMode",
4176+
"canGMode",
41774177
{"or": [
41784178
"Morph",
41794179
"h_artificialMorphIBJ",
@@ -4219,7 +4219,7 @@
42194219
"link": [17, 8],
42204220
"name": "G-mode Morph",
42214221
"requires": [
4222-
"canEnterGMode",
4222+
"canGMode",
42234223
"h_artificialMorphMovement"
42244224
],
42254225
"collectsItems": [11],
@@ -4230,7 +4230,7 @@
42304230
"link": [17, 12],
42314231
"name": "G-mode Morph",
42324232
"requires": [
4233-
"canEnterGMode",
4233+
"canGMode",
42344234
{"itemNotCollectedAtNode": 11},
42354235
"canRiskPermanentLossOfAccess"
42364236
],

‎region/brinstar/pink/Pink Brinstar Wave Gate Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@
405405
"link": [1, 1],
406406
"name": "Indirect G-Mode Damageless Kill",
407407
"requires": [
408-
"canEnterGMode",
408+
"canGMode",
409409
{"obstaclesCleared": ["C"]},
410410
"canTrickyDodgeEnemies",
411411
{"or": [

‎region/brinstar/red/Caterpillar Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2321,7 +2321,7 @@
23212321
"link": [7, 5],
23222322
"name": "Exit G-Mode",
23232323
"requires": [
2324-
"canEnterGMode"
2324+
"canGMode"
23252325
],
23262326
"flashSuitChecked": true,
23272327
"note": "Exit G-Mode near the door to pass the gate."
@@ -2331,7 +2331,7 @@
23312331
"link": [7, 5],
23322332
"name": "Exit G-Mode, Open Gate",
23332333
"requires": [
2334-
"canEnterGMode",
2334+
"canGMode",
23352335
"canOffScreenMovement"
23362336
],
23372337
"clearsObstacles": ["A"],

‎region/crateria/central/Landing Site.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,7 @@
18431843
"link": [8, 1],
18441844
"name": "G-Mode Morph Power Bomb",
18451845
"requires": [
1846-
"canEnterGMode",
1846+
"canGMode",
18471847
{"or": [
18481848
"h_artificialMorphLongIBJ",
18491849
{"and": [
@@ -1864,7 +1864,7 @@
18641864
"link": [8, 1],
18651865
"name": "G-Mode Morph Screw Attack",
18661866
"requires": [
1867-
"canEnterGMode",
1867+
"canGMode",
18681868
"h_artificialMorphLongIBJ",
18691869
"ScrewAttack"
18701870
],
@@ -1876,7 +1876,7 @@
18761876
"link": [8, 3],
18771877
"name": "G-Mode Morph IBJ",
18781878
"requires": [
1879-
"canEnterGMode",
1879+
"canGMode",
18801880
"h_artificialMorphLongIBJ"
18811881
],
18821882
"flashSuitChecked": true
@@ -1886,7 +1886,7 @@
18861886
"link": [8, 4],
18871887
"name": "G-Mode Morph Power Bomb",
18881888
"requires": [
1889-
"canEnterGMode",
1889+
"canGMode",
18901890
"h_artificialMorphPowerBomb"
18911891
],
18921892
"clearsObstacles": ["B"],
@@ -1898,7 +1898,7 @@
18981898
"link": [8, 4],
18991899
"name": "G-Mode Morph IBJ",
19001900
"requires": [
1901-
"canEnterGMode",
1901+
"canGMode",
19021902
"h_artificialMorphIBJ"
19031903
],
19041904
"flashSuitChecked": true,

0 commit comments

Comments
 (0)