Skip to content

Add Torvus Logic - #5

Open
hopesgit wants to merge 41 commits into
UltiNaruto:mainfrom
hopesgit:main
Open

Add Torvus Logic#5
hopesgit wants to merge 41 commits into
UltiNaruto:mainfrom
hopesgit:main

Conversation

@hopesgit

@hopesgit hopesgit commented Dec 19, 2025

Copy link
Copy Markdown

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!

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
@hopesgit
hopesgit marked this pull request as draft December 19, 2025 22:33
Also update Abandoned Worksite to the new imports format

Signed-off-by: hopesgit <hope.gochnour@gmail.com>
@hopesgit
hopesgit marked this pull request as ready for review February 19, 2026 15:46
Comment thread src/logic/metroidprime2/light_world/torvus_bog/abandoned_worksite.py Outdated
Comment thread src/logic/metroidprime2/light_world/temple_grounds/sacred_bridge.py
Comment thread src/logic/metroidprime2/dark_world/sky_temple/sanctum.py
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/catacombs.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/catacombs.py
Comment thread src/logic/metroidprime2/light_world/torvus_bog/catacombs.py Outdated
…the changes from a couple of rooms outside of Torvus that somehow ended up in here
Comment thread src/logic/__init__.py
Comment thread src/Regions.py
Comment thread src/Locations.py
Comment thread src/__init__.py
@UltiNaruto

Copy link
Copy Markdown
Owner

Also no need to mention TorvusBog_ in the class names since we already know that it is Torvus Bog, It adds reduncancy for no reasons.

Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
hopesgit added 6 commits May 2, 2026 22:21
…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
…tions, assume worse player behavior, split the bottom subregion into two, and add using the roll jump trick to reach the track segments
- added room method for forgotten bridge

forgotten_bridge.py:
- recalculated bridge logic

Options.py:
- rename "Air Underwater" trick to "Reverse Air Underwater" for Forgotten Bridge
- Reorder tricks for Forgotten Bridge
- add tricks for Fortress Transport Access

fortress_transport_access.py:
- added trick movement
@hopesgit
hopesgit requested a review from UltiNaruto June 16, 2026 17:13
Comment thread src/logic/metroidprime2/light_world/torvus_bog/fortress_transport_access.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/gathering_hall.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/hydrodynamo_shaft.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/main_hydrochamber.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/torvus_grove.py Outdated
Comment thread src/logic/metroidprime2/light_world/torvus_bog/underground_tunnel.py Outdated
- resolve a couple of imports differently
- split has_trick_enabled usages onto separate lines in some spots
@hopesgit
hopesgit requested a review from UltiNaruto June 18, 2026 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants