Skip to content

Add canComplexGMode, use throughout Brinsar #2200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjbranch merged 6 commits into from
Aug 9, 2025
Merged

Add canComplexGMode, use throughout Brinsar #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebda729
Add canComplexGMode, use throughout Brinsar
kjbranch Aug 5, 2025
002f37c
add more details to tech, move very deep stuck
kjbranch Aug 5, 2025
2f8c367
Apply suggestions from code review
kjbranch Aug 6, 2025
7dc9b6b
feedback update
kjbranch Aug 6, 2025
b00ecef
feedback update
kjbranch Aug 8, 2025
3a2fda6
Merge branch 'master' into complex-g-1
kjbranch Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions region/brinstar/blue/Blue Brinstar Energy Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@
"link": [4, 1],
"name": "Artificial Morph Remotely Collect the Item",
"requires": [
"canEnterGMode",
"canComplexGMode",
{"obstaclesCleared": ["D"]}
],
"flashSuitChecked": true,
Expand Down Expand Up @@ -1388,7 +1388,7 @@
{
"id": 61,
"link": [6, 4],
"name": "G-Mode Morph Remotely Collect the Item",
"name": "G-Mode Morph Touch the Item (Prepare to Remote Acquire)",
"requires": [
"canEnterGMode",
{"itemNotCollectedAtNode": 4},
Expand Down
1 change: 1 addition & 0 deletions region/brinstar/blue/Construction Zone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down
8 changes: 4 additions & 4 deletions region/brinstar/blue/Morph Ball Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@
{"or": [
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
"h_artificialMorphPowerBomb",
"canInsaneJump",
"canComplexGMode",
{"and": [
"Morph",
{"or": [
Expand Down Expand Up @@ -1024,7 +1024,7 @@
{"or": [
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
"h_artificialMorphPowerBomb",
"canInsaneJump"
"canComplexGMode"
]},
"h_artificialMorphPowerBomb",
{"or": [
Expand Down Expand Up @@ -1054,7 +1054,7 @@
},
"requires": [
{"or": [
"canInsaneJump",
"canComplexGMode",
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
{"and": [
"h_artificialMorphPowerBomb",
Expand Down Expand Up @@ -1090,7 +1090,7 @@
},
"requires": [
{"or": [
"canInsaneJump",
"canComplexGMode",
{"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
{"and": [
"h_artificialMorphPowerBomb",
Expand Down
4 changes: 3 additions & 1 deletion region/brinstar/green/Brinstar Reserve Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
"h_artificialMorphSpringBall",
{"and": [
Expand Down Expand Up @@ -156,7 +157,8 @@
}
},
"requires": [],
"flashSuitChecked": true
"flashSuitChecked": true,
"devNote": "This is only useful if the item is Morph."
},
{
"id": 6,
Expand Down
27 changes: 12 additions & 15 deletions region/brinstar/green/Etecoon Energy Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
"ScrewAttack",
"canTrickyGMode",
{"and": [
"canInsaneJump",
"canComplexGMode",
{"or": [
"Ice",
{"ammo": {"type": "Missile", "count": 1}},
Expand Down Expand Up @@ -421,7 +421,7 @@
{"itemNotCollectedAtNode": 5},
"canRiskPermanentLossOfAccess",
"canOffScreenMovement",
"canInsaneJump",
"canComplexGMode",
{"or": [
"canTrickyGMode",
"h_artificialMorphPowerBomb",
Expand Down Expand Up @@ -759,7 +759,7 @@
"ScrewAttack",
"canTrickyGMode",
{"and": [
"canInsaneJump",
"canComplexGMode",
{"or": [
"Ice",
{"ammo": {"type": "Missile", "count": 1}},
Expand Down Expand Up @@ -797,7 +797,7 @@
"canRiskPermanentLossOfAccess",
"canOffScreenMovement",
"h_artificialMorphPowerBomb",
"canInsaneJump",
"canComplexGMode",
{"or": [
"canTrickyGMode",
"h_artificialMorphPowerBomb",
Expand Down Expand Up @@ -844,6 +844,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -1018,6 +1019,7 @@
},
"requires": [
"canPowerBombItemOverloadPLMs",
"canComplexGMode",
{"itemNotCollectedAtNode": 5},
{"or": [
"Morph",
Expand Down Expand Up @@ -1447,15 +1449,15 @@
{"tech": "canBombHorizontally"},
{"ammo": {"type": "PowerBomb", "count": 6}},
{"or": [
"canInsaneJump",
"canComplexGMode",
{"ammo": {"type": "PowerBomb", "count": 2}}
]}
]},
{"and": [
"h_artificialMorphSpringBall",
{"ammo": {"type": "PowerBomb", "count": 3}},
{"or": [
"canInsaneJump",
"canComplexGMode",
{"ammo": {"type": "PowerBomb", "count": 1}}
]}
]},
Expand All @@ -1481,19 +1483,14 @@
},
"requires": [
"canPowerBombItemOverloadPLMs",
"canComplexGMode",
{"itemNotCollectedAtNode": 5},
{"or": [
"Morph",
"h_artificialMorphSpringBall"
]},
{"or": [
{"and": [
{"ammo": {"type": "PowerBomb", "count": 3}},
{"or": [
"canInsaneJump",
{"ammo": {"type": "PowerBomb", "count": 1}}
]}
]},
{"ammo": {"type": "PowerBomb", "count": 3}},
{"and": [
"Morph",
{"or": [
Expand Down Expand Up @@ -1673,7 +1670,7 @@
{"and": [
{"ammo": {"type": "PowerBomb", "count": 3}},
{"or": [
"canInsaneJump",
"canComplexGMode",
{"ammo": {"type": "PowerBomb", "count": 1}}
]}
]},
Expand Down Expand Up @@ -1728,7 +1725,7 @@
{"and": [
{"ammo": {"type": "PowerBomb", "count": 3}},
{"or": [
"canInsaneJump",
"canComplexGMode",
{"ammo": {"type": "PowerBomb", "count": 1}}
]}
]},
Expand Down
9 changes: 9 additions & 0 deletions region/brinstar/green/Green Brinstar Main Shaft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -2364,6 +2365,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -2444,6 +2446,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -3043,6 +3046,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -3626,6 +3630,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBePatient"
],
Expand Down Expand Up @@ -3706,6 +3711,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -3964,6 +3970,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBeVeryPatient"
],
Expand Down Expand Up @@ -4029,6 +4036,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBeVeryPatient"
],
Expand Down Expand Up @@ -4072,6 +4080,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBePatient"
],
Expand Down
4 changes: 4 additions & 0 deletions region/brinstar/green/Green Hill Zone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
"h_artificialMorphLongIBJ",
"h_artificialMorphSpringBallBombJump",
Expand Down Expand Up @@ -624,6 +625,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
{"and": [
"h_artificialMorphIBJ",
Expand Down Expand Up @@ -979,6 +981,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
"h_artificialMorphLongIBJ",
"h_artificialMorphSpringBallBombJump",
Expand Down Expand Up @@ -1123,6 +1126,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
{"and": [
"h_artificialMorphIBJ",
Expand Down
1 change: 1 addition & 0 deletions region/brinstar/kraid/Warehouse Zeela Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down
15 changes: 10 additions & 5 deletions region/brinstar/pink/Big Pink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
]},
{"or": [
"canInsaneJump",
"canComplexGMode",
"h_artificialMorphPowerBomb",
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
]}
Expand Down Expand Up @@ -1803,6 +1803,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBePatient"
],
Expand Down Expand Up @@ -2431,6 +2432,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBeVeryPatient"
],
Expand All @@ -2452,6 +2454,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -2781,6 +2784,7 @@
}
},
"requires": [
"canComplexGMode",
"h_CrystalFlash",
"canMidAirMorph"
],
Expand Down Expand Up @@ -2819,6 +2823,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
"h_artificialMorphIBJ",
"Morph",
Expand Down Expand Up @@ -3872,7 +3877,7 @@
"requires": [
"canEnterGMode",
{"or": [
"canInsaneJump",
"canComplexGMode",
"h_artificialMorphPowerBomb",
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
]},
Expand Down Expand Up @@ -4081,7 +4086,7 @@
]},
{"or": [
"Morph",
"canInsaneJump",
"canComplexGMode",
{"and": [
"canTrickyDodgeEnemies",
"h_artificialMorphSpringBall"
Expand Down Expand Up @@ -4133,7 +4138,7 @@
]},
{"or": [
"Morph",
"canInsaneJump",
"canComplexGMode",
{"and": [
"canTrickyDodgeEnemies",
"h_artificialMorphSpringBall"
Expand Down Expand Up @@ -4178,7 +4183,7 @@
]},
{"or": [
"Morph",
"canInsaneJump",
"canComplexGMode",
{"and": [
"canTrickyDodgeEnemies",
"h_artificialMorphSpringBall"
Expand Down
1 change: 1 addition & 0 deletions region/brinstar/pink/Dachora Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBeVeryPatient"
],
Expand Down
Loading