Skip to content

Commit ebda729

Browse files
kjbranchkjbranch
committed
Add canComplexGMode, use throughout Brinsar
1 parent 91bdc49 commit ebda729

10 files changed

Lines changed: 54 additions & 32 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@
988988
"link": [4, 1],
989989
"name": "Artificial Morph Remotely Collect the Item",
990990
"requires": [
991-
"canEnterGMode",
991+
"canComplexGMode",
992992
{"obstaclesCleared": ["D"]}
993993
],
994994
"flashSuitChecked": true,
@@ -1383,7 +1383,7 @@
13831383
{
13841384
"id": 61,
13851385
"link": [6, 4],
1386-
"name": "G-Mode Morph Remotely Collect the Item",
1386+
"name": "G-Mode Morph Touch the Item (Prepare to Remote Acquire)",
13871387
"requires": [
13881388
"canEnterGMode",
13891389
{"itemNotCollectedAtNode": 4},

‎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: 11 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",
@@ -1017,6 +1017,7 @@
10171017
}
10181018
},
10191019
"requires": [
1020+
"canComplexGMode",
10201021
{"itemNotCollectedAtNode": 5},
10211022
{"or": [
10221023
"Morph",
@@ -1445,15 +1446,15 @@
14451446
{"tech": "canBombHorizontally"},
14461447
{"ammo": {"type": "PowerBomb", "count": 6}},
14471448
{"or": [
1448-
"canInsaneJump",
1449+
"canComplexGMode",
14491450
{"ammo": {"type": "PowerBomb", "count": 2}}
14501451
]}
14511452
]},
14521453
{"and": [
14531454
"h_artificialMorphSpringBall",
14541455
{"ammo": {"type": "PowerBomb", "count": 3}},
14551456
{"or": [
1456-
"canInsaneJump",
1457+
"canComplexGMode",
14571458
{"ammo": {"type": "PowerBomb", "count": 1}}
14581459
]}
14591460
]},
@@ -1478,19 +1479,14 @@
14781479
}
14791480
},
14801481
"requires": [
1482+
"canComplexGMode",
14811483
{"itemNotCollectedAtNode": 5},
14821484
{"or": [
14831485
"Morph",
14841486
"h_artificialMorphSpringBall"
14851487
]},
14861488
{"or": [
1487-
{"and": [
1488-
{"ammo": {"type": "PowerBomb", "count": 3}},
1489-
{"or": [
1490-
"canInsaneJump",
1491-
{"ammo": {"type": "PowerBomb", "count": 1}}
1492-
]}
1493-
]},
1489+
{"ammo": {"type": "PowerBomb", "count": 3}},
14941490
{"and": [
14951491
"Morph",
14961492
{"or": [
@@ -1670,7 +1666,7 @@
16701666
{"and": [
16711667
{"ammo": {"type": "PowerBomb", "count": 3}},
16721668
{"or": [
1673-
"canInsaneJump",
1669+
"canComplexGMode",
16741670
{"ammo": {"type": "PowerBomb", "count": 1}}
16751671
]}
16761672
]},
@@ -1724,7 +1720,7 @@
17241720
{"and": [
17251721
{"ammo": {"type": "PowerBomb", "count": 3}},
17261722
{"or": [
1727-
"canInsaneJump",
1723+
"canComplexGMode",
17281724
{"ammo": {"type": "PowerBomb", "count": 1}}
17291725
]}
17301726
]},

‎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/pink/Big Pink.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@
784784
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
785785
]},
786786
{"or": [
787-
"canInsaneJump",
787+
"canComplexGMode",
788788
"h_artificialMorphPowerBomb",
789789
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
790790
]}
@@ -2651,6 +2651,7 @@
26512651
}
26522652
},
26532653
"requires": [
2654+
"canComplexGMode",
26542655
"h_CrystalFlash",
26552656
"canMidAirMorph"
26562657
],
@@ -2689,6 +2690,7 @@
26892690
}
26902691
},
26912692
"requires": [
2693+
"canComplexGMode",
26922694
{"or": [
26932695
"h_artificialMorphIBJ",
26942696
"Morph",
@@ -3742,7 +3744,7 @@
37423744
"requires": [
37433745
"canEnterGMode",
37443746
{"or": [
3745-
"canInsaneJump",
3747+
"canComplexGMode",
37463748
"h_artificialMorphPowerBomb",
37473749
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
37483750
]},
@@ -3951,7 +3953,7 @@
39513953
]},
39523954
{"or": [
39533955
"Morph",
3954-
"canInsaneJump",
3956+
"canComplexGMode",
39553957
{"and": [
39563958
"canTrickyDodgeEnemies",
39573959
"h_artificialMorphSpringBall"
@@ -4003,7 +4005,7 @@
40034005
]},
40044006
{"or": [
40054007
"Morph",
4006-
"canInsaneJump",
4008+
"canComplexGMode",
40074009
{"and": [
40084010
"canTrickyDodgeEnemies",
40094011
"h_artificialMorphSpringBall"
@@ -4048,7 +4050,7 @@
40484050
]},
40494051
{"or": [
40504052
"Morph",
4051-
"canInsaneJump",
4053+
"canComplexGMode",
40524054
{"and": [
40534055
"canTrickyDodgeEnemies",
40544056
"h_artificialMorphSpringBall"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@
407407
"requires": [
408408
"canEnterGMode",
409409
{"obstaclesCleared": ["C"]},
410-
"canInsaneJump",
410+
"canTrickyDodgeEnemies",
411411
{"or": [
412412
"ScrewAttack",
413413
"Plasma"
@@ -1970,6 +1970,7 @@
19701970
}
19711971
},
19721972
"requires": [
1973+
"canComplexGMode",
19731974
"canXRayClimb",
19741975
"canOffScreenMovement",
19751976
"canInsaneJump"

‎region/brinstar/pink/Spore Spawn Super Room.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@
244244
}
245245
},
246246
"requires": [
247+
"canComplexGMode",
247248
"h_artificialMorphCrystalFlash",
248249
{"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
249250
"canShinechargeMovement",
@@ -279,6 +280,7 @@
279280
}
280281
},
281282
"requires": [
283+
"canComplexGMode",
282284
"h_artificialMorphCrystalFlash",
283285
{"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
284286
"canShinechargeMovement",

‎region/brinstar/red/Alpha Power Bomb Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@
522522
}
523523
},
524524
"requires": [
525+
"canComplexGMode",
525526
"canUseIFrames",
526527
"canNeutralDamageBoost",
527528
"canInsaneJump",

‎tech.json‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2511,14 +2511,28 @@
25112511
],
25122512
"extensionTechs": [
25132513
{
2514-
"id": 200,
2515-
"name": "canTrickyGMode",
2514+
"name": "canComplexGMode",
25162515
"techRequires": [
25172516
"canEnterGMode"
25182517
],
25192518
"otherRequires": [],
2520-
"note": ["Doing something particularly precise or risky while in G-mode."],
2521-
"devNote": "This could be expanded to unusual setups."
2519+
"note": [
2520+
"Doing something particularly precise, risky, or unintuitive while in G-mode or while setting up G-mode.",
2521+
"This includes: enemy dodging that would not normally be an issue and is unintuitive, such as enemies that deal a small amount of damage and awkward dodging while artificially morphed;",
2522+
"bypassing door locks while in G-mode to maintain indirect G-mode in the next room; exiting G-mode while inside of overloaded blocks in order to X-Ray climb;",
2523+
"touching an item in direct G-mode before PLMs are overloaded and obtaining the item remotely when exiting G-mode."
2524+
],
2525+
"extensionTechs": [
2526+
{
2527+
"id": 200,
2528+
"name": "canTrickyGMode",
2529+
"techRequires": [
2530+
"canComplexGMode"
2531+
],
2532+
"otherRequires": [],
2533+
"note": ["Doing something particularly precise, risky, or unintuitive while in G-mode or while setting up G-mode."]
2534+
}
2535+
]
25222536
},
25232537
{
25242538
"id": 198,

0 commit comments

Comments
 (0)