Skip to content
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

Ensure asset dependencies are added to the correct pkgs #294

Merged
merged 4 commits into from
Mar 2, 2024
Merged

Ensure asset dependencies are added to the correct pkgs #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43867eb
Fix custom Chozo Seal assets dependencies breaking Diggernaut
dyceron Mar 2, 2024
bdad3c4
Only ensure in the scenarios with changed seals
dyceron Mar 2, 2024
802311b
Revert asset ensure and update the common way :p
dyceron Mar 2, 2024
3f4b489
Re-enable surfaceb seal
dyceron Mar 2, 2024
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 src/open_samus_returns_rando/patcher_editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from mercury_engine_data_structures.formats import BaseResource, Bmsld
from mercury_engine_data_structures.game_check import Game

from open_samus_returns_rando.constants import ALL_SCENARIOS
from open_samus_returns_rando.constants import ALL_SCENARIOS, get_package_name

T = typing.TypeVar("T")

Expand Down Expand Up @@ -39,7 +39,7 @@ def get_nested_list():

def ensure_present_in_scenario(self, scenario: str, asset):
for pkg in self.get_level_pkgs(scenario):
self.ensure_present(pkg, asset)
self.ensure_present(get_package_name(pkg, asset), asset)

def get_scenario(self, name: str) -> Bmsld:
return self.get_file(path_for_level(name) + ".bmsld", Bmsld)
Expand Down
7 changes: 3 additions & 4 deletions src/open_samus_returns_rando/specific_patches/chozo_seal_patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,9 @@ class NewChozoSeal(typing.NamedTuple):
"s100_area10", [-4100.0, 11200.0, 0.0], [-4100.0, 11200.0, 0.0], 253,
["collision_camera_022", "collision_camera_024"]
),
# Currently breaks Ridley if added :(
# NewChozoSeal(
# "s110_surfaceb", [-28150.0, 300.0, 0.0], [-28150.0, 300.0, 0.0], 145, ["collision_camera_017"]
# ),
NewChozoSeal(
"s110_surfaceb", [-28150.0, 300.0, 0.0], [-28150.0, 300.0, 0.0], 145, ["collision_camera_017"]
),
]

def add_chozo_seals(editor: PatcherEditor, new_seal: NewChozoSeal):
Expand Down