Skip to content

Commit daf0dc4

Browse files
kjbranchkjbranch
authored
Merge pull request #2200 from kjbranch/complex-g-1
Add canComplexGMode, use throughout Brinsar
2 parents 3e30fad + 3a2fda6 commit daf0dc4

17 files changed

Lines changed: 88 additions & 35 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@
992992
"link": [4, 1],
993993
"name": "Artificial Morph Remotely Collect the Item",
994994
"requires": [
995-
"canEnterGMode",
995+
"canComplexGMode",
996996
{"obstaclesCleared": ["D"]}
997997
],
998998
"flashSuitChecked": true,
@@ -1388,7 +1388,7 @@
13881388
{
13891389
"id": 61,
13901390
"link": [6, 4],
1391-
"name": "G-Mode Morph Remotely Collect the Item",
1391+
"name": "G-Mode Morph Touch the Item (Prepare to Remote Acquire)",
13921392
"requires": [
13931393
"canEnterGMode",
13941394
{"itemNotCollectedAtNode": 4},

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,7 @@
803803
}
804804
},
805805
"requires": [
806+
"canComplexGMode",
806807
"canXRayClimb"
807808
],
808809
"bypassesDoorShell": true,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@
988988
{"or": [
989989
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
990990
"h_artificialMorphPowerBomb",
991-
"canInsaneJump",
991+
"canComplexGMode",
992992
{"and": [
993993
"Morph",
994994
{"or": [
@@ -1024,7 +1024,7 @@
10241024
{"or": [
10251025
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
10261026
"h_artificialMorphPowerBomb",
1027-
"canInsaneJump"
1027+
"canComplexGMode"
10281028
]},
10291029
"h_artificialMorphPowerBomb",
10301030
{"or": [
@@ -1054,7 +1054,7 @@
10541054
},
10551055
"requires": [
10561056
{"or": [
1057-
"canInsaneJump",
1057+
"canComplexGMode",
10581058
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
10591059
{"and": [
10601060
"h_artificialMorphPowerBomb",
@@ -1090,7 +1090,7 @@
10901090
},
10911091
"requires": [
10921092
{"or": [
1093-
"canInsaneJump",
1093+
"canComplexGMode",
10941094
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
10951095
{"and": [
10961096
"h_artificialMorphPowerBomb",

‎region/brinstar/green/Brinstar Reserve Tank Room.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
}
124124
},
125125
"requires": [
126+
"canComplexGMode",
126127
{"or": [
127128
"h_artificialMorphSpringBall",
128129
{"and": [
@@ -156,7 +157,8 @@
156157
}
157158
},
158159
"requires": [],
159-
"flashSuitChecked": true
160+
"flashSuitChecked": true,
161+
"devNote": "This is only useful if the item is Morph."
160162
},
161163
{
162164
"id": 6,

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
"ScrewAttack",
384384
"canTrickyGMode",
385385
{"and": [
386-
"canInsaneJump",
386+
"canComplexGMode",
387387
{"or": [
388388
"Ice",
389389
{"ammo": {"type": "Missile", "count": 1}},
@@ -421,7 +421,7 @@
421421
{"itemNotCollectedAtNode": 5},
422422
"canRiskPermanentLossOfAccess",
423423
"canOffScreenMovement",
424-
"canInsaneJump",
424+
"canComplexGMode",
425425
{"or": [
426426
"canTrickyGMode",
427427
"h_artificialMorphPowerBomb",
@@ -759,7 +759,7 @@
759759
"ScrewAttack",
760760
"canTrickyGMode",
761761
{"and": [
762-
"canInsaneJump",
762+
"canComplexGMode",
763763
{"or": [
764764
"Ice",
765765
{"ammo": {"type": "Missile", "count": 1}},
@@ -797,7 +797,7 @@
797797
"canRiskPermanentLossOfAccess",
798798
"canOffScreenMovement",
799799
"h_artificialMorphPowerBomb",
800-
"canInsaneJump",
800+
"canComplexGMode",
801801
{"or": [
802802
"canTrickyGMode",
803803
"h_artificialMorphPowerBomb",
@@ -844,6 +844,7 @@
844844
}
845845
},
846846
"requires": [
847+
"canComplexGMode",
847848
"canXRayClimb"
848849
],
849850
"bypassesDoorShell": true,
@@ -1018,6 +1019,7 @@
10181019
},
10191020
"requires": [
10201021
"canPowerBombItemOverloadPLMs",
1022+
"canComplexGMode",
10211023
{"itemNotCollectedAtNode": 5},
10221024
{"or": [
10231025
"Morph",
@@ -1447,15 +1449,15 @@
14471449
{"tech": "canBombHorizontally"},
14481450
{"ammo": {"type": "PowerBomb", "count": 6}},
14491451
{"or": [
1450-
"canInsaneJump",
1452+
"canComplexGMode",
14511453
{"ammo": {"type": "PowerBomb", "count": 2}}
14521454
]}
14531455
]},
14541456
{"and": [
14551457
"h_artificialMorphSpringBall",
14561458
{"ammo": {"type": "PowerBomb", "count": 3}},
14571459
{"or": [
1458-
"canInsaneJump",
1460+
"canComplexGMode",
14591461
{"ammo": {"type": "PowerBomb", "count": 1}}
14601462
]}
14611463
]},
@@ -1481,19 +1483,14 @@
14811483
},
14821484
"requires": [
14831485
"canPowerBombItemOverloadPLMs",
1486+
"canComplexGMode",
14841487
{"itemNotCollectedAtNode": 5},
14851488
{"or": [
14861489
"Morph",
14871490
"h_artificialMorphSpringBall"
14881491
]},
14891492
{"or": [
1490-
{"and": [
1491-
{"ammo": {"type": "PowerBomb", "count": 3}},
1492-
{"or": [
1493-
"canInsaneJump",
1494-
{"ammo": {"type": "PowerBomb", "count": 1}}
1495-
]}
1496-
]},
1493+
{"ammo": {"type": "PowerBomb", "count": 3}},
14971494
{"and": [
14981495
"Morph",
14991496
{"or": [
@@ -1673,7 +1670,7 @@
16731670
{"and": [
16741671
{"ammo": {"type": "PowerBomb", "count": 3}},
16751672
{"or": [
1676-
"canInsaneJump",
1673+
"canComplexGMode",
16771674
{"ammo": {"type": "PowerBomb", "count": 1}}
16781675
]}
16791676
]},
@@ -1728,7 +1725,7 @@
17281725
{"and": [
17291726
{"ammo": {"type": "PowerBomb", "count": 3}},
17301727
{"or": [
1731-
"canInsaneJump",
1728+
"canComplexGMode",
17321729
{"ammo": {"type": "PowerBomb", "count": 1}}
17331730
]}
17341731
]},

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,6 +1534,7 @@
15341534
}
15351535
},
15361536
"requires": [
1537+
"canComplexGMode",
15371538
"canXRayClimb"
15381539
],
15391540
"bypassesDoorShell": true,
@@ -2364,6 +2365,7 @@
23642365
}
23652366
},
23662367
"requires": [
2368+
"canComplexGMode",
23672369
"canLongXRayClimb"
23682370
],
23692371
"bypassesDoorShell": true,
@@ -2444,6 +2446,7 @@
24442446
}
24452447
},
24462448
"requires": [
2449+
"canComplexGMode",
24472450
"canXRayClimb"
24482451
],
24492452
"bypassesDoorShell": true,
@@ -3043,6 +3046,7 @@
30433046
}
30443047
},
30453048
"requires": [
3049+
"canComplexGMode",
30463050
"canLongXRayClimb"
30473051
],
30483052
"bypassesDoorShell": true,
@@ -3626,6 +3630,7 @@
36263630
}
36273631
},
36283632
"requires": [
3633+
"canComplexGMode",
36293634
"canLongXRayClimb",
36303635
"canBePatient"
36313636
],
@@ -3706,6 +3711,7 @@
37063711
}
37073712
},
37083713
"requires": [
3714+
"canComplexGMode",
37093715
"canXRayClimb"
37103716
],
37113717
"bypassesDoorShell": true,
@@ -3964,6 +3970,7 @@
39643970
}
39653971
},
39663972
"requires": [
3973+
"canComplexGMode",
39673974
"canLongXRayClimb",
39683975
"canBeVeryPatient"
39693976
],
@@ -4029,6 +4036,7 @@
40294036
}
40304037
},
40314038
"requires": [
4039+
"canComplexGMode",
40324040
"canLongXRayClimb",
40334041
"canBeVeryPatient"
40344042
],
@@ -4072,6 +4080,7 @@
40724080
}
40734081
},
40744082
"requires": [
4083+
"canComplexGMode",
40754084
"canLongXRayClimb",
40764085
"canBePatient"
40774086
],

‎region/brinstar/green/Green Hill Zone.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@
337337
}
338338
},
339339
"requires": [
340+
"canComplexGMode",
340341
{"or": [
341342
"h_artificialMorphLongIBJ",
342343
"h_artificialMorphSpringBallBombJump",
@@ -624,6 +625,7 @@
624625
}
625626
},
626627
"requires": [
628+
"canComplexGMode",
627629
{"or": [
628630
{"and": [
629631
"h_artificialMorphIBJ",
@@ -979,6 +981,7 @@
979981
}
980982
},
981983
"requires": [
984+
"canComplexGMode",
982985
{"or": [
983986
"h_artificialMorphLongIBJ",
984987
"h_artificialMorphSpringBallBombJump",
@@ -1123,6 +1126,7 @@
11231126
}
11241127
},
11251128
"requires": [
1129+
"canComplexGMode",
11261130
{"or": [
11271131
{"and": [
11281132
"h_artificialMorphIBJ",

‎region/brinstar/kraid/Warehouse Zeela Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@
277277
}
278278
},
279279
"requires": [
280+
"canComplexGMode",
280281
"canXRayClimb"
281282
],
282283
"bypassesDoorShell": true,

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@
786786
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
787787
]},
788788
{"or": [
789-
"canInsaneJump",
789+
"canComplexGMode",
790790
"h_artificialMorphPowerBomb",
791791
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
792792
]}
@@ -1803,6 +1803,7 @@
18031803
}
18041804
},
18051805
"requires": [
1806+
"canComplexGMode",
18061807
"canLongXRayClimb",
18071808
"canBePatient"
18081809
],
@@ -2431,6 +2432,7 @@
24312432
}
24322433
},
24332434
"requires": [
2435+
"canComplexGMode",
24342436
"canLongXRayClimb",
24352437
"canBeVeryPatient"
24362438
],
@@ -2452,6 +2454,7 @@
24522454
}
24532455
},
24542456
"requires": [
2457+
"canComplexGMode",
24552458
"canLongXRayClimb"
24562459
],
24572460
"bypassesDoorShell": true,
@@ -2781,6 +2784,7 @@
27812784
}
27822785
},
27832786
"requires": [
2787+
"canComplexGMode",
27842788
"h_CrystalFlash",
27852789
"canMidAirMorph"
27862790
],
@@ -2819,6 +2823,7 @@
28192823
}
28202824
},
28212825
"requires": [
2826+
"canComplexGMode",
28222827
{"or": [
28232828
"h_artificialMorphIBJ",
28242829
"Morph",
@@ -3872,7 +3877,7 @@
38723877
"requires": [
38733878
"canEnterGMode",
38743879
{"or": [
3875-
"canInsaneJump",
3880+
"canComplexGMode",
38763881
"h_artificialMorphPowerBomb",
38773882
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
38783883
]},
@@ -4081,7 +4086,7 @@
40814086
]},
40824087
{"or": [
40834088
"Morph",
4084-
"canInsaneJump",
4089+
"canComplexGMode",
40854090
{"and": [
40864091
"canTrickyDodgeEnemies",
40874092
"h_artificialMorphSpringBall"
@@ -4133,7 +4138,7 @@
41334138
]},
41344139
{"or": [
41354140
"Morph",
4136-
"canInsaneJump",
4141+
"canComplexGMode",
41374142
{"and": [
41384143
"canTrickyDodgeEnemies",
41394144
"h_artificialMorphSpringBall"
@@ -4178,7 +4183,7 @@
41784183
]},
41794184
{"or": [
41804185
"Morph",
4181-
"canInsaneJump",
4186+
"canComplexGMode",
41824187
{"and": [
41834188
"canTrickyDodgeEnemies",
41844189
"h_artificialMorphSpringBall"

‎region/brinstar/pink/Dachora Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@
545545
}
546546
},
547547
"requires": [
548+
"canComplexGMode",
548549
"canLongXRayClimb",
549550
"canBeVeryPatient"
550551
],

0 commit comments

Comments
 (0)