Add Torvus Logic#5
Open
hopesgit wants to merge 37 commits into
Open
Conversation
Torvus: - Transport to Temple Grounds - Temple Transport Access - Torvus Lagoon - Save Station A - Ruined Alcove - Path of Roots - Portal Chamber (Light) - Great Bridge - Forgotten Bridge - Torvus Map Station - Abandoned Worksite - Plaza Access add tricks to Options.py (some have yet to be added for the rooms specified)
- controller_access.py - grove_access.py - temple_access.py - torvus_energy_controller.py - torvus_temple.py - transport_to_agon_wastes.py Added tricks for those rooms
- Underground Transport - Underground Tunnel - Torvus Grove - Meditation Vista Added tricks logic for: - all the above - Torvus Temple Added tricks to Options.py to support tricks logic for these rooms
- hydrochamber_storage.py - main_hydrochamber.py - save_station_b.py - hydrodynamo_shaft.py - hydrodynamo_station.py Added options to Options.py to support tricks in these locations
- gathering_access.py - training_access.py - catacombs_access.py Added options to Options.py to support tricks in these locations
… files Added Training Chamber, Transit Tunnel West, Transport to Sanctuary Fortress, Gathering Hall, Fortress Transport Access rooms Adjusted class names of any Torvus rooms that aren't unique to be unique (in order to prevent conflicts later on)
Add Catacombs parts to __init__.py Add Options relating to Catacombs to Options.py
Also update Abandoned Worksite to the new imports format Signed-off-by: hopesgit <hope.gochnour@gmail.com>
…ew format for rooms where that applies.
UltiNaruto
reviewed
Feb 19, 2026
UltiNaruto
reviewed
Feb 19, 2026
UltiNaruto
reviewed
Feb 19, 2026
UltiNaruto
reviewed
Feb 19, 2026
UltiNaruto
reviewed
Feb 19, 2026
UltiNaruto
reviewed
Feb 19, 2026
UltiNaruto
reviewed
Feb 19, 2026
UltiNaruto
reviewed
Feb 19, 2026
…the changes from a couple of rooms outside of Torvus that somehow ended up in here
UltiNaruto
reviewed
Feb 21, 2026
UltiNaruto
reviewed
Feb 21, 2026
Owner
|
Also no need to mention |
UltiNaruto
reviewed
Apr 28, 2026
| - One white door | ||
| - Grenchler or Dark Pirate Commando enemies | ||
|
|
||
| Logic assumes that the bomb slot in Dark Forgotten Bridge has already been activated. |
UltiNaruto
reviewed
Apr 28, 2026
| destination="Torvus Bog - Forgotten Bridge (Bridge)", | ||
| rule=lambda state, player: condition_and([ | ||
| state.has("Torvus Bog - Forgotten Bridge | Spinner Activated", player), | ||
| state.has_all(["Space Jump Boots", "Screw Attack"], player) |
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
| has_trick_enabled(state, player, "Torvus Bog - Forgotten Bridge | Bomb Jump Between Platforms") | ||
| ]), | ||
| condition_and([ | ||
| has_trick_enabled(state, player, "Torvus Bog - Forgotten Bridge | Air Underwater"), |
Owner
There was a problem hiding this comment.
Reverse Air Underwater you meant?
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
| rule=lambda state, player: condition_or([ | ||
| state.has('Gravity Boost', player), | ||
| state.has('Space Jump Boots', player), | ||
| can_use_screw_attack(state, player) # this method requires some finicky movement in NSJ, but you can do it |
Owner
There was a problem hiding this comment.
if it's NSJ then it's a trick and should be marked with is_nsj too
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
| # the spiny platforms can no longer be interacted with once the water is drained | ||
|
|
||
|
|
||
| class GatheringHall_UpperDoorLedge(MetroidPrime2Region): |
Owner
There was a problem hiding this comment.
always assume the worst for the player and assume the player will fall in water so remove non tricks connection and keep only player go to underwater connection
UltiNaruto
reviewed
Apr 28, 2026
| ), | ||
| MetroidPrime2Exit( | ||
| destination="Torvus Bog - Gathering Hall (Spider Tracks)", | ||
| rule=lambda state, player: condition_and([ |
Owner
There was a problem hiding this comment.
might want to add the roll jump method too
UltiNaruto
reviewed
Apr 28, 2026
| ), | ||
| MetroidPrime2Exit( | ||
| destination="Torvus Bog - Gathering Hall (Upper Door Ledge)", | ||
| rule=lambda state, player: True |
Owner
There was a problem hiding this comment.
replace with state.has("Morph Ball", player)
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
| name="Gathering Hall" | ||
| desc="Item Ledge" | ||
| exits_ = [ | ||
| MetroidPrime2Exit( |
Owner
There was a problem hiding this comment.
unneeded connection, you already have cannon ledge under the item ledge
UltiNaruto
reviewed
Apr 28, 2026
| can_use_screw_attack(state, player) | ||
| ]) | ||
| ), | ||
| MetroidPrime2Exit( |
Owner
There was a problem hiding this comment.
unneeded connection, you already have cannon ledge under the item ledge
UltiNaruto
reviewed
Apr 28, 2026
| can_use_screw_attack(state, player) | ||
| ]) | ||
| ), | ||
| MetroidPrime2Exit( |
Owner
There was a problem hiding this comment.
unneeded connection, you already have cannon ledge under the item ledge then this connection
UltiNaruto
reviewed
Apr 28, 2026
| destination="Torvus Bog - Gathering Hall (Cannon Ledge)", | ||
| rule=lambda state, player: True | ||
| ), | ||
| MetroidPrime2Exit( |
Owner
There was a problem hiding this comment.
unneeded connection, you already have cannon ledge under the item ledge then this connection
UltiNaruto
reviewed
Apr 28, 2026
| can_use_screw_attack(state, player) | ||
| ]) | ||
| ), | ||
| MetroidPrime2Exit( |
Owner
There was a problem hiding this comment.
not hittable from above, you need to add an event to hit from below since there's a memory relay to keep them flipped
UltiNaruto
reviewed
Apr 28, 2026
| destination="Torvus Bog - Gathering Hall (Bottom)", | ||
| rule=lambda state, player: True | ||
| ), | ||
| MetroidPrime2Exit( |
Owner
There was a problem hiding this comment.
unneeded connection, you already have cannon ledge that goes there
UltiNaruto
reviewed
Apr 28, 2026
| destination="Torvus Bog - Gathering Hall (Bottom)", | ||
| rule=lambda state, player: True | ||
| ), | ||
| MetroidPrime2Exit( |
Owner
There was a problem hiding this comment.
unneeded connection, you already have cannon ledge that has a connection for this
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
| ) | ||
|
|
||
|
|
||
| class GatheringHall_Bottom(MetroidPrime2Region): |
Owner
There was a problem hiding this comment.
Bottom would mean inside half-pipe, could you split it into two sub regions?
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
reviewed
Apr 28, 2026
UltiNaruto
requested changes
Apr 28, 2026
…eferences, for rooms abandoned worksite to hydrodynamo station
…eferences, for rooms main hydrochamber to underground tunnel Also removed some unnecessary room subregions Fixed some door mistakes and logical omissions
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Torvus Logic. I had to fix some issues with my local environment before I could grab the newer version of this upstream, which delayed posting this pretty severely. I fixed all of the imports to use the new style along the way. Hpefully, this is good!